[Pkg-xfce-commits] r2323 - in goodies/xfce4-battery-plugin/debian: . patches

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-09-23 22:30:00 +0000 (Tue, 23 Sep 2008)
New Revision: 2323

Added:
   goodies/xfce4-battery-plugin/debian/patches/08_no-battery-display.patch
Modified:
   goodies/xfce4-battery-plugin/debian/changelog
Log:
08_no-battery-display added, correctly handle cases when no battery is
present. Patch taken from Xfce #3546.                     closes: #494099

Modified: goodies/xfce4-battery-plugin/debian/changelog
===================================================================
--- goodies/xfce4-battery-plugin/debian/changelog	2008-09-23 22:29:03 UTC (rev 2322)
+++ goodies/xfce4-battery-plugin/debian/changelog	2008-09-23 22:30:00 UTC (rev 2323)
@@ -6,8 +6,10 @@
     - 02_fix-2.6.21 same. 
     - 05_fix-apm-kfreebsd-amd6 as well. 
     - 08_ja.po too. 
+    - 08_no-battery-display added, correctly handle cases when no battery is
+      present. Patch taken from Xfce #3546.                     closes: #494099
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 07 Sep 2008 10:34:22 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 07 Sep 2008 17:46:03 +0200
 
 xfce4-battery-plugin (0.5.0-7) unstable; urgency=low
 

Added: goodies/xfce4-battery-plugin/debian/patches/08_no-battery-display.patch
===================================================================
--- goodies/xfce4-battery-plugin/debian/patches/08_no-battery-display.patch	                        (rev 0)
+++ goodies/xfce4-battery-plugin/debian/patches/08_no-battery-display.patch	2008-09-23 22:30:00 UTC (rev 2323)
@@ -0,0 +1,21 @@
+--- panel-plugin/battery.c.old	2007-09-14 23:40:34.282880732 +0100
++++ panel-plugin/battery.c	2007-09-15 00:31:27.768941875 +0100
+@@ -502,8 +502,16 @@ battmon.c:241: for each function it appe
+ 
+ 
+     if(acline) {
+-        char *t=(charge<99.9)?_("(Charging from AC)"):_("(AC on-line)");
+-        if(battmon->options.tooltip_display_percentage) {
++        char *t1=(charge<99.9)?_("(Charging from AC)"):_("(AC on-line)");
++        char *t2=_("(No battery, AC on-line)");
++	char *t;
++
++        if((battmon->method == BM_USE_ACPI) && (acpiinfo->present == 0))
++	    t=t2;
++	else
++            t=t1;
++        
++	if(battmon->options.tooltip_display_percentage) {
+             g_snprintf(buffer, sizeof(buffer), "%d%% %s", charge,t);
+         }
+         else