gnome-power

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

  1. report-percentage
  2. Merge into ubuntu
Proposed by Brian Rogers
Status: Rejected
Rejected by: James Westby
Proposed branch: lp:~brian-rogers/gnome-power/report-percentage
Merge into: lp:~ubuntu-desktop/gnome-power/ubuntu
Diff against target: 37 lines (+10/-2)
2 files modified
debian/changelog (+8/-0)
debian/patches/12-add-appindicators.patch (+2/-2)
To merge this branch: bzr merge lp:~brian-rogers/gnome-power/report-percentage
Reviewer Review Type Date Requested Status
James Westby Pending
Review via email: mp+39329@code.launchpad.net
To post a comment you must log in.
Revision history for this message
James Westby (james-w) wrote :

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

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1gnome-power-manager (2.32.0-0ubuntu2) natty; urgency=low
2
3 * 12-add-appindicators.patch
4 - Modify patch to report battery percentage when charging or discharging
5 and a time estimate is not available (LP: #629258)
6
7 -- Brian Rogers <brian@xyzw.org> Mon, 25 Oct 2010 15:33:38 -0700
8
1gnome-power-manager (2.32.0-0ubuntu1) maverick; urgency=low9gnome-power-manager (2.32.0-0ubuntu1) maverick; urgency=low
210
3 * New upstream release11 * New upstream release
412
=== 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 @@
336+#ifdef HAVE_APP_INDICATOR336+#ifdef HAVE_APP_INDICATOR
337+ if (time_to_empty_round <= GPM_UP_TEXT_MIN_TIME) {337+ if (time_to_empty_round <= GPM_UP_TEXT_MIN_TIME) {
338+ /* TRANSLATORS: the device is discharging and we don't have a time remaining yet */338+ /* TRANSLATORS: the device is discharging and we don't have a time remaining yet */
339+ description = g_strdup_printf (_("%s (estimating...)"), kind_desc);339+ description = g_strdup_printf (_("%s (%.1f%%)"), kind_desc, percentage);
340+ } else if (time_to_empty_round <= 12*60*60) {340+ } else if (time_to_empty_round <= 12*60*60) {
341+ time_to_empty_str = gpm_get_timestring (time_to_empty_round);341+ time_to_empty_str = gpm_get_timestring (time_to_empty_round);
342+ /* TRANSLATORS: the device is discharging, and we have a time remaining */342+ /* TRANSLATORS: the device is discharging, and we have a time remaining */
@@ -366,7 +366,7 @@
366+ g_free (time_to_full_str);366+ g_free (time_to_full_str);
367+ } else {367+ } else {
368+ /* TRANSLATORS: device is charging, but we only have a percentage */368+ /* TRANSLATORS: device is charging, but we only have a percentage */
369+ description = g_strdup_printf (_("%s (estimating...)"),369+ description = g_strdup_printf (_("%s (%.1f%%)"),
370+ kind_desc, percentage);370+ kind_desc, percentage);
371+ }371+ }
372+#else372+#else

Subscribers

People subscribed via source and target branches

to all changes: