[maemo-commits] [maemo-commits] r17738 - in projects/haf/trunk/libmatchbox2: . matchbox/core

[From: subversion at stage.maemo.org]

Author: aendrodi
Date: 2009-03-19 15:46:42 +0200 (Thu, 19 Mar 2009)
New Revision: 17738

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c
Log:
	* matchbox/core/mb-wm-client-window.c (mb_wm_client_window_sync_properties):
	  Regression fix.  When the the window name property changed but we
	  failed to get the new value the old MBWMClientWindow::name field
	  left dangling.  Fixes a crash with modest's new account wizard,
	  which tries to set the dialog's title when it is cancelled.


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-03-19 10:37:44 UTC (rev 17737)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-03-19 13:46:42 UTC (rev 17738)
@@ -1,3 +1,11 @@
+2009-03-19  Adam Endrodi  <adam.endrodi at blumsoft.eu>
+
+	* matchbox/core/mb-wm-client-window.c (mb_wm_client_window_sync_properties):
+	  Regression fix.  When the the window name property changed but we
+	  failed to get the new value the old MBWMClientWindow::name field
+	  left dangling.  Fixes a crash with modest's new account wizard,
+	  which tries to set the dialog's title when it is cancelled.
+
 2009-03-18  Thomas Thurman  <thomas.thurman at collabora.co.uk>
 
 	Fixes: NB#103836 (or at least its test case).

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c	2009-03-19 10:37:44 UTC (rev 17737)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c	2009-03-19 13:46:42 UTC (rev 17738)
@@ -612,8 +612,8 @@
       int *cursor = name_types;
       char *name = NULL;
 
-      if (win->name)
-	g_free(win->name);
+      g_free(win->name);
+      win->name = NULL;
 
       while (*cursor)
 	{