[Pkg-xfce-commits] r7230 - in goodies/trunk/xfce4-power-manager/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2012-11-22 22:00:04 +0000 (Thu, 22 Nov 2012)
New Revision: 7230

Added:
   goodies/trunk/xfce4-power-manager/debian/patches/06_fix-insert-battery.patch
Modified:
   goodies/trunk/xfce4-power-manager/debian/changelog
   goodies/trunk/xfce4-power-manager/debian/patches/series
Log:
* debian/patches:
  - 06_fix-insert-battery added, correctly handle icon when adding/removing
    batteries.                                                closes: #626224

Modified: goodies/trunk/xfce4-power-manager/debian/changelog
===================================================================
--- goodies/trunk/xfce4-power-manager/debian/changelog	2012-11-19 13:53:31 UTC (rev 7229)
+++ goodies/trunk/xfce4-power-manager/debian/changelog	2012-11-22 22:00:04 UTC (rev 7230)
@@ -1,3 +1,11 @@
+xfce4-power-manager (1.0.11-3) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 06_fix-insert-battery added, correctly handle icon when adding/removing
+      batteries.                                                closes: #626224
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 22 Nov 2012 22:53:33 +0100
+
 xfce4-power-manager (1.0.11-2) unstable; urgency=low
 
   [ Lionel Le Folgoc ]

Added: goodies/trunk/xfce4-power-manager/debian/patches/06_fix-insert-battery.patch
===================================================================
--- goodies/trunk/xfce4-power-manager/debian/patches/06_fix-insert-battery.patch	                        (rev 0)
+++ goodies/trunk/xfce4-power-manager/debian/patches/06_fix-insert-battery.patch	2012-11-22 22:00:04 UTC (rev 7230)
@@ -0,0 +1,40 @@
+From 6f87cc775b4c72f5708d6582173077b856ba01f5 Mon Sep 17 00:00:00 2001
+From: Henry Gebhardt <hsggebhardt at googlemail.com>
+Date: Wed, 29 Feb 2012 14:14:33 +0100
+Subject: [PATCH] Fix empty systray icon in some panels on battery removal and
+ addition
+
+Unreferencing a GtkStatusIcon is not enough to get rid of it entirely.
+
+This fixes these bugs:
+
+    https://bugzilla.xfce.org/show_bug.cgi?id=7603
+    http://bugzilla.xfce.org/show_bug.cgi?id=8424
+    https://bugs.launchpad.net/ubuntu/+source/lxpanel/+bug/846878
+    https://bugzilla.redhat.com/show_bug.cgi?id=765726
+---
+ src/xfpm-battery.c |    2 ++
+ src/xfpm-power.c   |    1 +
+ 2 files changed, 3 insertions(+), 0 deletions(-)
+
+--- a/src/xfpm-battery.c
++++ b/src/xfpm-battery.c
+@@ -782,6 +782,8 @@ xfpm_battery_finalize (GObject *object)
+     g_object_unref (battery->priv->notify);
+     g_object_unref (battery->priv->button);
+ 
++    gtk_status_icon_set_visible(GTK_STATUS_ICON(battery), FALSE);
++
+     G_OBJECT_CLASS (xfpm_battery_parent_class)->finalize (object);
+ }
+ 
+--- a/src/xfpm-power.c
++++ b/src/xfpm-power.c
+@@ -1114,6 +1114,7 @@ xfpm_power_hide_adapter_icon (XfpmPower
+      
+     if ( power->priv->adapter_icon )
+     {
++        gtk_status_icon_set_visible (power->priv->adapter_icon, FALSE);
+         g_object_unref (power->priv->adapter_icon);
+         power->priv->adapter_icon = NULL;
+     }

Modified: goodies/trunk/xfce4-power-manager/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-power-manager/debian/patches/series	2012-11-19 13:53:31 UTC (rev 7229)
+++ goodies/trunk/xfce4-power-manager/debian/patches/series	2012-11-22 22:00:04 UTC (rev 7230)
@@ -2,3 +2,4 @@
 03_trap-x-errors.patch
 04_clear-idles-for-removed-batteries.patch
 05_fix-brightness-key-modifiers.patch
+06_fix-insert-battery.patch