Merge lp:~ted/libappindicator/unity-parser into lp:libappindicator/13.10

[Ted Gould]

Convert from DBusMenu to GMenu

Changing the backend of libappindicator to be based on GMenuModel instead of DBusmenu.

Pushing this up for review and people to start looking at, but if it lands the world will end. Okay, probably not that, but nothing will work as indicator-application needs to be updated first.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:277
http://jenkins.qa.ubuntu.com/job/libappindicator-ci/8/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libappindicator-raring-amd64-ci/9/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libappindicator-ci/8/rebuild

review: Needs Fixing (continuous-integration)

[Charles Kerr (charlesk)]

> Pushing this up for review and people to start looking at, but if it lands the world will end.

Some people just want to watch the world burn. APPROVE

[Ted Gould (ted)]

Okay, I think I'm happy with this now. Had to clean up some of the action groups stuff. But it should work in most cases now. Next rev we can add a way to put GMenu/GActionGroups in with supported functions. For now we just need to support the old API.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:289
http://jenkins.qa.ubuntu.com/job/libappindicator-ci/10/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libappindicator-raring-amd64-ci/11/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libappindicator-ci/10/rebuild

review: Needs Fixing (continuous-integration)

[Ted Gould (ted)]

Wanted to note here so no one else investigates that the reason Jenkins is failing is because Raring doesn't have the required dependencies. They are in Saucy and the job is on the list to be updated.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:289
http://jenkins.qa.ubuntu.com/job/libappindicator-ci/11/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libappindicator-saucy-amd64-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libappindicator-ci/11/rebuild

review: Needs Fixing (continuous-integration)

[Ted Gould (ted)]

Rebased on the saucy fix to see if we can make Jenkins happy.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:289
http://jenkins.qa.ubuntu.com/job/libappindicator-ci/15/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libappindicator-saucy-amd64-ci/5/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libappindicator-ci/15/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:289
http://jenkins.qa.ubuntu.com/job/libappindicator-ci/16/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libappindicator-saucy-amd64-ci/6

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libappindicator-ci/16/rebuild

review: Approve (continuous-integration)

Unmerged revisions

289. By Ted Gould on 2013-05-08

Blocking a silly warning that isn't useful. Remember this when commenting on the quality of the GLib API.

288. By Ted Gould on 2013-05-08

Make GTK doc happy

287. By Ted Gould on 2013-05-08

Upgrade to a pop culture reference

286. By Ted Gould on 2013-05-08

Handling the debug property using boxed types

285. By Ted Gould on 2013-05-08

Switch over to using the ActionInfo array

284. By Ted Gould on 2013-05-08

Putting the bus stuff in the action info structure

283. By Ted Gould on 2013-05-08

Adds in a structure and an array so that we can start tracking action groups as a set

282. By Ted Gould on 2013-05-08

Fixing some docs errors

281. By Ted Gould on 2013-05-08

Adding support for the properties in their current form.

280. By Ted Gould on 2013-05-07

Add properties for the GMenuModels

=== modified file 'configure.ac'
--- configure.ac	2013-01-29 17:50:13 +0000
+++ configure.ac	2013-06-09 14:13:32 +0000
@@ -58,7 +58,7 @@
                                      glib-2.0 >= $GLIB_REQUIRED_VERSION
                                      gio-2.0 >= $GIO_REQUIRED_VERSION
                                      indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
-                                     dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
+                                     unity-gtk3-parser)
          AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available])
         ],
       [test "x$with_gtk" = x2],
@@ -66,7 +66,7 @@
                                      glib-2.0 >= $GLIB_REQUIRED_VERSION
                                      gio-2.0 >= $GIO_REQUIRED_VERSION
                                      indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
-                                     dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
+                                     unity-gtk2-parser)
         ],
       [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])]
 )
 
=== modified file 'debian/control'
--- debian/control	2013-03-11 12:59:43 +0000
+++ debian/control	2013-06-09 14:13:32 +0000
@@ -26,9 +26,8 @@
                libdbus-glib-1-dev (>= 0.82),
                libindicator-dev (>= 0.3.90),
                libindicator3-dev (>= 0.3.90),
-               libdbusmenu-glib-dev (>= 0.5.90),
-               libdbusmenu-gtk-dev (>= 0.5.90),
-               libdbusmenu-gtk3-dev (>= 0.5.90),
+               libunity-gtk2-parser-dev,
+               libunity-gtk3-parser-dev,
                libgirepository1.0-dev,
                gir1.2-glib-2.0,
                gir1.2-gtk-2.0,
 
