Merge lp:~ted/libdbusmenu/about-to-show-is-activate into lp:libdbusmenu/0.5

[Ted Gould]

Making it so that we pass about-to-show up to menu items with children as activate

[David Barth (dbarth)]

What's the rational for not sending activate signals if there are no submenus?

Otherwise looks like what is needed. Glad to see about-to-show connected on the gtk side as well.

[David Barth (dbarth)]

Moving on with the merge proposal: +1, as anyway it's a new feature, so the submenu restriction doesn't impact existing code.

review: Approve

[Ted Gould (ted)]

On Mon, 2010-09-20 at 15:51 +0000, David Barth wrote:
> What's the rational for not sending activate signals if there are no submenus?

Basically because GTK doesn't separate between "about to show" and
"activate." So it seems that some people (Shotwell) are using the
"activate" signal as about-to-show, but in reality if we did that for
other menus items people would be pressing things all over the place :)

=== modified file 'libdbusmenu-glib/menuitem.c'
--- libdbusmenu-glib/menuitem.c	2010-08-20 19:49:33 +0000
+++ libdbusmenu-glib/menuitem.c	2010-09-17 21:38:43 +0000
@@ -97,6 +97,7 @@
 static void g_value_transform_STRING_BOOLEAN (const GValue * in, GValue * out);
 static void g_value_transform_STRING_INT (const GValue * in, GValue * out);
 static void handle_event (DbusmenuMenuitem * mi, const gchar * name, const GValue * value, guint timestamp);
+static void send_about_to_show (DbusmenuMenuitem * mi, dbusmenu_menuitem_about_to_show_cb cb, gpointer cb_data);
 
 /* GObject stuff */
 G_DEFINE_TYPE (DbusmenuMenuitem, dbusmenu_menuitem, G_TYPE_OBJECT);
@@ -114,6 +115,7 @@
 	object_class->get_property = get_property;
 
 	klass->handle_event = handle_event;
+	klass->send_about_to_show = send_about_to_show;
 
 	/**
 		DbusmenuMenuitem::property-changed:
@@ -387,6 +389,28 @@
 	return;
 }
 
+/* Handles our about to show signal on items that submenus
+   exist.  This is sending just activate now, but we should
+   probably consider a special signal in the future if GTK
+   gets more sophisticated about this. */
+static void
+send_about_to_show (DbusmenuMenuitem * mi, dbusmenu_menuitem_about_to_show_cb cb, gpointer cb_data)
+{
+	g_return_if_fail(DBUSMENU_IS_MENUITEM(mi));
+
+	if (dbusmenu_menuitem_get_children(mi) == NULL) {
+		g_warning("About to Show called on an item wihtout submenus.  We're ignoring it.");
+	} else {
+		g_signal_emit(G_OBJECT(mi), signals[ITEM_ACTIVATED], 0, 0 /* timestamp */, TRUE);
+	}
+
+	if (cb != NULL) {
+		cb(mi, cb_data);
+	}
+
+	return;
+}
+
 /* Public interface */
 
 /**