Merge lp:~gilir/ubuntu/precise/xfce4-power-manager/fix-lxde-lxpanel into lp:ubuntu/precise/xfce4-power-manager

[Julien Lavergne]

07_fix_broken_empty_icon_battery.patch & 09_fix_insert_battery.patch are patches from git or bugtracker to fix empty icons on the systray, on non-xfce panel. Tested on Lubuntu without any problems.

08_show_preferences_lxde.patch is to show the power manager settings on the LXDE menus, since LXDE doesn't have any power manager, xfce4-power-manager is the one used on Lubuntu, and probably the only one suitable for LXDE.

[lp:~gilir/ubuntu/precise/xfce4-power-manager/fix-lxde-lxpanel]

28. By Julien Lavergne on 2012-03-18

Add the patches.

=== modified file 'debian/changelog'
--- debian/changelog	2012-02-09 21:52:19 +0000
+++ debian/changelog	2012-03-18 15:42:22 +0000
@@ -1,3 +1,15 @@
+xfce4-power-manager (1.0.10-5ubuntu2) UNRELEASED; urgency=low
+
+  * debian/patches:
+   - 07_fix_broken_empty_icon_battery.patch: From upstream, fix empty icons in
+     the systray (LP: #846878)
+   - 08_show_preferences_lxde.patch: Hide settings menu only on desktop
+     environment which have another power manager.
+   - 09_fix_insert_battery.patch: Another patch to fix empty icon when
+     removing a battery. Thanks Henry Gebhardt for the patch.
+
+ -- Julien Lavergne <[e-mail]>  Mon, 27 Feb 2012 01:27:57 +0100
+
 xfce4-power-manager (1.0.10-5ubuntu1) precise; urgency=low
 
   * Merge from Debian unstable for the hardening changes (added patches

=== added file 'debian/patches/07_fix_broken_empty_icon_battery.patch'
--- debian/patches/07_fix_broken_empty_icon_battery.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/07_fix_broken_empty_icon_battery.patch	2012-03-18 15:42:22 +0000
@@ -0,0 +1,26 @@
+From 643962eb2d46d48042db0ab278c46813da8b6e9b Mon Sep 17 00:00:00 2001
+From: Ali Abdallah <[e-mail]>
+Date: Mon, 27 Jun 2011 14:27:15 +0000
+Subject: Fix Broken empty battery icon..
+
+---
+Index: xfce4-power-manager/src/xfpm-battery.c
+===================================================================
+--- xfce4-power-manager/src/xfpm-battery.c	2012-02-25 16:32:49.000000000 +0100
++++ xfce4-power-manager/src/xfpm-battery.c	2012-02-25 16:35:54.000000000 +0100
+@@ -309,10 +309,14 @@
+ 			battery->priv->icon_prefix, 
+ 			xfpm_battery_get_icon_index (battery->priv->type, battery->priv->percentage));
+ 	}
++	else if ( battery->priv->state == XFPM_DEVICE_STATE_EMPTY)
++	{
++	    g_snprintf (icon_name, 128, "%s%s", battery->priv->icon_prefix, battery->priv->ac_online ? "000-charging" : "000");
++	}
+     }
+     else
+     {
+-	if ( !battery->priv->present )
++	if ( !battery->priv->present || battery->priv->state == XFPM_DEVICE_STATE_EMPTY )
+ 	{
+ 	    g_snprintf (icon_name, 128, "%s000", battery->priv->icon_prefix);
+ 	}

=== added file 'debian/patches/08_show_preferences_lxde.patch'
--- debian/patches/08_show_preferences_lxde.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/08_show_preferences_lxde.patch	2012-03-18 15:42:22 +0000
@@ -0,0 +1,13 @@
+Index: xfce4-power-manager/settings/xfce4-power-manager-settings.desktop.in
+===================================================================
+--- xfce4-power-manager/settings/xfce4-power-manager-settings.desktop.in	2011-02-14 10:55:03.000000000 +0100
++++ xfce4-power-manager/settings/xfce4-power-manager-settings.desktop.in	2012-02-27 01:07:05.000000000 +0100
+@@ -8,7 +8,7 @@
+ Terminal=false
+ Type=Application
+ Categories=X-XFCE;Settings;DesktopSettings;X-XfceSettingsDialog;
+-OnlyShowIn=XFCE;
++NotShowIn=GNOME;KDE;Unity;
+ StartupNotify=true
+ X-XfcePluggable=true
+ X-XfceHelpFile=xfce4-power-manager.html

=== added file 'debian/patches/09_fix_insert_battery.patch'
--- debian/patches/09_fix_insert_battery.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/09_fix_insert_battery.patch	2012-03-18 15:42:22 +0000
@@ -0,0 +1,44 @@
+From 6f87cc775b4c72f5708d6582173077b856ba01f5 Mon Sep 17 00:00:00 2001
+From: Henry Gebhardt <[e-mail]>
+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(-)
+
+Index: xfce4-power-manager/src/xfpm-battery.c
+===================================================================
+--- xfce4-power-manager/src/xfpm-battery.c	2012-03-02 19:25:29.000000000 +0100
++++ xfce4-power-manager/src/xfpm-battery.c	2012-03-02 19:31:07.000000000 +0100
+@@ -782,6 +782,8 @@
+     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);
+ }
+ 
+Index: xfce4-power-manager/src/xfpm-power.c
+===================================================================
+--- xfce4-power-manager/src/xfpm-power.c	2012-03-02 19:25:29.000000000 +0100
++++ xfce4-power-manager/src/xfpm-power.c	2012-03-02 19:31:07.000000000 +0100
+@@ -1118,6 +1118,7 @@
+      
+     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 file 'debian/patches/series'
--- debian/patches/series	2012-02-09 21:52:19 +0000
+++ debian/patches/series	2012-03-18 15:42:22 +0000
@@ -6,3 +6,6 @@
 06_fix-suspend-auth-check.patch
 xubuntu_fix-xfconf-type-brightness-level.patch
 xubuntu_fix-status-icon-other-devices.patch
+07_fix_broken_empty_icon_battery.patch
+08_show_preferences_lxde.patch
+09_fix_insert_battery.patch