[maemo-commits] [maemo-commits] r13570 - in projects/haf/trunk/hildon-desktop: . libhildondesktop

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-09-04 14:35:00 +0300 (Tue, 04 Sep 2007)
New Revision: 13570

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-window-dialog.c
Log:

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

	* libhildondesktop/hildon-desktop-panel-window-dialog.c:
	- added missing gdk_error_trap_pop. Thanks Tommi!


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-04 10:49:47 UTC (rev 13569)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-04 11:35:00 UTC (rev 13570)
@@ -1,3 +1,8 @@
+2007-09-04 Johan Bilien  <johan.bilien at nokia.com>
+
+	* libhildondesktop/hildon-desktop-panel-window-dialog.c:
+	- added missing gdk_error_trap_pop. Thanks Tommi!
+
 2007-09-03  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* src/hd-select-plugins-dialog.c (hd_select_plugins_dialog_get_store),

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-window-dialog.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-window-dialog.c	2007-09-04 10:49:47 UTC (rev 13569)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-window-dialog.c	2007-09-04 11:35:00 UTC (rev 13570)
@@ -163,7 +163,7 @@
 		      0, 16L, False, XA_WINDOW, &type, &format,
 		      &nitems, &bytes_after, &support_xwin.s);
 
-  if (support_xwin.s == NULL)
+  if (gdk_error_trap_pop () || support_xwin.s == NULL)
       return NULL;
 
   atom_utf8_string = XInternAtom (dpy, "UTF8_STRING", False);