[maemo-commits] [maemo-commits] r14394 - in projects/haf/trunk/hildon-desktop: . libhildonwm

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-10-10 12:18:26 +0300 (Wed, 10 Oct 2007)
New Revision: 14394

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm-window.c
Log:

2007-10-10  Johan Bilien  <johan.bilien at nokia.com>

	* libhildonwm/hd-wm-window.c: call gdk_flush before checking for
	an X error. Fixes: NB#72458



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-10-10 08:01:03 UTC (rev 14393)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-10-10 09:18:26 UTC (rev 14394)
@@ -1,3 +1,8 @@
+2007-10-10  Johan Bilien  <johan.bilien at nokia.com>
+
+	* libhildonwm/hd-wm-window.c: call gdk_flush before checking for
+	an X error. Fixes: NB#72458
+
 2007-10-09  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* src/hd-switcher-menu.c

Modified: projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm-window.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm-window.c	2007-10-10 08:01:03 UTC (rev 14393)
+++ projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm-window.c	2007-10-10 09:18:26 UTC (rev 14394)
@@ -1305,6 +1305,8 @@
                    XA_CARDINAL, 32, PropModeReplace,
                    (guchar *)&data, 4);
 
-  gdk_error_trap_pop ();
+  gdk_flush ();
+  if (gdk_error_trap_pop ())
+    g_warning ("X Error when changing Icon geometry");
 }