=== modified file 'example/simple-client.c'
--- example/simple-client.c	2012-01-29 03:38:55 +0000
+++ example/simple-client.c	2013-06-09 14:13:32 +0000
@@ -21,8 +21,6 @@
 */
 
 #include "app-indicator.h"
-#include "libdbusmenu-glib/server.h"
-#include "libdbusmenu-glib/menuitem.h"
 
 GMainLoop * mainloop = NULL;
 static gboolean active = TRUE;
 
=== modified file 'src/app-indicator.c'
--- src/app-indicator.c	2013-04-19 12:07:21 +0000
+++ src/app-indicator.c	2013-06-09 14:13:32 +0000
@@ -31,10 +31,7 @@
 #include "config.h"
 #endif
 
-#include <libdbusmenu-glib/menuitem.h>
-#include <libdbusmenu-glib/server.h>
-#include <libdbusmenu-gtk/client.h>
-#include <libdbusmenu-gtk/parser.h>
+#include <unity-gtk-parser.h>
 
 #include <libindicator/indicator-desktop-shortcuts.h>
 
@@ -52,16 +49,8 @@
 
 /**
  * AppIndicatorPrivate:
+ *
  * All of the private data in an instance of an application indicator.
- *
- * Private Fields
- * @id: The ID of the indicator.  Maps to AppIndicator:id.
- * @category: Which category the indicator is.  Maps to AppIndicator:category.
- * @status: The status of the indicator.  Maps to AppIndicator:status.
- * @icon_name: The name of the icon to use.  Maps to AppIndicator:icon-name.
- * @attention_icon_name: The name of the attention icon to use.  Maps to AppIndicator:attention-icon-name.
- * @menu: The menu for this indicator.  Maps to AppIndicator:menu
- * @watcher_proxy: The proxy connection to the watcher we're connected to.  If we're not connected to one this will be %NULL.
  */
 struct _AppIndicatorPrivate {
 	/*< Private >*/
@@ -73,7 +62,6 @@
 	gchar                *icon_name;
 	gchar                *attention_icon_name;
 	gchar                *icon_theme_path;
-	DbusmenuServer       *menuservice;
 	GtkWidget            *menu;
 	GtkWidget            *sec_activate_target;
 	gboolean              sec_activate_enabled;
@@ -88,6 +76,12 @@
 	GtkStatusIcon *       status_icon;
 	gint                  fallback_timer;
 
+	/* Menu Stuff */
+	GMenuModel *          menu_model;
+	guint                 menu_model_export;
+	gchar *               menu_shell_path;
+	GArray *              menu_groups;
+
 	/* Fun stuff */
 	GDBusProxy           *watcher_proxy;
 	GDBusConnection      *connection;
@@ -98,6 +92,16 @@
 	IndicatorDesktopShortcuts * shorties;
 };
 
+typedef struct _ActionInfo ActionInfo;
+struct _ActionInfo {
+	gchar *           prefix;
+	gchar *           path;
+	GActionGroup *    group;
+
+	GDBusConnection * bus;
+	guint             export;
+};
+
 /* Signals Stuff */
 enum {
 	NEW_ICON,
@@ -129,6 +133,8 @@
 	PROP_LABEL_GUIDE,
 	PROP_ORDERING_INDEX,
 	PROP_DBUS_MENU_SERVER,
+	PROP_MENU_MODEL,
+	PROP_ACTION_GROUPS,
 	PROP_TITLE
 };
 
@@ -147,6 +153,8 @@
 #define PROP_ORDERING_INDEX_S        "ordering-index"
 #define PROP_DBUS_MENU_SERVER_S      "dbus-menu-server"
 #define PROP_TITLE_S                 "title"
+#define PROP_MENU_MODEL_S            "menu-model"
+#define PROP_ACTION_GROUPS_S         "action-groups"
 
 /* Private macro, shhhh! */
 #define APP_INDICATOR_GET_PRIVATE(o) \
@@ -194,6 +202,10 @@
 static void bus_method_call (GDBusConnection * connection, const gchar * sender, const gchar * path, const gchar * interface, const gchar * method, GVariant * params, GDBusMethodInvocation * invocation, gpointer user_data);
 static void bus_creation (GObject * obj, GAsyncResult * res, gpointer user_data);
 static void bus_watcher_ready (GObject * obj, GAsyncResult * res, gpointer user_data);
