diff -Nru gnome-power-manager-2.32.0/debian/changelog gnome-power-manager-2.32.0/debian/changelog --- gnome-power-manager-2.32.0/debian/changelog 2010-09-27 14:01:41.000000000 -0400 +++ gnome-power-manager-2.32.0/debian/changelog 2011-03-16 15:55:40.000000000 -0400 @@ -1,3 +1,10 @@ +gnome-power-manager (2.32.0-0ubuntu1.1) maverick-proposed; urgency=low + + * debian/patches/12-add-appindicators.patch: + - Fix leak by working around a libappindicator bug. LP: #569273 + + -- Michael Terry Wed, 16 Mar 2011 15:55:26 -0400 + gnome-power-manager (2.32.0-0ubuntu1) maverick; urgency=low * New upstream release diff -Nru gnome-power-manager-2.32.0/debian/patches/12-add-appindicators.patch gnome-power-manager-2.32.0/debian/patches/12-add-appindicators.patch --- gnome-power-manager-2.32.0/debian/patches/12-add-appindicators.patch 2010-09-27 14:01:41.000000000 -0400 +++ gnome-power-manager-2.32.0/debian/patches/12-add-appindicators.patch 2011-03-16 15:43:25.000000000 -0400 @@ -4,10 +4,11 @@ Bug: https://bugzilla.gnome.org/show_bug.cgi?id=609654 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-power-manager/+bug/497870 -diff -uNr -x .pc gnome-power-manager-2.31.90.orig/configure.ac gnome-power-manager-2.31.90/configure.ac ---- gnome-power-manager-2.31.90.orig/configure.ac 2010-08-24 09:56:25.245912000 +0100 -+++ gnome-power-manager-2.31.90/configure.ac 2010-08-24 09:56:54.420492001 +0100 -@@ -122,6 +122,7 @@ +Index: gnome-power-manager-2.32.0/configure.ac +=================================================================== +--- gnome-power-manager-2.32.0.orig/configure.ac 2010-09-22 07:02:17.000000000 -0400 ++++ gnome-power-manager-2.32.0/configure.ac 2011-03-16 15:36:43.000000000 -0400 +@@ -112,6 +112,7 @@ XRANDR_REQUIRED=1.2.0 CANBERRA_REQUIRED=0.10 UPOWER_REQUIRED=0.9.1 @@ -15,7 +16,7 @@ dnl --------------------------------------------------------------------------- dnl - Check library dependencies -@@ -162,6 +163,27 @@ +@@ -152,6 +153,27 @@ PKG_CHECK_MODULES(UPOWER, upower-glib >= $UPOWER_REQUIRED) @@ -43,7 +44,7 @@ AC_PATH_PROG(GCONFTOOL, gconftool-2) AM_GCONF_SOURCE_2 -@@ -362,6 +384,7 @@ +@@ -352,6 +374,7 @@ Self test support: ${have_tests} GConf default support: ${have_gconfdefaults} Docbook support: ${enable_docbook_docs} @@ -51,9 +52,10 @@ documentation dir: $DOCDIR dbus-1 services dir: $DBUS_SERVICES_DIR gconf-schema dir: $GCONF_SCHEMA_FILE_DIR -diff -uNr -x .pc gnome-power-manager-2.31.90.orig/src/gpm-common.c gnome-power-manager-2.31.90/src/gpm-common.c ---- gnome-power-manager-2.31.90.orig/src/gpm-common.c 2010-08-17 15:30:31.000000000 +0100 -+++ gnome-power-manager-2.31.90/src/gpm-common.c 2010-08-25 15:56:34.711183080 +0100 +Index: gnome-power-manager-2.32.0/src/gpm-common.c +=================================================================== +--- gnome-power-manager-2.32.0.orig/src/gpm-common.c 2010-08-06 10:31:02.000000000 -0400 ++++ gnome-power-manager-2.32.0/src/gpm-common.c 2011-03-16 15:36:43.000000000 -0400 @@ -55,15 +55,22 @@ } @@ -85,10 +87,11 @@ return timestring; } -diff -uNr -x .pc gnome-power-manager-2.31.90.orig/src/gpm-manager.c gnome-power-manager-2.31.90/src/gpm-manager.c ---- gnome-power-manager-2.31.90.orig/src/gpm-manager.c 2010-08-24 09:56:25.225902000 +0100 -+++ gnome-power-manager-2.31.90/src/gpm-manager.c 2010-08-24 09:56:54.420492001 +0100 -@@ -2086,7 +2086,8 @@ +Index: gnome-power-manager-2.32.0/src/gpm-manager.c +=================================================================== +--- gnome-power-manager-2.32.0.orig/src/gpm-manager.c 2010-09-22 07:02:17.000000000 -0400 ++++ gnome-power-manager-2.32.0/src/gpm-manager.c 2011-03-16 15:36:43.000000000 -0400 +@@ -2091,7 +2091,8 @@ g_object_unref (manager->priv->backlight); g_object_unref (manager->priv->console); g_object_unref (manager->priv->client); @@ -98,9 +101,10 @@ G_OBJECT_CLASS (gpm_manager_parent_class)->finalize (object); } -diff -uNr -x .pc gnome-power-manager-2.31.90.orig/src/gpm-tray-icon.c gnome-power-manager-2.31.90/src/gpm-tray-icon.c ---- gnome-power-manager-2.31.90.orig/src/gpm-tray-icon.c 2010-08-24 09:56:25.185882000 +0100 -+++ gnome-power-manager-2.31.90/src/gpm-tray-icon.c 2010-08-24 09:56:54.420492001 +0100 +Index: gnome-power-manager-2.32.0/src/gpm-tray-icon.c +=================================================================== +--- gnome-power-manager-2.32.0.orig/src/gpm-tray-icon.c 2010-08-06 10:54:36.000000000 -0400 ++++ gnome-power-manager-2.32.0/src/gpm-tray-icon.c 2011-03-16 15:43:02.555995813 -0400 @@ -41,6 +41,10 @@ #include #include @@ -233,12 +237,13 @@ g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (gpm_tray_icon_show_preferences_cb), icon); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); -@@ -304,14 +345,30 @@ +@@ -304,14 +345,31 @@ skip_prefs: /* show the menu */ gtk_widget_show_all (GTK_WIDGET (menu)); +#ifdef HAVE_APP_INDICATOR + app_indicator_set_menu (icon->priv->app_indicator, menu); ++ g_object_unref (G_OBJECT (menu)); /* Workaround leak in 10.10's libappindicator */ +#else gtk_menu_popup (GTK_MENU (menu), NULL, NULL, gtk_status_icon_position_menu, icon->priv->status_icon, @@ -264,7 +269,7 @@ /** * gpm_tray_icon_popup_menu_cb: * -@@ -337,6 +394,7 @@ +@@ -337,6 +395,7 @@ egg_debug ("icon left clicked"); gpm_tray_icon_create_menu (icon, gtk_get_current_event_time()); } @@ -272,7 +277,7 @@ /** * gpm_conf_gconf_key_changed_cb: -@@ -381,6 +439,17 @@ +@@ -381,6 +440,17 @@ (GConfClientNotifyFunc) gpm_conf_gconf_key_changed_cb, icon, NULL, NULL); @@ -290,7 +295,7 @@ icon->priv->status_icon = gtk_status_icon_new (); g_signal_connect_object (G_OBJECT (icon->priv->status_icon), "popup_menu", -@@ -390,6 +459,7 @@ +@@ -390,6 +460,7 @@ "activate", G_CALLBACK (gpm_tray_icon_activate_cb), icon, 0); @@ -298,7 +303,7 @@ allowed_in_menu = gconf_client_get_bool (icon->priv->conf, GPM_CONF_UI_SHOW_ACTIONS, NULL); gpm_tray_icon_enable_actions (icon, allowed_in_menu); -@@ -409,7 +479,11 @@ +@@ -409,7 +480,11 @@ tray_icon = GPM_TRAY_ICON (object); @@ -310,9 +315,10 @@ g_object_unref (tray_icon->priv->engine); g_return_if_fail (tray_icon->priv != NULL); -diff -uNr -x .pc gnome-power-manager-2.31.90.orig/src/gpm-upower.c gnome-power-manager-2.31.90/src/gpm-upower.c ---- gnome-power-manager-2.31.90.orig/src/gpm-upower.c 2010-08-17 15:30:31.000000000 +0100 -+++ gnome-power-manager-2.31.90/src/gpm-upower.c 2010-08-25 14:54:19.291183081 +0100 +Index: gnome-power-manager-2.32.0/src/gpm-upower.c +=================================================================== +--- gnome-power-manager-2.32.0.orig/src/gpm-upower.c 2010-08-06 10:46:34.000000000 -0400 ++++ gnome-power-manager-2.32.0/src/gpm-upower.c 2011-03-16 15:36:43.000000000 -0400 @@ -229,7 +229,10 @@ /* we always display "Laptop battery 16 minutes remaining" as we need to clarify what device we are refering to */ @@ -402,9 +408,10 @@ } else { egg_warning ("in an undefined state we are not charging or " "discharging and the batteries are also not charged"); -diff -uNr -x .pc gnome-power-manager-2.31.90.orig/src/Makefile.am gnome-power-manager-2.31.90/src/Makefile.am ---- gnome-power-manager-2.31.90.orig/src/Makefile.am 2010-08-24 09:56:25.205892000 +0100 -+++ gnome-power-manager-2.31.90/src/Makefile.am 2010-08-24 09:56:54.420492001 +0100 +Index: gnome-power-manager-2.32.0/src/Makefile.am +=================================================================== +--- gnome-power-manager-2.32.0.orig/src/Makefile.am 2011-03-16 15:36:43.000000000 -0400 ++++ gnome-power-manager-2.32.0/src/Makefile.am 2011-03-16 15:36:43.000000000 -0400 @@ -20,6 +20,7 @@ $(GSTREAMER_CFLAGS) \ -DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE \