Merge lp:~dbusmenu-team/libdbusmenu/ubuntu into lp:~ubuntu-desktop/libdbusmenu/ubuntu

[Ted Gould]

[lp:~dbusmenu-team/libdbusmenu/ubuntu]

162. By Ken VanDine on 2011-10-13

releasing version 0.5.0-0ubuntu3

[Ken VanDine (ken-vandine)]

The ~ubuntu-desktop branch wasn't current, we had already had uploads which included these fixes so no point in updating just for the version. I manually merged the changes from 0.5.0-0ubuntu3 into the packaging branch and pushed it.

review: Disapprove

Unmerged revisions

177. By Sebastien Bacher on 2012-03-09

releasing version 0.5.93-0ubuntu2

176. By Sebastien Bacher on 2012-03-09

Backport fix for signal warnings displayed on close (lp: #950762)

=== modified file 'ChangeLog'
--- ChangeLog	2011-09-29 19:40:10 +0000
+++ ChangeLog	2011-10-13 16:36:18 +0000
@@ -1,5 +1,33 @@
 # Generated by Makefile. Do not edit.
 
[phone]  Ted Gould  <[e-mail]>
+
+	0.5.1
+
[phone]  Ted Gould  <[e-mail]>
+
+	Allow about-to-show on 0 based items (root items)
+
[phone]  Ken VanDine  <[e-mail]>
+
+	id of 0 in dbusmenu_client_send_about_to_show is valid, and used in appindicators like nm-applet (LP: #862989)
+
[phone]  Ted Gould  <[e-mail]>
+
+	Make sure to finally unref the GTK menuitem
+
[phone]  Michael Terry  <[e-mail]>
+
+	remove last ref from GtkMenuItems that we create
+
[phone]  Ted Gould  <[e-mail]>
+
+	If the child is copied make sure we don't delete the original.
+
[phone]  Michael Terry  <[e-mail]>
+
+	when resetting an image widget and it's the only child of the menuitem, make sure we don't try to use free'd memory
+
 2011-09-29  Ted Gould  <[e-mail]>
 
 	0.5.0
 
=== modified file 'configure'
--- configure	2011-09-29 19:41:43 +0000
+++ configure	2011-10-13 16:36:18 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for libdbusmenu 0.5.0.
+# Generated by GNU Autoconf 2.68 for libdbusmenu 0.5.1.
 #
 # Report bugs to <[e-mail]>.
 #
@@ -572,8 +572,8 @@
 # Identity of this package.
 PACKAGE_NAME='libdbusmenu'
 PACKAGE_TARNAME='libdbusmenu'
-PACKAGE_VERSION='0.5.0'
-PACKAGE_STRING='libdbusmenu 0.5.0'
+PACKAGE_VERSION='0.5.1'
+PACKAGE_STRING='libdbusmenu 0.5.1'
 PACKAGE_BUGREPORT='[e-mail]'
 PACKAGE_URL=''
 
@@ -1429,7 +1429,7 @@
   # 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 libdbusmenu 0.5.0 to adapt to many kinds of systems.
+\`configure' configures libdbusmenu 0.5.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1499,7 +1499,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libdbusmenu 0.5.0:";;
+     short | recursive ) echo "Configuration of libdbusmenu 0.5.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1649,7 +1649,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libdbusmenu configure 0.5.0
+libdbusmenu configure 0.5.1
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2020,7 +2020,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libdbusmenu $as_me 0.5.0, which was
+It was created by libdbusmenu $as_me 0.5.1, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2841,7 +2841,7 @@
 
 # Define the identity of the package.
  PACKAGE=libdbusmenu
- VERSION=0.5.0
+ VERSION=0.5.1
 
 
 # Some tools Automake needs.
@@ -14309,7 +14309,7 @@
 ###########################
 
 LIBDBUSMENU_CURRENT=4
-LIBDBUSMENU_REVISION=5
+LIBDBUSMENU_REVISION=6
 LIBDBUSMENU_AGE=0
 
 
@@ -15659,7 +15659,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libdbusmenu $as_me 0.5.0, which was
+This file was extended by libdbusmenu $as_me 0.5.1, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15725,7 +15725,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libdbusmenu config.status 0.5.0
+libdbusmenu config.status 0.5.1
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
 
=== modified file 'configure.ac'
--- configure.ac	2011-09-29 19:41:43 +0000
+++ configure.ac	2011-10-13 16:36:18 +0000
@@ -1,11 +1,11 @@
 
-AC_INIT(libdbusmenu, 0.5.0, [e-mail])
+AC_INIT(libdbusmenu, 0.5.1, [e-mail])
 AC_COPYRIGHT([Copyright 2009,2010 Canonical])
 
 AC_PREREQ(2.62)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libdbusmenu, 0.5.0, [-Wno-portability])
+AM_INIT_AUTOMAKE(libdbusmenu, 0.5.1, [-Wno-portability])
 
 AM_MAINTAINER_MODE
 
@@ -172,7 +172,7 @@
 ###########################
 
 LIBDBUSMENU_CURRENT=4
-LIBDBUSMENU_REVISION=5
+LIBDBUSMENU_REVISION=6
 LIBDBUSMENU_AGE=0
 
 AC_SUBST(LIBDBUSMENU_CURRENT)
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-09-30 14:18:44 +0000
+++ debian/changelog	2011-10-13 16:36:18 +0000
@@ -1,3 +1,13 @@
+libdbusmenu (0.5.1-0ubuntu1~ppa1) oneiric; urgency=low
+
+  * New upstream release.
+    * Allow for an ID of 0 in about_to_show for indicators (LP: #862989)
+    * Clear the image pointer when we take it
+    * Ensure we drop all references to the GTK widget when a menuitem
+      gets destroyed (LP: #835646)
+
+ -- Ted Gould <[e-mail]>  Thu, 13 Oct 2011 11:31:15 -0500
+
 libdbusmenu (0.5.0-0ubuntu2) oneiric; urgency=low
 
   * libdbusmenu-glib/client.c
 
=== modified file 'docs/libdbusmenu-glib/reference/version.xml'
--- docs/libdbusmenu-glib/reference/version.xml	2011-09-29 19:41:43 +0000
+++ docs/libdbusmenu-glib/reference/version.xml	2011-10-13 16:36:18 +0000
@@ -1,1 +1,1 @@
-0.5.0
+0.5.1
 
=== modified file 'docs/libdbusmenu-gtk/reference/version.xml'
--- docs/libdbusmenu-gtk/reference/version.xml	2011-09-29 19:41:43 +0000
+++ docs/libdbusmenu-gtk/reference/version.xml	2011-10-13 16:36:18 +0000
@@ -1,1 +1,1 @@
-0.5.0
+0.5.1
 
=== modified file 'libdbusmenu-gtk/client.c'
--- libdbusmenu-gtk/client.c	2011-08-22 19:54:42 +0000
+++ libdbusmenu-gtk/client.c	2011-10-13 16:36:18 +0000
@@ -823,14 +823,22 @@
 	return;
 }
 
+static void
+destroy_gmi (GtkMenuItem * gmi)
+{
 #ifdef MASSIVEDEBUGGING
-static void
-destroy_gmi (GtkMenuItem * gmi, DbusmenuMenuitem * mi)
-{
-	g_debug("Destorying GTK Menuitem for %d", dbusmenu_menuitem_get_id(mi));
+	g_debug("Destroying GTK Menuitem %d", gmi);
+#endif
+
+	/* Call gtk_widget_destroy to remove from any containers and cleanup */
+	gtk_widget_destroy(GTK_WIDGET(gmi));
+
+	/* Now remove last ref that we are holding (due to g_object_ref_sink in
+	   dbusmenu_gtkclient_newitem_base).  This should finalize the object */
+	g_object_unref(G_OBJECT(gmi));
+
 	return;
 }
-#endif
 
 /**
  * dbusmenu_gtkclient_newitem_base:
@@ -857,7 +865,7 @@
 
 	/* Attach these two */
 	g_object_ref_sink(G_OBJECT(gmi));
-	g_object_set_data_full(G_OBJECT(item), data_menuitem, gmi, (GDestroyNotify)gtk_widget_destroy);
+	g_object_set_data_full(G_OBJECT(item), data_menuitem, gmi, (GDestroyNotify)destroy_gmi);
 
 	/* DbusmenuMenuitem signals */
 	g_signal_connect(G_OBJECT(item), DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED, G_CALLBACK(menu_prop_change_cb), client);
 
=== modified file 'libdbusmenu-gtk/genericmenuitem.c'
--- libdbusmenu-gtk/genericmenuitem.c	2011-08-25 03:00:46 +0000
+++ libdbusmenu-gtk/genericmenuitem.c	2011-10-13 16:36:18 +0000
@@ -449,6 +449,7 @@
 		if (GTK_IS_IMAGE(child)) {
 			/* We've got a label, let's update it. */
 			imagew = GTK_IMAGE(child);
+			child = NULL;
 		} else if (GTK_IS_BOX(child)) {
 			/* Look for the label in the box */
 			gtk_container_foreach(GTK_CONTAINER(child), set_image_helper, &imagew);