+static void setup_dbusmenu (AppIndicator *self);
+static void unexport_menu (AppIndicator *self);
+static void export_me_maybe (AppIndicator *self);
+static void action_info_clear (gpointer datain);
 
 static const GDBusInterfaceVTable item_interface_table = {
 	method_call:    bus_method_call,
@@ -399,7 +411,6 @@
 	                                                   "A way to override the default ordering of the applications by providing a very specific idea of where this entry should be placed.",
 	                                                   0, G_MAXUINT32, 0,
 	                                                   G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
 	/**
 	 * AppIndicator:dbus-menu-server:
 	 *
@@ -411,7 +422,7 @@
 	                                g_param_spec_object (PROP_DBUS_MENU_SERVER_S,
 	                                                     "The internal DBusmenu Server",
 	                                                     "DBusmenu server which is available for testing the application indicators.",
-	                                                     DBUSMENU_TYPE_SERVER,
+	                                                     G_TYPE_OBJECT,
 	                                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 	/**
 	 * AppIndicator:title:
@@ -429,6 +440,34 @@
 	                                                     NULL,
 	                                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
+	/**
+	 * AppIndicator:menu-model:
+	 *
+	 * The built menu model.  This is only used for testing and should
+	 * not be considered stable.
+	 */
+	g_object_class_install_property(object_class,
+	                                PROP_MENU_MODEL,
+	                                g_param_spec_object (PROP_MENU_MODEL_S,
+	                                                     "Internal Menu Model",
+	                                                     "TESTING ONLY: Property to get the menu model",
+	                                                     G_TYPE_MENU_MODEL,
+	                                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+	/**
+	 * AppIndicator:action-groups:
+	 *
+	 * The built action group.  This is only used for testing and should
+	 * not be considered stable.
+	 */
+	g_object_class_install_property(object_class,
+	                                PROP_ACTION_GROUPS,
+	                                g_param_spec_boxed  (PROP_ACTION_GROUPS_S,
+	                                                     "Internal Action Group",
+	                                                     "TESTING ONLY: Property to get the action group",
+	                                                     G_TYPE_ARRAY,
+	                                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
 	/* Signals */
 
 	/**
@@ -479,7 +518,7 @@
 	 * AppIndicator::new-label:
 	 * @arg0: The #AppIndicator object
 	 * @arg1: The string for the label
-	 * @arg1: The string for the guide
+	 * @arg2: The string for the guide
 	 *
 	 * Emitted when either #AppIndicator:label or #AppIndicator:label-guide are
 	 * changed.
@@ -591,7 +630,7 @@
 	priv->attention_icon_name = NULL;
 	priv->icon_theme_path = NULL;
 	priv->menu = NULL;
-	priv->menuservice = NULL;
+	priv->menu_shell_path = NULL;
 	priv->ordering_index = 0;
 	priv->title = NULL;
 	priv->label = NULL;
@@ -611,6 +650,9 @@
 	priv->sec_activate_target = NULL;
 	priv->sec_activate_enabled = FALSE;
 
+	priv->menu_groups = g_array_new(FALSE /* zero term */, FALSE /* clear */, sizeof(ActionInfo));
+	g_array_set_clear_func(priv->menu_groups, action_info_clear);
+
 	self->priv = priv;
 
 	/* Start getting the session bus */
@@ -663,8 +705,12 @@
 		priv->menu = NULL;
 	}
 
-	if (priv->menuservice != NULL) {
-		g_object_unref (priv->menuservice);
+	unexport_menu(self);
+
+	g_clear_object(&priv->menu_model);
+
+	if (priv->menu_groups->len > 0) {
+		g_array_remove_range(priv->menu_groups, 0, priv->menu_groups->len);
 	}
 
 	if (priv->watcher_proxy != NULL) {
@@ -765,10 +811,37 @@
 		priv->path = NULL;
 	}
 
+	g_clear_pointer(&priv->menu_shell_path, g_free);
+
+	if (priv->menu_groups != NULL) {
+		g_array_free(priv->menu_groups, TRUE /* destroy segment */);
+		priv->menu_groups = NULL;
+	}
+
 	G_OBJECT_CLASS (app_indicator_parent_class)->finalize (object);
 	return;
 }
 
+/* Cleans up an action info struct */
+static void
+action_info_clear (gpointer datain)
+{
+	ActionInfo * ainfo = (ActionInfo *)datain;
+
+	g_clear_pointer(&ainfo->prefix, g_free);
+	g_clear_pointer(&ainfo->path, g_free);
+	g_clear_object(&ainfo->group);
+
+	if (ainfo->export != 0) {
+		g_dbus_connection_unexport_action_group(ainfo->bus, ainfo->export);
+		ainfo->export = 0;
+	}
+
+	g_clear_object(&ainfo->bus);
+
+	return;
+}
+
 #define WARN_BAD_TYPE(prop, value)  g_warning("Can not work with property '%s' with value of type '%s'.", prop, G_VALUE_TYPE_NAME(value))
 
 /* Set some properties */
@@ -926,10 +999,28 @@
 		  break;
 
 		case PROP_DBUS_MENU_SERVER:
-			g_clear_object (&priv->menuservice);
-			priv->menuservice = DBUSMENU_SERVER (g_value_dup_object(value));
-			break;
-
+			g_warning("DBus Menu Server is a testing parameter.  Why are you using it?  Please stop.");
+			break;
+
+		case PROP_MENU_MODEL:
+			unexport_menu(self);
+
+			g_clear_object(&priv->menu_model);
+			priv->menu_model = g_value_dup_object(value);
+
+			export_me_maybe(self);
+			break;
+		case PROP_ACTION_GROUPS:
+			if (priv->menu_groups != NULL) {
+				g_array_free(priv->menu_groups, TRUE /* destroy segment */);
+				priv->menu_groups = NULL;
+			}
+
+			priv->menu_groups = g_value_get_boxed(value);
+			g_array_ref(priv->menu_groups);
+
+			export_me_maybe(self);
+			break;
         default:
           G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
           break;
@@ -1009,13 +1100,22 @@
 		  break;
 
 		case PROP_DBUS_MENU_SERVER:
-			g_value_set_object(value, priv->menuservice);
+			g_warning("DBus Menu Server is a testing parameter.  Why are you using it?  Please stop.");
+			g_value_set_object(value, NULL);
 			break;
 
 		case PROP_TITLE:
 			g_value_set_string(value, priv->title);
 			break;
 
+		case PROP_MENU_MODEL:
+			g_value_set_object(value, priv->menu_model);
+			break;
+
+		case PROP_ACTION_GROUPS:
+			g_value_set_boxed(value, priv->menu_groups);
+			break;
+
         default:
           G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
           break;
@@ -1138,16 +1238,7 @@
 	} else if (g_strcmp0(property, "IconThemePath") == 0) {
 		return g_variant_new_string(priv->icon_theme_path ? priv->icon_theme_path : "");
 	} else if (g_strcmp0(property, "Menu") == 0) {
-		if (priv->menuservice != NULL) {
-			GValue strval = { 0 };
-			g_value_init(&strval, G_TYPE_STRING);
-			g_object_get_property (G_OBJECT (priv->menuservice), DBUSMENU_SERVER_PROP_DBUS_OBJECT, &strval);
-			GVariant * var = g_variant_new("o", g_value_get_string(&strval));
-			g_value_unset(&strval);
-			return var;
-		} else {
-			return g_variant_new("o", "/");
-		}
+		return g_variant_new("o", "/");
 	} else if (g_strcmp0(property, "XAyatanaLabel") == 0) {
 		return g_variant_new_string(priv->label ? priv->label : "");
 	} else if (g_strcmp0(property, "XAyatanaLabelGuide") == 0) {
@@ -1158,6 +1249,31 @@
 		return g_variant_new_string(priv->accessible_desc ? priv->accessible_desc : "");
 	} else if (g_strcmp0(property, "AttentionAccessibleDesc") == 0) {
 		return g_variant_new_string(priv->att_accessible_desc ? priv->att_accessible_desc : "");
+	} else if (g_strcmp0(property, "XCanonicalMenuModel") == 0) {
+		if (priv->menu_shell_path != NULL) {
+			return g_variant_new_object_path(priv->menu_shell_path);
+		} else {
+			return g_variant_new_object_path("/");
+		}
+	} else if (g_strcmp0(property, "XCanonicalActionGroups") == 0) {
+		if (priv->menu_groups->len != 0) {
+			GVariantBuilder array;
+			g_variant_builder_init(&array, G_VARIANT_TYPE_ARRAY);
+
+			int i;
+			for (i = 0; i < priv->menu_groups->len; i++) {
+				ActionInfo * ainfo = &g_array_index(priv->menu_groups, ActionInfo, i);
+
+				g_variant_builder_open(&array, G_VARIANT_TYPE_TUPLE);
+				g_variant_builder_add_value(&array, g_variant_new_string(ainfo->prefix));
+				g_variant_builder_add_value(&array, g_variant_new_object_path(ainfo->path));
+				g_variant_builder_close(&array);
+			}
+
+			return g_variant_builder_end(&array);
+		} else {
+			return g_variant_new_array(G_VARIANT_TYPE("(so)"), NULL, 0);
+		}
 	}
 
 	*error = g_error_new(0, 0, "Unknown property: %s", property);
@@ -1261,6 +1377,8 @@
 		}
 	}
 
