Merge lp:~chrisccoulson/libdbusmenu/ffox-fixes into lp:libdbusmenu/0.5

[David Barth]

See the change description in Chris's bug report at https://bugs.launchpad.net/ubuntu/+source/libdbusmenu/+bug/690447

[Karl Lattimer (karl-qdh)]

I have one question about this patch, in line 38 you remove the ITEM_ACTIVATED signal. Does anything in existence utilise this signal and would need to be changed to use ABOUT_TO_SHOW instead?

review: Needs Information

[Ted Gould (ted)]

Karl, you're right in that things will need to change. Mostly what needs to change is appmenu-gtk and libappindicator as they don't connect to the about-to-show signal (yet) and thus only pass that to applications with the activate signal. But, this patch should still go in as we need the feature elsewhere.

Also, I'm not going to merge the "ABI saving" feature of replacing the reserved as the current trunk already breaks the ABI :)

review: Approve

=== modified file 'libdbusmenu-glib/menuitem.c'
--- libdbusmenu-glib/menuitem.c	2010-11-23 22:55:43 +0000
+++ libdbusmenu-glib/menuitem.c	2010-12-15 19:05:53 +0000
@@ -70,6 +70,7 @@
 	CHILD_MOVED,
 	REALIZED,
 	SHOW_TO_USER,
+	ABOUT_TO_SHOW,
 	LAST_SIGNAL
 };
 
@@ -229,6 +230,21 @@
 	                                           g_cclosure_marshal_VOID__UINT,
 	                                           G_TYPE_NONE, 1, G_TYPE_UINT, G_TYPE_NONE);
 
+	/**
+		DbusmenuMenuitem::about-to-show:
+		@arg0: The #DbusmenuMenuitem object.
+
+		Emitted when the submenu for this item
+		is about to be shown
+	*/
+	signals[ABOUT_TO_SHOW] =     g_signal_new(DBUSMENU_MENUITEM_SIGNAL_ABOUT_TO_SHOW,
+	                                          G_TYPE_FROM_CLASS(klass),
+	                                          G_SIGNAL_RUN_LAST,
+	                                          G_STRUCT_OFFSET(DbusmenuMenuitemClass, about_to_show),
+	                                          NULL, NULL,
+	                                          _dbusmenu_menuitem_marshal_VOID__VOID,
+	                                          G_TYPE_BOOLEAN, 0, G_TYPE_NONE);
+
 	g_object_class_install_property (object_class, PROP_ID,
 	                                 g_param_spec_int(PROP_ID_S, "ID for the menu item",
 	                                              "This is a unique indentifier for the menu item.",
@@ -398,7 +414,8 @@
 	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);
+		gboolean dummy;
+		g_signal_emit(G_OBJECT(mi), signals[ABOUT_TO_SHOW], 0, &dummy);
 	}
 
 	if (cb != NULL) {

=== modified file 'libdbusmenu-glib/menuitem.h'
--- libdbusmenu-glib/menuitem.h	2010-11-18 02:50:45 +0000
+++ libdbusmenu-glib/menuitem.h	2010-12-15 19:05:53 +0000
@@ -50,6 +50,7 @@
 #define DBUSMENU_MENUITEM_SIGNAL_REALIZED            "realized"
 #define DBUSMENU_MENUITEM_SIGNAL_REALIZED_ID         (g_signal_lookup(DBUSMENU_MENUITEM_SIGNAL_REALIZED, DBUSMENU_TYPE_MENUITEM))
 #define DBUSMENU_MENUITEM_SIGNAL_SHOW_TO_USER        "show-to-user"
+#define DBUSMENU_MENUITEM_SIGNAL_ABOUT_TO_SHOW       "about-to-show"
 
 #define DBUSMENU_MENUITEM_PROP_TYPE                  "type"
 #define DBUSMENU_MENUITEM_PROP_VISIBLE               "visible"
@@ -158,6 +159,7 @@
 	void (*send_about_to_show) (DbusmenuMenuitem * mi, void (*cb) (DbusmenuMenuitem * mi, gpointer user_data), gpointer cb_data);
 
 	void (*show_to_user) (DbusmenuMenuitem * mi, guint timestamp, gpointer cb_data);
+	gboolean (*about_to_show) (void);
 
 	/*< Private >*/
 	void (*reserved1) (void);
@@ -165,7 +167,6 @@
 	void (*reserved3) (void);
 	void (*reserved4) (void);
 	void (*reserved5) (void);
-	void (*reserved6) (void);
 };
 
 GType dbusmenu_menuitem_get_type (void);

=== modified file 'libdbusmenu-glib/server.c'
--- libdbusmenu-glib/server.c	2010-11-29 21:19:52 +0000
+++ libdbusmenu-glib/server.c	2010-12-15 19:05:53 +0000
@@ -1079,6 +1079,8 @@
 		return;
 	}
 
+	dbusmenu_menuitem_send_about_to_show(mi, NULL, NULL);
+
 	/* GTK+ does not support about-to-show concept for now */
 	g_dbus_method_invocation_return_value(invocation,
 	                                      g_variant_new("(b)", FALSE));

=== modified file 'libdbusmenu-gtk/menuitem.h'
--- libdbusmenu-gtk/menuitem.h	2010-06-14 15:58:21 +0000
+++ libdbusmenu-gtk/menuitem.h	2010-12-15 19:05:53 +0000
@@ -35,6 +35,8 @@
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
+G_BEGIN_DECLS
+
 gboolean dbusmenu_menuitem_property_set_image (DbusmenuMenuitem * menuitem, const gchar * property, const GdkPixbuf * data);
 GdkPixbuf * dbusmenu_menuitem_property_get_image (DbusmenuMenuitem * menuitem, const gchar * property);
 
@@ -43,4 +45,6 @@
 gboolean dbusmenu_menuitem_property_set_shortcut_menuitem (DbusmenuMenuitem * menuitem, const GtkMenuItem * gmi);
 void dbusmenu_menuitem_property_get_shortcut (DbusmenuMenuitem * menuitem, guint * key, GdkModifierType * modifiers);
 
+G_END_DECLS
+
 #endif