Import upstream version 12.10.5

16 files changed, 138 insertions, 45 deletions

diff --git a/AUTHORS b/AUTHORS
index ead2aa4..c322dca 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -10,6 +10,7 @@
  David Barth 
  Gabor Kelemen 
  James Westby 
+ Jason Conti 
  Kees Cook 
  Ken VanDine 
  Lars Uebernickel 
diff --git a/ChangeLog b/ChangeLog
index 54c7780..c064b7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,62 @@
 # Generated by Makefile. Do not edit.
 
+2012-10-24  Lars Uebernickel  <lars.uebernickel@canonical.com>
+
+	12.10.5
+
+2012-10-24  Lars Uebernickel  <lars.uebernickel@canonical.com>
+
+	messaging_menu_app_set_source_icon: unset x-canonical-icon if NULL is passed. Fixes: https://bugs.launchpad.net/bugs/1070421. Approved by Charles Kerr.
+
+2012-10-24  Lars Uebernickel  <lars.uebernickel@canonical.com>
+
+	messaging_menu_app_set_source_icon: unset x-canonical-icon if NULL is passed
+
+2012-10-18  Lars Uebernickel  <lars.uebernickel@canonical.com>
+
+	Merge  lp:~jconti/indicator-messages/unexport-items
+	
+	libmessaging-menu: unexport action group and menu model on dispose.
+
+2012-10-10  Jason Conti  <jason.conti@gmail.com>
+
+	Unexport actions/menus on dispose
+
+2012-10-18  Lars Uebernickel  <lars.uebernickel@canonical.com>
+
+	Merge lp:~larsu/indicator-messages/lp1064314
+	
+	Fixes a crash in libmessaging-menu when menus and action groups cannot be
+	exported.
+
+2012-10-11  Lars Uebernickel  <lars.uebernickel@canonical.com>
+
+	libmessaging-menu: clear error before reusing it
+
+2012-10-10  Ken VanDine  <ken.vandine@canonical.com>
+
+	Fixed typo in doc string. Approved by Charles Kerr, jenkins.
+
+2012-10-09  Ken VanDine  <ken.vandine@canonical.com>
+
+	Fixed typo in docstring
+
+2012-10-03  Lars Uebernickel  <lars.uebernickel@canonical.com>
+
+	Call gtk-update-icon-cache on $(datadir)/icons/hicolor
+	
+	That's were icons are installed, not $(pkgdatadir).. Fixes: https://bugs.launchpad.net/bugs/1060618. Approved by jenkins, Charles Kerr.
+
+2012-10-03  Lars Uebernickel  <lars.uebernickel@canonical.com>
+
+	Call gtk-update-icon-cache on $(datadir)/icons/hicolor
+	
+	That's were icons are installed, not $(pkgdatadir).
+
+2012-10-02  Lars Uebernickel  <lars.uebernickel@canonical.com>
+
+	12.10.4
+
 2012-10-02  Lars Uebernickel  <lars.uebernickel@canonical.com>
 
 	Merge lp:~larsu/indicator-messages/lp1056595
diff --git a/NEWS b/NEWS
index 629218d..341594a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,11 @@
 