+	export_me_maybe(self);
+
 	/* NOTE: It's really important the order here.  We make sure to *publish*
 	   the object on the bus and *then* get the proxy.  The reason is that we
 	   want to ensure all the filters are setup before talking to the watcher
@@ -1746,6 +1864,79 @@
 	self->priv->sec_activate_enabled = widget_is_menu_child(self, menuitem);
 }
 
+/* Unexport the menu, doesn't unref objects */
+static void
+unexport_menu (AppIndicator *self)
+{
+	AppIndicatorPrivate *priv = self->priv;
+
+	if (priv->connection == NULL) {
+		return;
+	}
+
+	if (priv->menu_model_export != 0) {
+		g_dbus_connection_unexport_menu_model(priv->connection, priv->menu_model_export);
+		priv->menu_model_export = 0;
+	}
+
+	if (priv->menu_groups->len > 0) {
+		g_array_remove_range(priv->menu_groups, 0, priv->menu_groups->len);
+	}
+
+	g_clear_pointer(&priv->menu_shell_path, g_free);
+
+	return;
+}
+
+/* We just met, and I know this is crazy, but export me maybe? */
+/* Export the menu if we've got everything we need */
+static void
+export_me_maybe (AppIndicator *self)
+{
+	AppIndicatorPrivate *priv = self->priv;
+
+	if (priv->connection == NULL) {
+		return;
+	}
+
+	if (priv->menu_model == NULL) {
+		return;
+	}
+
+	if (priv->menu_groups->len == 0) {
+		return;
+	}
+
+	if (priv->menu_model_export != 0) {
+		return;
+	}
+
+	GError * error = NULL;
+	int i;
+	for (i = 0; i < priv->menu_groups->len; i++) {
+		ActionInfo * ainfo = &g_array_index(priv->menu_groups, ActionInfo, i);
+
+		ainfo->bus = g_object_ref(priv->connection);
+
+		ainfo->export = g_dbus_connection_export_action_group(ainfo->bus, ainfo->path, ainfo->group, &error);
+
+		if (error != NULL) {
+			g_warning("Unable to export action group as '%s': %s", ainfo->path, error->message);
+			g_error_free(error);
+			error = NULL;
+		}
+	}
+
+	priv->menu_model_export = g_dbus_connection_export_menu_model(priv->connection, priv->menu_shell_path, priv->menu_model, NULL);
+
+	if (error != NULL) {
+		g_warning("Unable to export menu model as '%s': %s", priv->menu_shell_path, error->message);
+		g_error_free(error);
+		error = NULL;
+	}
+
+	return;
+}
 
 /* ************************* */
 /*    Public Functions       */
