Merge lp:~larsu/ido/lp1246536-13.10 into lp:ido/13.10

[Lars Karlitski]

idoscalemenuitem: disconnect signal from parent

This fixes a crash: the widget installed a handler for the parent's hide signal, but was destroyed before the parent without disconnecting the signal.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:154
http://jenkins.qa.ubuntu.com/job/ido-13.10-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ido-13.10-saucy-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ido-13.10-saucy-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/ido-13.10-saucy-armhf-ci/3/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ido-13.10-ci/3/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

review: Approve

[Sebastien Bacher (seb128)]

looks good, seems to fix the issue as well ;-)

review: Approve

=== modified file 'src/idoscalemenuitem.c'
--- src/idoscalemenuitem.c	2013-10-10 05:30:45 +0000
+++ src/idoscalemenuitem.c	2013-10-31 18:29:47 +0000
@@ -52,9 +52,8 @@
 static void     ido_scale_menu_item_secondary_image_notify (GtkImage              *image,
                                                             GParamSpec            *pspec,
                                                             IdoScaleMenuItem      *item);
-static void     ido_scale_menu_item_notify                 (IdoScaleMenuItem      *item,
-                                                            GParamSpec            *pspec,
-                                                            gpointer               user_data);
+static void     ido_scale_menu_item_parent_set             (GtkWidget             *item,
+                                                            GtkWidget             *previous_parent);
 static void     update_packing                             (IdoScaleMenuItem      *self,
                                                             IdoScaleMenuItemStyle  style);
 static void     default_primary_clicked_handler            (IdoScaleMenuItem      *self);
@@ -265,10 +264,6 @@
                     G_CALLBACK (ido_scale_menu_item_toggle_size_allocate),
                     NULL);
 
-  g_signal_connect (self, "notify",
-                    G_CALLBACK (ido_scale_menu_item_notify),
-                    NULL);
-
   gtk_container_add (GTK_CONTAINER (self), hbox);
 
   gtk_widget_add_events (GTK_WIDGET(self), GDK_SCROLL_MASK);
@@ -288,6 +283,7 @@
   widget_class->motion_notify_event  = ido_scale_menu_item_motion_notify_event;
   widget_class->scroll_event         = ido_scale_menu_item_scroll_event;
   widget_class->size_allocate        = ido_scale_menu_item_size_allocate;
+  widget_class->parent_set           = ido_scale_menu_item_parent_set;
 
   gobject_class->constructed  = ido_scale_menu_item_constructed;
   gobject_class->set_property = ido_scale_menu_item_set_property;
@@ -645,21 +641,18 @@
 }
 
 static void
-ido_scale_menu_item_notify (IdoScaleMenuItem *item,
-                            GParamSpec       *pspec,
-                            gpointer          user_data)
+ido_scale_menu_item_parent_set (GtkWidget *item,
+                                GtkWidget *previous_parent)
+
 {
-  if (g_strcmp0 (pspec->name, "parent"))
-    {
-      GtkWidget *parent = gtk_widget_get_parent (GTK_WIDGET (item));
-
-      if (parent)
-        {
-          g_signal_connect (parent, "hide",
-                            G_CALLBACK (menu_hidden),
-                            item);
-        }
-    }
+  GtkWidget *parent;
+
+  if (previous_parent)
+    g_signal_handlers_disconnect_by_func (previous_parent, menu_hidden, item);
+
+  parent = gtk_widget_get_parent (item);
+  if (parent)
+    g_signal_connect (parent, "hide", G_CALLBACK (menu_hidden), item);
 }
 
 static void