Merge lp:~larsu/libdbusmenu/lp1053670 into lp:libdbusmenu/12.10

[Lars Karlitski]

This tries to fix bug #1053670. I'm not sure it actually fixes it, because I can't reproduce.

The problem seems to be that settings_notify_cb is called with an invalid DbusmenuMenuitem instance as user_data. This should only happen when the signal is not disconnected properly. I think it isn't, because `widget` might already be NULL in parser_data_free (the menu item has a g_object_add_weak_pointer set on it).

This patch gives ParserData a ref to the GtkSettings object to whose "gtk-menu-images" signal it connects and disconnects the signal from that instance.

[Charles Kerr (charlesk)]

I can't reproduce this crash either, but the patch looks reasonable and I agree with its logic.

review: Approve

=== modified file 'libdbusmenu-gtk/parser.c'
--- libdbusmenu-gtk/parser.c	2012-09-10 15:30:56 +0000
+++ libdbusmenu-gtk/parser.c	2012-09-24 16:16:27 +0000
@@ -62,6 +62,7 @@
   gulong widget_visible_handler_id;
   gulong widget_screen_changed_handler_id;
 
+  GtkSettings *settings;
   gulong settings_notify_handler_id;
 
 } ParserData;
@@ -303,14 +304,18 @@
 		dbusmenu_gtk_clear_signal_handler (o, &pdata->widget_toggle_handler_id);
 		dbusmenu_gtk_clear_signal_handler (o, &pdata->widget_visible_handler_id);
 		dbusmenu_gtk_clear_signal_handler (o, &pdata->widget_screen_changed_handler_id);
-		dbusmenu_gtk_clear_signal_handler (gtk_widget_get_settings (GTK_WIDGET (o)),
-		                                   &pdata->settings_notify_handler_id);
 		g_object_remove_weak_pointer(o, (gpointer*)&pdata->widget);
 
 		/* since the DbusmenuMenuitem is being destroyed, uncache it from the GtkWidget */
 		g_object_steal_data(o, CACHED_MENUITEM);
 	}
 
+	if (pdata->settings != NULL) {
+		dbusmenu_gtk_clear_signal_handler (pdata->settings,
+						   &pdata->settings_notify_handler_id);
+		g_object_unref (pdata->settings);
+	}
+
 	if (pdata->shell != NULL) {
 		GObject * o = G_OBJECT(pdata->shell);
 		dbusmenu_gtk_clear_signal_handler (o, &pdata->item_inserted_handler_id);
@@ -1309,10 +1314,15 @@
 
   ParserData *pdata = (ParserData *)g_object_get_data(G_OBJECT(mi), PARSER_DATA);
 
-  if (old_screen != NULL)
-    dbusmenu_gtk_clear_signal_handler (gtk_settings_get_for_screen (old_screen),
-                                       &pdata->settings_notify_handler_id);
-  pdata->settings_notify_handler_id = g_signal_connect (gtk_widget_get_settings (widget), "notify",
+  if (pdata->settings != NULL)
+    {
+      dbusmenu_gtk_clear_signal_handler (pdata->settings,
+                                         &pdata->settings_notify_handler_id);
+      g_object_unref (pdata->settings);
+    }
+
+  pdata->settings = g_object_ref (gtk_widget_get_settings (widget));
+  pdata->settings_notify_handler_id = g_signal_connect (pdata->settings, "notify",
                                                         G_CALLBACK (settings_notify_cb), mi);
 
   /* And update widget now that we have a new GtkSettings */