* Upstream Merge

  * Handle cases where labels are added later as subwidgets in
    the menuitem (LP: #758759)
  * Fix the destruction of the attached GTK menuitem (LP: #746091)

3 files changed, 63 insertions, 38 deletions

diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c
index b2d9f47..5e59f8e 100644
--- a/libdbusmenu-gtk/client.c
+++ b/libdbusmenu-gtk/client.c
@@ -690,7 +690,8 @@ process_submenu (DbusmenuMenuitem * mi, GtkMenuItem * gmi, GVariant * variant, D
 	} else {
 		/* We need to build a menu for these guys to live in. */
 		GtkMenu * menu = GTK_MENU(gtk_menu_new());
-		g_object_set_data(G_OBJECT(mi), data_menu, menu);
+		g_object_ref_sink(menu);
+		g_object_set_data_full(G_OBJECT(mi), data_menu, menu, g_object_unref);
 
 		gtk_menu_item_set_submenu(gmi, GTK_WIDGET(menu));
 
@@ -735,19 +736,6 @@ menu_shortcut_change_cb (DbusmenuMenuitem * mi, gchar * prop, GVariant * value,
 	return;
 }
 
-/* Call back that happens when the DbusmenuMenuitem
-   is destroyed.  We're making sure to clean up everything
-   else down the pipe. */
-static void
-destoryed_dbusmenuitem_cb (gpointer udata, GObject * dbusmenuitem)
-{
-	#ifdef MASSIVEDEBUGGING
-	g_debug("DbusmenuMenuitem was destroyed");
-	#endif
-	gtk_widget_destroy(GTK_WIDGET(udata));
-	return;
-}
-
 /* The new menuitem signal only happens if we don't have a type handler
    for the type of the item.  This should be an error condition and we're
    printing out a message. */
@@ -850,11 +838,8 @@ dbusmenu_gtkclient_newitem_base (DbusmenuGtkClient * client, DbusmenuMenuitem *
 	#endif
 
 	/* Attach these two */
-	g_object_set_data(G_OBJECT(item), data_menuitem, gmi);
-	g_object_ref(G_OBJECT(gmi));
-	#ifdef MASSIVEDEBUGGING
-	g_signal_connect(G_OBJECT(gmi), "destroy", G_CALLBACK(destroy_gmi), item);
-	#endif
+	g_object_ref_sink(G_OBJECT(gmi));
+	g_object_set_data_full(G_OBJECT(item), data_menuitem, gmi, (GDestroyNotify)gtk_widget_destroy);
 
 	/* DbusmenuMenuitem signals */
 	g_signal_connect(G_OBJECT(item), DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED, G_CALLBACK(menu_prop_change_cb), client);
@@ -865,9 +850,6 @@ dbusmenu_gtkclient_newitem_base (DbusmenuGtkClient * client, DbusmenuMenuitem *
 	/* GtkMenuitem signals */
 	g_signal_connect(G_OBJECT(gmi), "activate", G_CALLBACK(menu_pressed_cb), item);
 
-	/* Life insurance */
-	g_object_weak_ref(G_OBJECT(item), destoryed_dbusmenuitem_cb, gmi);
-
 	/* Check our set of props to see if any are set already */
 	process_visible(item, gmi, dbusmenu_menuitem_property_get_variant(item, DBUSMENU_MENUITEM_PROP_VISIBLE));
 	process_sensitive(item, gmi, dbusmenu_menuitem_property_get_variant(item, DBUSMENU_MENUITEM_PROP_ENABLED));
@@ -920,7 +902,7 @@ delete_child (DbusmenuMenuitem * mi, DbusmenuMenuitem * child, DbusmenuGtkClient
 
 		if (menu != NULL) {
 			gtk_widget_destroy(GTK_WIDGET(menu));
-			g_object_set_data(G_OBJECT(mi), data_menu, NULL);
+			g_object_steal_data(G_OBJECT(mi), data_menu);
 		}
 	}
 
@@ -1024,11 +1006,10 @@ new_item_normal (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbusmenu
 
 	GtkMenuItem * gmi;
 	gmi = GTK_MENU_ITEM(g_object_new(GENERICMENUITEM_TYPE, NULL));
-	gtk_menu_item_set_label(gmi, dbusmenu_menuitem_property_get(newitem, DBUSMENU_MENUITEM_PROP_LABEL));
 
 	if (gmi != NULL) {
+		gtk_menu_item_set_label(gmi, dbusmenu_menuitem_property_get(newitem, DBUSMENU_MENUITEM_PROP_LABEL));
 		dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, gmi, parent);
-		g_object_unref(gmi);
 	} else {
 		return FALSE;
 	}
diff --git a/libdbusmenu-gtk/menu.c b/libdbusmenu-gtk/menu.c
index 0b31069..236a596 100644
--- a/libdbusmenu-gtk/menu.c
+++ b/libdbusmenu-gtk/menu.c
@@ -329,6 +329,18 @@ remove_child_signals (gpointer data, gpointer user_data)
 	return;
 }
 
+/* Handler for all of the menu items on a root change to ensure that
+   the menus are hidden before we start going and deleting things. */
+static void
+popdown_all (DbusmenuMenuitem * mi, gpointer user_data)
+{
+	GtkMenu * menu = dbusmenu_gtkclient_menuitem_get_submenu(DBUSMENU_GTKCLIENT(user_data), mi);
+	if (menu != NULL) {
+		gtk_menu_popdown(menu);
+	}
+	return;
+}
+
 /* When the root menuitem changes we need to resetup things so that
    we're back in the game. */
 static void
@@ -344,6 +356,8 @@ root_changed (DbusmenuGtkClient * client, DbusmenuMenuitem * newroot, DbusmenuGt
 		g_signal_handlers_disconnect_by_func(G_OBJECT(priv->root), root_child_moved, menu);
 		g_signal_handlers_disconnect_by_func(G_OBJECT(priv->root), root_child_delete, menu);
 
+		dbusmenu_menuitem_foreach(priv->root, popdown_all, client);
+
 		g_object_unref(priv->root);
 		priv->root = NULL;
 	}
diff --git a/libdbusmenu-gtk/parser.c b/libdbusmenu-gtk/parser.c
index c627854..4972856 100644
--- a/libdbusmenu-gtk/parser.c
+++ b/libdbusmenu-gtk/parser.c
@@ -87,6 +87,9 @@ static gboolean       item_handle_event        (DbusmenuMenuitem *  item,
 static void           widget_notify_cb         (GtkWidget  *        widget,
                                                 GParamSpec *        pspec,
                                                 gpointer            data);
+static void           widget_add_cb            (GtkWidget *         widget,
+                                                GtkWidget *         child,
+                                                gpointer            data);
 static gboolean       should_show_image        (GtkImage *          image);
 static void           menuitem_notify_cb       (GtkWidget *         widget,
                                                 GParamSpec *        pspec,
@@ -169,6 +172,8 @@ parse_data_free (gpointer data)
 		g_signal_handlers_disconnect_matched(pdata->widget, (GSignalMatchType)G_SIGNAL_MATCH_FUNC,
 						     0, 0, NULL, G_CALLBACK(widget_notify_cb), NULL);
 		g_signal_handlers_disconnect_matched(pdata->widget, (GSignalMatchType)G_SIGNAL_MATCH_FUNC,
+						     0, 0, NULL, G_CALLBACK(widget_add_cb), NULL);
+		g_signal_handlers_disconnect_matched(pdata->widget, (GSignalMatchType)G_SIGNAL_MATCH_FUNC,
 						     0, 0, NULL, G_CALLBACK(accel_changed), NULL);
 		g_signal_handlers_disconnect_matched(pdata->widget, (GSignalMatchType)G_SIGNAL_MATCH_FUNC,
 						     0, 0, NULL, G_CALLBACK(checkbox_toggled), NULL);
@@ -462,8 +467,8 @@ construct_dbusmenu_for_widget (GtkWidget * widget)
       if (GTK_IS_SEPARATOR_MENU_ITEM (widget) || !find_menu_label (widget))
         {
           dbusmenu_menuitem_property_set (mi,
-                                          "type",
-                                          "separator");
+                                          DBUSMENU_MENUITEM_PROP_TYPE,
+                                          DBUSMENU_CLIENT_TYPES_SEPARATOR);
 
           visible = gtk_widget_get_visible (widget);
           sensitive = gtk_widget_get_sensitive (widget);
@@ -605,6 +610,11 @@ construct_dbusmenu_for_widget (GtkWidget * widget)
                         G_CALLBACK (widget_notify_cb),
                         mi);
 
+      g_signal_connect (widget,
+                        "add",
+                        G_CALLBACK (widget_add_cb),
+                        mi);
+
       return mi;
     }
 
@@ -962,6 +972,26 @@ item_handle_event (DbusmenuMenuitem *item, const gchar *name,
   return FALSE; // just pass through on everything
 }
 
+static gboolean
+handle_first_label (DbusmenuMenuitem *mi)
+{
+  ParserData *pdata = g_object_get_data (G_OBJECT (mi), PARSER_DATA);
+  if (!pdata->label)
+    {
+      /* GtkMenuItem's can start life as a separator if they have no child
+       * GtkLabel. In this case, we need to convert the DbusmenuMenuitem from
+       * a separator to a normal menuitem if the application adds a label.
+       * As changing types isn't handled too well by the client, we delete
+       * this menuitem for now and then recreate it
+       */
+      DbusmenuMenuitem * parent = dbusmenu_menuitem_get_parent (mi);
+      recreate_menu_item (parent, mi);
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
 static void
 widget_notify_cb (GtkWidget  *widget,
                   GParamSpec *pspec,
@@ -981,20 +1011,11 @@ widget_notify_cb (GtkWidget  *widget,
     }
   else if (pspec->name == g_intern_static_string ("label"))
     {
-      ParserData *pdata = g_object_get_data (G_OBJECT (child), PARSER_DATA);
-      if (!pdata->label)
+      if (handle_first_label (child))
         {
-          /* GtkMenuItem's can start life as a separator if they have no child
-           * GtkLabel. In this case, we need to convert the DbusmenuMenuitem from
-           * a separator to a normal menuitem if the application adds a label.
-           * As changing types isn't handled too well by the client, we delete
-           * this menuitem for now and then recreate it
-           */
-          DbusmenuMenuitem * parent = dbusmenu_menuitem_get_parent (child);
-          recreate_menu_item (parent, child);
           return;
         }
-                      
+
       dbusmenu_menuitem_property_set (child,
                                       DBUSMENU_MENUITEM_PROP_LABEL,
                                       g_value_get_string (&prop_value));
@@ -1066,6 +1087,15 @@ widget_notify_cb (GtkWidget  *widget,
   g_value_unset (&prop_value);
 }
 
+static void
+widget_add_cb (GtkWidget *widget,
+               GtkWidget *child,
+               gpointer   data)
+{
+  if (find_menu_label (child) != NULL)
+    handle_first_label (data);
+}
+
 /* A child item was added to a menu we're watching.  Let's try to integrate it. */
 static void
 child_added_cb (GtkContainer *menu, GtkWidget *widget, gpointer data)