Merge lp:~ted/libdbusmenu/submenu-woes into lp:libdbusmenu/0.5

[Ted Gould]

Make it so that we follow the child-display property more than the existance of children for building the GTK menu.

[Jay Taoko (jaytaoko)]

review: Approve

=== modified file 'libdbusmenu-glib/client.c'
--- libdbusmenu-glib/client.c	2011-03-29 02:24:01 +0000
+++ libdbusmenu-glib/client.c	2011-04-05 19:03:00 +0000
@@ -331,6 +331,8 @@
 	return;
 }
 
+#define LAYOUT_PROPS_COUNT  5
+
 static void
 dbusmenu_client_init (DbusmenuClient *self)
 {
@@ -351,13 +353,14 @@
 
 	priv->layoutcall = NULL;
 
-	gchar * layout_props[5];
+	gchar * layout_props[LAYOUT_PROPS_COUNT + 1];
 	layout_props[0] = DBUSMENU_MENUITEM_PROP_TYPE;
 	layout_props[1] = DBUSMENU_MENUITEM_PROP_LABEL;
 	layout_props[2] = DBUSMENU_MENUITEM_PROP_VISIBLE;
 	layout_props[3] = DBUSMENU_MENUITEM_PROP_ENABLED;
-	layout_props[4] = NULL;
-	priv->layout_props = g_variant_new_strv((const gchar * const *)layout_props, 4);
+	layout_props[4] = DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY;
+	layout_props[LAYOUT_PROPS_COUNT] = NULL;
+	priv->layout_props = g_variant_new_strv((const gchar * const *)layout_props, LAYOUT_PROPS_COUNT);
 	g_variant_ref_sink(priv->layout_props);
 
 	priv->current_revision = 0;

=== modified file 'libdbusmenu-glib/menuitem.c'
--- libdbusmenu-glib/menuitem.c	2011-03-16 15:27:00 +0000
+++ libdbusmenu-glib/menuitem.c	2011-04-05 19:03:00 +0000
@@ -446,7 +446,7 @@
 {
 	g_return_if_fail(DBUSMENU_IS_MENUITEM(mi));
 
-	if (dbusmenu_menuitem_get_children(mi) == NULL) {
+	if (dbusmenu_menuitem_get_children(mi) == NULL && g_strcmp0(DBUSMENU_MENUITEM_CHILD_DISPLAY_SUBMENU, dbusmenu_menuitem_property_get(mi, DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY)) != 0) {
 		g_warning("About to Show called on an item wihtout submenus.  We're ignoring it.");
 	} else {
 		gboolean dummy;

=== modified file 'libdbusmenu-gtk/client.c'
--- libdbusmenu-gtk/client.c	2011-03-16 15:27:00 +0000
+++ libdbusmenu-gtk/client.c	2011-04-05 19:03:00 +0000
@@ -551,11 +551,43 @@
 	return;
 }
 
+/* Submenu processing */
+static void
+process_submenu (DbusmenuMenuitem * mi, GtkMenuItem * gmi, GVariant * variant, DbusmenuGtkClient * gtkclient)
+{
+	const gchar * submenu = NULL;
+	if (variant != NULL) {
+		submenu = g_variant_get_string(variant, NULL);
+	}
+
+	if (g_strcmp0(submenu, DBUSMENU_MENUITEM_CHILD_DISPLAY_SUBMENU) != 0) {
+		/* This is the only case we're really supporting right now,
+		   so if it's not this, we want to clean up. */
+		/* We're just going to warn for now. */
+		gpointer pmenu = g_object_get_data(G_OBJECT(mi), data_menu);
+		if (pmenu != NULL) {
+			g_warning("The child-display variable is set to '%s' but there's a menu, odd?", submenu);
+		}
+	} 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);
+
+		gtk_menu_item_set_submenu(gmi, GTK_WIDGET(menu));
+
+		g_signal_connect(menu, "notify::visible", G_CALLBACK(submenu_notify_visible_cb), mi);
+	}
+
+	return;
+}
+
 /* Whenever we have a property change on a DbusmenuMenuitem
    we need to be responsive to that. */
 static void
-menu_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GVariant * variant, GtkMenuItem * gmi)
+menu_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GVariant * variant, DbusmenuGtkClient * gtkclient)
 {
+	GtkMenuItem * gmi = dbusmenu_gtkclient_menuitem_get(gtkclient, mi);
+
 	if (!g_strcmp0(prop, DBUSMENU_MENUITEM_PROP_LABEL)) {
 		gtk_menu_item_set_label(gmi, variant == NULL ? NULL : g_variant_get_string(variant, NULL));
 	} else if (!g_strcmp0(prop, DBUSMENU_MENUITEM_PROP_VISIBLE)) {
@@ -566,6 +598,8 @@
 		process_toggle_type(mi, gmi, variant);
 	} else if (!g_strcmp0(prop, DBUSMENU_MENUITEM_PROP_TOGGLE_STATE)) {
 		process_toggle_state(mi, gmi, variant);
+	} else if (!g_strcmp0(prop, DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY)) {
+		process_submenu(mi, gmi, variant, gtkclient);
 	}
 
 	return;
@@ -704,7 +738,7 @@
 	#endif
 
 	/* DbusmenuMenuitem signals */
-	g_signal_connect(G_OBJECT(item), DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED, G_CALLBACK(menu_prop_change_cb), gmi);
+	g_signal_connect(G_OBJECT(item), DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED, G_CALLBACK(menu_prop_change_cb), client);
 	g_signal_connect(G_OBJECT(item), DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED, G_CALLBACK(menu_shortcut_change_cb), client);
 	g_signal_connect(G_OBJECT(item), DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED, G_CALLBACK(delete_child), client);
 	g_signal_connect(G_OBJECT(item), DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED,   G_CALLBACK(move_child),   client);
@@ -720,6 +754,7 @@
 	process_sensitive(item, gmi, dbusmenu_menuitem_property_get_variant(item, DBUSMENU_MENUITEM_PROP_ENABLED));
 	process_toggle_type(item, gmi, dbusmenu_menuitem_property_get_variant(item, DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE));
 	process_toggle_state(item, gmi, dbusmenu_menuitem_property_get_variant(item, DBUSMENU_MENUITEM_PROP_TOGGLE_STATE));
+	process_submenu(item, gmi, dbusmenu_menuitem_property_get_variant(item, DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY), client);
 	refresh_shortcut(client, item);
 
 	/* Oh, we're a child, let's deal with that */
@@ -741,17 +776,12 @@
 	if (g_strcmp0(dbusmenu_menuitem_property_get(mi, DBUSMENU_MENUITEM_PROP_TYPE), DBUSMENU_CLIENT_TYPES_SEPARATOR) == 0) { return; }
 
 	gpointer ann_menu = g_object_get_data(G_OBJECT(mi), data_menu);
+	if (ann_menu == NULL) {
+		g_warning("Children but no menu, someone's been naughty with their '" DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY "' property: '%s'", dbusmenu_menuitem_property_get(mi, DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY));
+		return;
+	}
+
 	GtkMenu * menu = GTK_MENU(ann_menu);
-	if (menu == NULL) {
-		/* Oh, we don't have a submenu, build one! */
-		menu = GTK_MENU(gtk_menu_new());
-		g_object_set_data(G_OBJECT(mi), data_menu, menu);
-
-		GtkMenuItem * parent = dbusmenu_gtkclient_menuitem_get(gtkclient, mi);
-		gtk_menu_item_set_submenu(parent, GTK_WIDGET(menu));
-
-		g_signal_connect(menu, "notify::visible", G_CALLBACK(submenu_notify_visible_cb), mi);
-	} 
 
 	GtkMenuItem * childmi  = dbusmenu_gtkclient_menuitem_get(gtkclient, child);
 	gtk_menu_shell_insert(GTK_MENU_SHELL(menu), GTK_WIDGET(childmi), position);