Merge lp:~brian-rogers/gnome-power/report-percentage into lp:~ubuntu-desktop/gnome-power/ubuntu

[Brian Rogers]

[James Westby (james-w)]

Hi,

Is this still a relevant change?

I'm going to reject this, but if it is still relevant we can re-propose it.

Thanks,

James

Unmerged revisions

317. By Brian Rogers on 2010-10-25

Report battery percentage when charging or discharging and a
time estimate is not available (LP: #629258)

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-27 17:49:40 +0000
+++ debian/changelog	2010-10-25 22:58:45 +0000
@@ -1,3 +1,11 @@
+gnome-power-manager (2.32.0-0ubuntu2) natty; urgency=low
+
+  * 12-add-appindicators.patch
+    - Modify patch to report battery percentage when charging or discharging
+      and a time estimate is not available (LP: #629258)
+
+ -- Brian Rogers <[e-mail]>  Mon, 25 Oct 2010 15:33:38 -0700
+
 gnome-power-manager (2.32.0-0ubuntu1) maverick; urgency=low
 
   * New upstream release

=== modified file 'debian/patches/12-add-appindicators.patch'
--- debian/patches/12-add-appindicators.patch	2010-08-25 15:12:57 +0000
+++ debian/patches/12-add-appindicators.patch	2010-10-25 22:58:45 +0000
@@ -336,7 +336,7 @@
 +#ifdef HAVE_APP_INDICATOR
 +		if (time_to_empty_round <= GPM_UP_TEXT_MIN_TIME) {
 +			/* TRANSLATORS: the device is discharging and we don't have a time remaining yet */
-+			description = g_strdup_printf (_("%s (estimating...)"), kind_desc);
++			description = g_strdup_printf (_("%s (%.1f%%)"), kind_desc, percentage);
 +		} else if (time_to_empty_round <= 12*60*60)  {
 +			time_to_empty_str = gpm_get_timestring (time_to_empty_round);
 +			/* TRANSLATORS: the device is discharging, and we have a time remaining */
@@ -366,7 +366,7 @@
 +			g_free (time_to_full_str);
 +		} else {
 +			/* TRANSLATORS: device is charging, but we only have a percentage */
-+			description = g_strdup_printf (_("%s (estimating...)"),
++			description = g_strdup_printf (_("%s (%.1f%%)"),
 +						kind_desc, percentage);
 +		}
 +#else