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

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-09-24 10:49:17 +0300 (Mon, 24 Sep 2007)
New Revision: 14016

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

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

	* libhildondesktop/hildon-desktop-panel-window-dialog.c: protect
	XChangeProperty with gdk_error_trap_*. Fixes: NB#70550



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-21 18:05:56 UTC (rev 14015)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-24 07:49:17 UTC (rev 14016)
@@ -1,3 +1,8 @@
+2007-09-24 Johan Bilien  <johan.bilien at nokia.com>
+
+	* libhildondesktop/hildon-desktop-panel-window-dialog.c: protect
+	XChangeProperty with gdk_error_trap_*. Fixes: NB#70550
+
 2007-09-21  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* src/hd-switcher-menu-item.c (hd_switcher_menu_item_constructor):

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-21 18:05:56 UTC (rev 14015)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-window-dialog.c	2007-09-24 07:49:17 UTC (rev 14016)
@@ -72,19 +72,23 @@
   GTK_WIDGET_CLASS (hildon_desktop_panel_window_dialog_parent_class)->realize (widget);
 
   if (HILDON_DESKTOP_PANEL_WINDOW_DIALOG (widget)->priv->old_titlebar)
-  {	 
+  { 
     GdkDisplay *display = gtk_widget_get_display (widget);
     Atom atoms[2];
 
     atoms[0] = gdk_x11_get_xatom_by_name_for_display (display, "_MB_WM_STATE_DOCK_TITLEBAR");
     atoms[1] = gdk_x11_get_xatom_by_name_for_display (display, "_MB_DOCK_TITLEBAR_SHOW_ON_DESKTOP");
 
+    gdk_error_trap_push ();
     XChangeProperty (GDK_DISPLAY_XDISPLAY (display),
 		     GDK_WINDOW_XID (widget->window),
 		     gdk_x11_get_xatom_by_name_for_display (display, "_MB_WM_STATE"),
 		     XA_ATOM, 32,
 		     PropModeReplace,
 		     (guchar*) atoms, 2);
+    gdk_flush ();
+    if (gdk_error_trap_pop ())
+      g_critical ("X Error when changing _MB_WM_STATE property");
   }
 }