@@ -2072,25 +2263,26 @@
 setup_dbusmenu (AppIndicator *self)
 {
 	AppIndicatorPrivate *priv;
-	DbusmenuMenuitem *root = NULL;
-
 	priv = self->priv;
 
+	unexport_menu(self);
+
+	g_clear_object(&priv->menu_model);
+
 	if (priv->menu) {
-		root = dbusmenu_gtk_parse_menu_structure(priv->menu);
-	}
-
-	if (priv->menuservice == NULL) {
-		gchar * path = g_strdup_printf(DEFAULT_ITEM_PATH "/%s/Menu", priv->clean_id);
-		priv->menuservice = dbusmenu_server_new (path);
-		g_free(path);
-	}
-
-	dbusmenu_server_set_root (priv->menuservice, root);
-
-	/* Drop our local ref as set_root should get it's own. */
-	if (root != NULL) {
-		g_object_unref(root);
+		ActionInfo ainfo;
+
+		priv->menu_model = G_MENU_MODEL(unity_gtk_menu_shell_new(GTK_MENU_SHELL(priv->menu)));
+		priv->menu_shell_path = g_strdup_printf(DEFAULT_ITEM_PATH "/%s/Menu", priv->clean_id);
+
+		ainfo.group = G_ACTION_GROUP(unity_gtk_action_group_new(NULL));
+		ainfo.prefix = g_strdup("unity");
+		ainfo.path = g_strdup(priv->menu_shell_path);
+		g_array_append_val(priv->menu_groups, ainfo);
+
+		unity_gtk_action_group_connect_shell(UNITY_GTK_ACTION_GROUP(ainfo.group), UNITY_GTK_MENU_SHELL(priv->menu_model));
+
+		export_me_maybe(self);
 	}
 
 	return;
@@ -2463,14 +2655,13 @@
 	return GTK_WIDGET(self->priv->sec_activate_target);
 }
 
