3 files changed, 53 insertions, 25 deletions

diff --git a/libmessaging-menu/indicator-messages-service.c b/libmessaging-menu/indicator-messages-service.c
index 7f2ab87..1dabaed 100644
--- a/libmessaging-menu/indicator-messages-service.c
+++ b/libmessaging-menu/indicator-messages-service.c
@@ -1,5 +1,5 @@
 /*
- * Generated by gdbus-codegen 2.33.12. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.34.0. DO NOT EDIT.
  *
  * The license of this code is the same as for the source it was derived from.
  */
diff --git a/libmessaging-menu/indicator-messages-service.h b/libmessaging-menu/indicator-messages-service.h
index 2401d0e..cbdd29e 100644
--- a/libmessaging-menu/indicator-messages-service.h
+++ b/libmessaging-menu/indicator-messages-service.h
@@ -1,5 +1,5 @@
 /*
- * Generated by gdbus-codegen 2.33.12. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.34.0. DO NOT EDIT.
  *
  * The license of this code is the same as for the source it was derived from.
  */
diff --git a/libmessaging-menu/messaging-menu.c b/libmessaging-menu/messaging-menu.c
index 3c5c6d4..cef5687 100644
--- a/libmessaging-menu/messaging-menu.c
+++ b/libmessaging-menu/messaging-menu.c
@@ -34,7 +34,7 @@
  * application through a desktop file id, which must be passed to
  * messaging_menu_app_new().
  *
- * To register the appliction with the Messaging Menu, call
+ * To register the application with the Messaging Menu, call
  * messaging_menu_app_register().  This signifies that the application
  * should be present in the menu and be marked as "running".
  *
@@ -105,9 +105,12 @@ struct _MessagingMenuApp
   gboolean status_set;
   GSimpleActionGroup *source_actions;
   GMenu *menu;
+  GDBusConnection *bus;
 
   IndicatorMessagesService *messages_service;
   guint watch_id;
+  guint action_export_id;
+  guint menu_export_id;
 
   GCancellable *cancellable;
 };
@@ -166,44 +169,41 @@ export_menus_and_actions (GObject      *source,
                           gpointer      user_data)
 {
   MessagingMenuApp *app = user_data;
-  GDBusConnection *bus;
   GError *error = NULL;
-  guint id;
   gchar *object_path;
 
   object_path = messaging_menu_app_get_dbus_object_path (app);
   if (!object_path)
     return;
 
-  bus = g_bus_get_finish (res, &error);
-  if (bus == NULL)
+  app->bus = g_bus_get_finish (res, &error);
+  if (app->bus == NULL)
     {
       g_warning ("unable to connect to session bus: %s", error->message);
       g_error_free (error);
       return;
     }
 
-  id = g_dbus_connection_export_action_group (bus,
-                                              object_path,
-                                              G_ACTION_GROUP (app->source_actions),
-                                              &error);
-  if (!id)
+  app->action_export_id = g_dbus_connection_export_action_group (app->bus,
+                                                                 object_path,
+                                                                 G_ACTION_GROUP (app->source_actions),
+                                                                 &error);
+  if (!app->action_export_id)
     {
       g_warning ("unable to export action group: %s", error->message);
-      g_error_free (error);
+      g_clear_error (&error);
     }
 
-  id = g_dbus_connection_export_menu_model (bus,
-                                            object_path,
-                                            G_MENU_MODEL (app->menu),
-                                            &error);
-  if (!id)
+  app->menu_export_id = g_dbus_connection_export_menu_model (app->bus,
+                                                             object_path,
+                                                             G_MENU_MODEL (app->menu),
+                                                             &error);
+  if (!app->menu_export_id)
     {
       g_warning ("unable to export menu: %s", error->message);
-      g_error_free (error);
+      g_clear_error (&error);
     }
 
-  g_object_unref (bus);
   g_free (object_path);
 }
 
@@ -257,6 +257,20 @@ messaging_menu_app_dispose (GObject *object)
 {
   MessagingMenuApp *app = MESSAGING_MENU_APP (object);
 
+  if (app->bus)
+    {
+      if (app->action_export_id > 0)
+        g_dbus_connection_unexport_action_group (app->bus, app->action_export_id);
+
+      if (app->menu_export_id > 0)
+        g_dbus_connection_unexport_menu_model (app->bus, app->menu_export_id);
+
+      app->action_export_id = 0;
+      app->menu_export_id = 0;
+      g_object_unref (app->bus);
+      app->bus = NULL;
+    }
+
   if (app->watch_id > 0)
     {
       g_bus_unwatch_name (app->watch_id);
@@ -416,6 +430,10 @@ messaging_menu_app_init (MessagingMenuApp *app)
 {
   app->registered = -1;
   app->status_set = FALSE;
+  app->bus = NULL;
+
+  app->action_export_id = 0;
+  app->menu_export_id = 0;
 
   app->cancellable = g_cancellable_new ();
 
@@ -1015,7 +1033,7 @@ messaging_menu_app_set_source_label (MessagingMenuApp *app,
  * messaging_menu_app_set_source_icon:
  * @app: a #MessagingMenuApp
  * @source_id: a source id
- * @icon: the new icon for the source
+ * @icon: (allow-none): the new icon for the source
  *
  * Changes the icon of @source_id to @icon.
  */
@@ -1026,7 +1044,6 @@ messaging_menu_app_set_source_icon (MessagingMenuApp *app,
 {
   gint pos;
   GMenuItem *item;
-  gchar *iconstr;
 
   g_return_if_fail (MESSAGING_MENU_IS_APP (app));
   g_return_if_fail (source_id != NULL);
@@ -1035,11 +1052,22 @@ messaging_menu_app_set_source_icon (MessagingMenuApp *app,
   if (item == NULL)
     return;
 
-  iconstr = icon ? g_icon_to_string (icon) : NULL;
-  g_menu_item_set_attribute (item, "x-canonical-icon", "s", iconstr);
+  if (icon)
+    {
+      gchar *iconstr;
+
+      iconstr = g_icon_to_string (icon);
+      g_menu_item_set_attribute (item, "x-canonical-icon", "s", iconstr);
+
+      g_free (iconstr);
+    }
+  else
+    {
+      g_menu_item_set_attribute_value (item, "x-canonical-icon", NULL);
+    }
+
   g_menu_replace_item (app->menu, pos, item);
 
-  g_free (iconstr);
   g_object_unref (item);
 }