+12.10.5
+
+* fix crash caused by GError not being cleared (lp #1064314)
+* fix crash when registering an app that was previously unregistered (lp #1065169)
+* remove the icon if NULL is passed to source_set_icon (lp #1070421)
+* call gtk-update-icon-cache (lp #1060618)
+
 12.10.4
 
 * specify fallback icons for the ones with status emblem (lp #1056595)
diff --git a/configure b/configure
index c3f71e9..3257875 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for indicator-messages 12.10.4.
+# Generated by GNU Autoconf 2.69 for indicator-messages 12.10.5.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='indicator-messages'
 PACKAGE_TARNAME='indicator-messages'
-PACKAGE_VERSION='12.10.4'
-PACKAGE_STRING='indicator-messages 12.10.4'
+PACKAGE_VERSION='12.10.5'
+PACKAGE_STRING='indicator-messages 12.10.5'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1448,7 +1448,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures indicator-messages 12.10.4 to adapt to many kinds of systems.
+\`configure' configures indicator-messages 12.10.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1519,7 +1519,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of indicator-messages 12.10.4:";;
+     short | recursive ) echo "Configuration of indicator-messages 12.10.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1660,7 +1660,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-indicator-messages configure 12.10.4
+indicator-messages configure 12.10.5
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2233,7 +2233,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by indicator-messages $as_me 12.10.4, which was
+It was created by indicator-messages $as_me 12.10.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3053,7 +3053,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='indicator-messages'
- VERSION='12.10.4'
+ VERSION='12.10.5'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -19578,7 +19578,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by indicator-messages $as_me 12.10.4, which was
+This file was extended by indicator-messages $as_me 12.10.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19644,7 +19644,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-indicator-messages config.status 12.10.4
+indicator-messages config.status 12.10.5
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 971bd96..8aa2e8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 
-AC_INIT(indicator-messages, 12.10.4)
+AC_INIT(indicator-messages, 12.10.5)
 
 AC_PREREQ(2.62)
 
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 17dca13..44cd81b 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = scalable 16x16 22x22 24x24 32x32 48x48
 
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(pkgdatadir)/icons/hicolor
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
 install-data-hook: update-icon-cache
 uninstall-hook: update-icon-cache
diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in
index 2636126..0496bfc 100644
--- a/data/icons/Makefile.in
+++ b/data/icons/Makefile.in
@@ -301,7 +301,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = scalable 16x16 22x22 24x24 32x32 48x48
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(pkgdatadir)/icons/hicolor
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 all: all-recursive
 
 .SUFFIXES:
diff --git a/doc/reference/html/MessagingMenuApp.html b/doc/reference/html/MessagingMenuApp.html
index aab65dc..e62298a 100644
--- a/doc/reference/html/MessagingMenuApp.html
+++ b/doc/reference/html/MessagingMenuApp.html
@@ -151,7 +151,7 @@ application through a desktop file id, which must be passed to
 <a class="link" href="MessagingMenuApp.html#messaging-menu-app-new" title="messaging_menu_app_new ()"><code class="function">messaging_menu_app_new()</code></a>.
 </p>
 <p>
-To register the appliction with the Messaging Menu, call
+To register the application with the Messaging Menu, call
 <a class="link" href="MessagingMenuApp.html#messaging-menu-app-register" title="messaging_menu_app_register ()"><code class="function">messaging_menu_app_register()</code></a>.  This signifies that the application
 should be present in the menu and be marked as "running".
 </p>
diff --git a/doc/reference/html/ch01.html b/doc/reference/html/ch01.html
index e0b133a..066f19b 100644
--- a/doc/reference/html/ch01.html
+++ b/doc/reference/html/ch01.html
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp3325184"></a>API Reference</h2></div></div></div>
+<a name="idp3828112"></a>API Reference</h2></div></div></div>
 <div class="toc"><dl><dt>
 <span class="refentrytitle"><a href="MessagingMenuApp.html">MessagingMenuApp</a></span><span class="refpurpose"> — An application section in the messaging menu</span>
 </dt></dl></div>
diff --git a/doc/reference/messaging-menu-docs.xml b/doc/reference/messaging-menu-docs.xml
index 771e269..0f129ad 100644
--- a/doc/reference/messaging-menu-docs.xml
+++ b/doc/reference/messaging-menu-docs.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC '-//OASIS//DTD DocBook XML V4.5//EN'
                       'http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd' [
 <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
-<!ENTITY version "12.10.4">
+<!ENTITY version "12.10.5">
 ]>
 <book lang="en" id="messaging-menu" xmlns:xi="http://www.w3.org/2003/XInclude">
 <title>Messaging Menu Reference Manual</title>
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);
 }
 
diff --git a/ltmain.sh b/ltmain.sh
index c2852d8..0096fe6 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -70,7 +70,7 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1
+#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu2
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -80,7 +80,7 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4.2 Debian-2.4.2-1ubuntu1"
+VERSION="2.4.2 Debian-2.4.2-1ubuntu2"
 TIMESTAMP=""
 package_revision=1.3337
 
diff --git a/src/indicator-messages-service.c b/src/indicator-messages-service.c
index 7f2ab87..1dabaed 100644
--- a/src/indicator-messages-service.c
+++ b/src/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/src/indicator-messages-service.h b/src/indicator-messages-service.h
index 2401d0e..cbdd29e 100644
--- a/src/indicator-messages-service.h
+++ b/src/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.
  */