-#define APP_INDICATOR_SHORTY_NICK "app-indicator-shorty-nick"
-
 /* Callback when an item from the desktop shortcuts gets
    called. */
 static void
-shorty_activated_cb (DbusmenuMenuitem * mi, guint timestamp, gpointer user_data)
+shorty_activated_cb (GSimpleAction * action, GVariant * param, gpointer user_data)
 {
-	gchar * nick = g_object_get_data(G_OBJECT(mi), APP_INDICATOR_SHORTY_NICK);
+	gchar * nick = NULL;
+	g_object_get(G_OBJECT(action), "name", &nick, NULL);
 	g_return_if_fail(nick != NULL);
 
 	g_return_if_fail(IS_APP_INDICATOR(user_data));
@@ -2500,45 +2691,53 @@
 	AppIndicatorPrivate *priv = self->priv;
 
 	/* Build a new shortcuts object */
-	if (priv->shorties != NULL) {
-		g_object_unref(priv->shorties);
-		priv->shorties = NULL;
-	}
+	g_clear_object(&priv->shorties);
 	priv->shorties = indicator_desktop_shortcuts_new(desktop_file, desktop_profile);
 	g_return_if_fail(priv->shorties != NULL);
 
+	/* Remove the exported menu */
+	unexport_menu(self);
+
+	g_clear_object(&priv->menu_model);
+
+	/* Get the 'nicks' */
 	const gchar ** nicks = indicator_desktop_shortcuts_get_nicks(priv->shorties);
+
+	if (nicks[0] == NULL) {
+		g_warning("Desktop file '%s' doesn't contain any usable actions", desktop_file);
+		return;
+	}
+
+	/* Build new menus and action groups */
+	GMenu * menu = g_menu_new();
+	priv->menu_model = G_MENU_MODEL(menu);
+	priv->menu_shell_path = g_strdup_printf(DEFAULT_ITEM_PATH "/%s/Menu", priv->clean_id);
+
+	ActionInfo ainfo;
+	GSimpleActionGroup * actions = g_simple_action_group_new();
+	ainfo.group = G_ACTION_GROUP(actions);
+	ainfo.prefix = g_strdup("");
+	ainfo.path = g_strdup(priv->menu_shell_path);
+	g_array_append_val(priv->menu_groups, ainfo);
+
 	int nick_num;
-
-	/* Place the items on a dbusmenu */
-	DbusmenuMenuitem * root = dbusmenu_menuitem_new();
-
 	for (nick_num = 0; nicks[nick_num] != NULL; nick_num++) {
-		DbusmenuMenuitem * item = dbusmenu_menuitem_new();
-		g_object_set_data(G_OBJECT(item), APP_INDICATOR_SHORTY_NICK, (gpointer)nicks[nick_num]);
+		GSimpleAction * action = g_simple_action_new(nicks[nick_num], NULL);
+		g_signal_connect(action, "activate", G_CALLBACK(shorty_activated_cb), self);
 
 		gchar * name = indicator_desktop_shortcuts_nick_get_name(priv->shorties, nicks[nick_num]);
-		dbusmenu_menuitem_property_set(item, DBUSMENU_MENUITEM_PROP_LABEL, name);
+		GMenuItem * item = g_menu_item_new(name, nicks[nick_num]);
 		g_free(name);
 
-		g_signal_connect(G_OBJECT(item), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(shorty_activated_cb), self);
-
-		dbusmenu_menuitem_child_append(root, item);
-	}
-
-	/* Swap it if needed */
-	if (priv->menuservice == NULL) {
-		gchar * path = g_strdup_printf(DEFAULT_ITEM_PATH "/%s/Menu", priv->clean_id);
-		priv->menuservice = dbusmenu_server_new (path);
-		g_free(path);
-	}
-
-	dbusmenu_server_set_root (priv->menuservice, root);
-
-	if (priv->menu != NULL) {
-		g_object_unref(G_OBJECT(priv->menu));
-		priv->menu = NULL;
-	}
+		g_simple_action_group_insert(actions, G_ACTION(action));
+		g_menu_append_item(menu, item);
+
+		g_object_unref(action);
+		g_object_unref(item);
+	}
+
+	/* Export the menu and action group */
+	export_me_maybe(self);
 
 	return;
 }
 
