Merge lp:~indicator-applet-developers/indicator-appmenu/ubuntu into lp:~ubuntu-desktop/indicator-appmenu/ubuntu

[Ted Gould]

Unmerged revisions

=== modified file 'ChangeLog'
--- ChangeLog	2011-09-29 15:24:51 +0000
+++ ChangeLog	2011-10-13 18:40:32 +0000
@@ -1,5 +1,17 @@
 # Generated by Makefile. Do not edit.
 
[phone]  Ted Gould  <[e-mail]>
+
+	0.3.2
+
[phone]  Ted Gould  <[e-mail]>
+
+	Make sure to keep the ref on the label via sinking.
+
[phone]  Michael Terry  <[e-mail]>
+
+	don't double-ref entry->label
+
 2011-09-29  Ted Gould  <[e-mail]>
 
 	0.3.1
 
=== modified file 'configure'
--- configure	2011-09-29 15:25:16 +0000
+++ configure	2011-10-13 18:40:32 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for indicator-appmenu 0.3.1.
+# Generated by GNU Autoconf 2.68 for indicator-appmenu 0.3.2.
 #
 # Report bugs to <[e-mail]>.
 #
@@ -572,8 +572,8 @@
 # Identity of this package.
 PACKAGE_NAME='indicator-appmenu'
 PACKAGE_TARNAME='indicator-appmenu'
-PACKAGE_VERSION='0.3.1'
-PACKAGE_STRING='indicator-appmenu 0.3.1'
+PACKAGE_VERSION='0.3.2'
+PACKAGE_STRING='indicator-appmenu 0.3.2'
 PACKAGE_BUGREPORT='[e-mail]'
 PACKAGE_URL=''
 
@@ -1339,7 +1339,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 indicator-appmenu 0.3.1 to adapt to many kinds of systems.
+\`configure' configures indicator-appmenu 0.3.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1410,7 +1410,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of indicator-appmenu 0.3.1:";;
+     short | recursive ) echo "Configuration of indicator-appmenu 0.3.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1540,7 +1540,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-indicator-appmenu configure 0.3.1
+indicator-appmenu configure 0.3.2
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1820,7 +1820,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by indicator-appmenu $as_me 0.3.1, which was
+It was created by indicator-appmenu $as_me 0.3.2, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2641,7 +2641,7 @@
 
 # Define the identity of the package.
  PACKAGE=indicator-appmenu
- VERSION=0.3.1
+ VERSION=0.3.2
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13687,7 +13687,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by indicator-appmenu $as_me 0.3.1, which was
+This file was extended by indicator-appmenu $as_me 0.3.2, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13753,7 +13753,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-indicator-appmenu config.status 0.3.1
+indicator-appmenu config.status 0.3.2
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
 
=== modified file 'configure.ac'
--- configure.ac	2011-09-29 15:25:16 +0000
+++ configure.ac	2011-10-13 18:40:32 +0000
@@ -1,11 +1,11 @@
 
-AC_INIT(indicator-appmenu, 0.3.1, [e-mail])
+AC_INIT(indicator-appmenu, 0.3.2, [e-mail])
 AC_COPYRIGHT([Copyright 2010 Canonical])
 
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-appmenu, 0.3.1)
+AM_INIT_AUTOMAKE(indicator-appmenu, 0.3.2)
 
 AM_MAINTAINER_MODE
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-10-06 14:31:34 +0000
+++ debian/changelog	2011-10-13 18:40:32 +0000
@@ -1,3 +1,11 @@
+indicator-appmenu (0.3.2-0ubuntu1~ppa1) oneiric; urgency=low
+
+  * New upstream release.
+    * Ensure that the label is ref'd using a ref_sink()
+  * Drop debian/patches/double-ref-of-entry-label.patch: Upstream
+
+ -- Ted Gould <[e-mail]>  Thu, 13 Oct 2011 13:38:29 -0500
+
 indicator-appmenu (0.3.1-0ubuntu2) oneiric; urgency=low
 
   * debian/patches/double-ref-of-entry-label.patch:
 
=== removed directory 'debian/patches'
=== removed file 'debian/patches/double-ref-of-entry-label.patch'
--- debian/patches/double-ref-of-entry-label.patch	2011-10-06 14:31:34 +0000
+++ debian/patches/double-ref-of-entry-label.patch	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-Description: Don't add a second ref to a label, just sink the one we own
-Origin: https://code.launchpad.net/~mterry/indicator-appmenu/double-ref-of-entry-label/+merge/78300
-Author: Michael Terry <[e-mail]>
-
-Index: indicator-appmenu/src/window-menus.c
-===================================================================
---- indicator-appmenu.orig/src/window-menus.c	2011-10-06 10:17:10.670272189 -0400
-+++ indicator-appmenu/src/window-menus.c	2011-10-06 10:17:48.794272592 -0400
-@@ -742,7 +742,7 @@
- 	entry->label = GTK_LABEL(gtk_label_new_with_mnemonic(dbusmenu_menuitem_property_get(newentry, DBUSMENU_MENUITEM_PROP_LABEL)));
- 
- 	if (entry->label != NULL) {
--		g_object_ref(entry->label);
-+		g_object_ref_sink(entry->label);
- 	}
- 
- 	entry->accessible_desc = dbusmenu_menuitem_property_get(newentry, DBUSMENU_MENUITEM_PROP_LABEL);
 
=== removed file 'debian/patches/series'
--- debian/patches/series	2011-10-06 14:31:34 +0000
+++ debian/patches/series	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-double-ref-of-entry-label.patch
 
=== modified file 'src/window-menus.c'
--- src/window-menus.c	2011-09-29 15:25:16 +0000
+++ src/window-menus.c	2011-10-13 18:40:32 +0000
@@ -742,7 +742,7 @@
 	entry->label = GTK_LABEL(gtk_label_new_with_mnemonic(dbusmenu_menuitem_property_get(newentry, DBUSMENU_MENUITEM_PROP_LABEL)));
 
 	if (entry->label != NULL) {
-		g_object_ref(entry->label);
+		g_object_ref_sink(entry->label);
 	}
 
 	entry->accessible_desc = dbusmenu_menuitem_property_get(newentry, DBUSMENU_MENUITEM_PROP_LABEL);