=== modified file 'src/app-indicator.h'
--- src/app-indicator.h	2012-02-03 20:37:56 +0000
+++ src/app-indicator.h	2013-06-09 14:13:32 +0000
@@ -238,10 +238,6 @@
  * unique status in the panel for an application.  In general, applications
  * should try to fit in the other indicators that are available on the
  * panel before using this.  But, sometimes it is necissary.
- *
- *  Private fields
- * @parent: Parent object.
- * @priv: Internal data.
  */
 struct _AppIndicator {
 	GObject parent;
 
=== modified file 'src/notification-item.xml'
--- src/notification-item.xml	2012-02-03 20:37:56 +0000
+++ src/notification-item.xml	2013-06-09 14:13:32 +0000
@@ -18,6 +18,8 @@
 		<property name="XAyatanaLabel" type="s" access="read" />
 		<property name="XAyatanaLabelGuide" type="s" access="read" />
 		<property name="XAyatanaOrderingIndex" type="u" access="read" />
+		<property name="XCanonicalMenuModel" type="o" access="read" />
+		<property name="XCanonicalActionGroups" type="a(so)" access="read" />
 
 <!-- Methods -->
 		<method name="Scroll">
 
=== modified file 'tests/test-libappindicator.c'
--- tests/test-libappindicator.c	2013-01-10 22:18:55 +0000
+++ tests/test-libappindicator.c	2013-06-09 14:13:32 +0000
@@ -22,12 +22,10 @@
 
 #include <glib.h>
 #include <glib-object.h>
+#include <gio/gio.h>
 
 #include <app-indicator.h>
 
-#include <libdbusmenu-glib/menuitem.h>
-#include <libdbusmenu-glib/server.h>
-
 static gboolean
 allow_warnings (const gchar *log_domain, GLogLevelFlags log_level,
                 const gchar *message, gpointer user_data)
@@ -270,26 +268,26 @@
 
 	g_assert(app_indicator_get_menu(ci) != NULL);
 
-	GValue serverval = {0};
-	g_value_init(&serverval, DBUSMENU_TYPE_SERVER);
-	g_object_get_property(G_OBJECT(ci), "dbus-menu-server", &serverval);
-
-	DbusmenuServer * server = DBUSMENU_SERVER(g_value_get_object(&serverval));
-	g_assert(server != NULL);
-
-	GValue rootval = {0};
-	g_value_init(&rootval, DBUSMENU_TYPE_MENUITEM);
-	g_object_get_property(G_OBJECT(server), DBUSMENU_SERVER_PROP_ROOT_NODE, &rootval);
-	DbusmenuMenuitem * root = DBUSMENU_MENUITEM(g_value_get_object(&rootval));
-	g_assert(root != NULL);
-
-	GList * children = dbusmenu_menuitem_get_children(root);
-	g_assert(children != NULL);
-	g_assert(g_list_length(children) == 1);
-
-	const gchar * label = dbusmenu_menuitem_property_get(DBUSMENU_MENUITEM(children->data), DBUSMENU_MENUITEM_PROP_LABEL);
+	GValue modelval = {0};
+	g_value_init(&modelval, G_TYPE_MENU_MODEL);
+	g_object_get_property(G_OBJECT(ci), "menu-model", &modelval);
+
+	GMenuModel * model = G_MENU_MODEL(g_value_get_object(&modelval));
+	g_assert(model != NULL);
+
+	g_assert_cmpint(g_menu_model_get_n_items(model), ==, 1);
+
+	GMenuModel * section = g_menu_model_get_item_link(model, 0, G_MENU_LINK_SECTION);
+	g_assert(section != NULL);
+
+	g_assert_cmpint(g_menu_model_get_n_items(section), ==, 1);
+
+	GVariant * label = g_menu_model_get_item_attribute_value(section, 0, G_MENU_ATTRIBUTE_LABEL, G_VARIANT_TYPE_STRING);
 	g_assert(label != NULL);
-	g_assert(g_strcmp0(label, "Test Label") == 0);
+	g_assert(g_strcmp0("Test Label", g_variant_get_string(label, NULL)) == 0);
+
+	g_variant_unref(label);
+	g_object_unref(model);
 
 	/* Interesting, eh?  We need this because we send out events on the bus
 	   but they don't come back until the idle is run.  So we need those
@@ -388,24 +386,15 @@
 
 	app_indicator_build_menu_from_desktop(ci, SRCDIR "/test-libappindicator.desktop", "Test Program");
 
-	GValue serverval = {0};
-	g_value_init(&serverval, DBUSMENU_TYPE_SERVER);
-	g_object_get_property(G_OBJECT(ci), "dbus-menu-server", &serverval);
-
-	DbusmenuServer * server = DBUSMENU_SERVER(g_value_get_object(&serverval));
-	g_assert(server != NULL);
-
-	GValue rootval = {0};
-	g_value_init(&rootval, DBUSMENU_TYPE_MENUITEM);
-	g_object_get_property(G_OBJECT(server), DBUSMENU_SERVER_PROP_ROOT_NODE, &rootval);
-	DbusmenuMenuitem * root = DBUSMENU_MENUITEM(g_value_get_object(&rootval));
-	g_assert(root != NULL);
-
-	GList * children = dbusmenu_menuitem_get_children(root);
-	g_assert(children != NULL);
-	g_assert(g_list_length(children) == 3);
-
-
+	GValue modelval = {0};
+	g_value_init(&modelval, G_TYPE_MENU_MODEL);
+	g_object_get_property(G_OBJECT(ci), "menu-model", &modelval);
+
+	GMenuModel * model = G_MENU_MODEL(g_value_get_object(&modelval));
+	g_assert(model != NULL);
+
+	g_assert(g_menu_model_get_n_items(model) == 3);
+	g_object_unref(model);
 
 	g_object_unref(G_OBJECT(ci));
 	return;
@@ -426,21 +415,12 @@
 
 	app_indicator_build_menu_from_desktop(ci, SRCDIR "/test-libappindicator.desktop", "Not Test Program");
 
-	GValue serverval = {0};
-	g_value_init(&serverval, DBUSMENU_TYPE_SERVER);
-	g_object_get_property(G_OBJECT(ci), "dbus-menu-server", &serverval);
-
-	DbusmenuServer * server = DBUSMENU_SERVER(g_value_get_object(&serverval));
-	g_assert(server != NULL);
-
-	GValue rootval = {0};
-	g_value_init(&rootval, DBUSMENU_TYPE_MENUITEM);
-	g_object_get_property(G_OBJECT(server), DBUSMENU_SERVER_PROP_ROOT_NODE, &rootval);
-	DbusmenuMenuitem * root = DBUSMENU_MENUITEM(g_value_get_object(&rootval));
-	g_assert(root != NULL);
-
-	GList * children = dbusmenu_menuitem_get_children(root);
-	g_assert(g_list_length(children) == 0);
+	GValue modelval = {0};
+	g_value_init(&modelval, G_TYPE_MENU_MODEL);
+	g_object_get_property(G_OBJECT(ci), "menu-model", &modelval);
+
+	GMenuModel * model = G_MENU_MODEL(g_value_get_object(&modelval));
+	g_assert(model == NULL);
 
 	g_object_unref(G_OBJECT(ci));
 	return;
 
=== modified file 'tests/test-simple-app.c'
--- tests/test-simple-app.c	2013-01-16 19:53:52 +0000
+++ tests/test-simple-app.c	2013-06-09 14:13:32 +0000
@@ -20,10 +20,8 @@
 */
 
 
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
 #include <glib.h>
-#include <libdbusmenu-glib/server.h>
+#include <gio/gio.h>
 #include <app-indicator.h>
 
 static GMainLoop * mainloop = NULL;
@@ -31,15 +29,19 @@
 int
 main (int argc, char ** argv)
 {
-	DbusmenuServer * dms = dbusmenu_server_new("/menu");
-	DbusmenuMenuitem * dmi = dbusmenu_menuitem_new();
-	dbusmenu_menuitem_property_set(dmi, "label", "Bob");
+	GMenu * menu = g_menu_new();
+	g_menu_append(menu, "Bob", "action");
+
+	GSimpleActionGroup * actions = g_simple_action_group_new();
+	GSimpleAction * action = g_simple_action_new("action", NULL);
+	g_simple_action_group_insert(actions, G_ACTION(action));
 
 	AppIndicator * ci = APP_INDICATOR(g_object_new(APP_INDICATOR_TYPE, 
 	                                               "id", "test-application",
 	                                               "status-enum", APP_INDICATOR_STATUS_ACTIVE,
 	                                               "icon-name", "system-shutdown",
-	                                               "menu-object", dms,
+	                                               "menu-model", menu,
+	                                               "action-group", actions,
 	                                               NULL));
 
 	mainloop = g_main_loop_new(NULL, FALSE);