From ae2fc2d08eeb1fe9f2a0c43ea84a2cb734fb7008 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Thu, 29 Aug 2013 22:46:34 +0200 Subject: don't depends on gnome-control-center, recommends is enough, since it's only required for the preferences menu item. Let ubuntu-system-settings replace it as an alternative, that's needed on the touch image. --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index fc1c924..81006ae 100644 --- a/debian/control +++ b/debian/control @@ -23,8 +23,8 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, upower, - gnome-control-center (>= 3.1), -Recommends: indicator-applet (>= 0.2) | indicator-renderer, +Recommends: gnome-control-center (>= 3.1) | ubuntu-system-settings, + indicator-applet (>= 0.2) | indicator-renderer, Description: Indicator showing power state. This indicator displays current power management information and gives the user a way to access power management preferences. -- cgit v1.2.3 From 4b27302d7f9d0bb000090e16e1a2f04f8316eb84 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 29 Aug 2013 16:26:13 -0500 Subject: Fix dependendencies to include url-dispatcher and allow system-settings --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index fc1c924..b5cd919 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,7 @@ Build-Depends: debhelper (>= 9), libgtest-dev, libglib2.0-dev (>= 2.36), libgudev-1.0-dev, + liburl-dispatcher1-dev, python, Standards-Version: 3.9.2 Homepage: https://launchpad.net/indicator-power @@ -23,7 +24,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, upower, - gnome-control-center (>= 3.1), + gnome-control-center (>= 3.1) | ubuntu-system-settings, Recommends: indicator-applet (>= 0.2) | indicator-renderer, Description: Indicator showing power state. This indicator displays current power management information and gives -- cgit v1.2.3 From 0f4852ebe00b8381d0c6ffbb4509873f4282ff15 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 29 Aug 2013 16:26:41 -0500 Subject: Adding build items on url dispatcher --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ba39dec..ca7e793 100644 --- a/configure.ac +++ b/configure.ac @@ -40,7 +40,8 @@ GUDEV_REQUIRED_VERSION=204 PKG_CHECK_MODULES([SERVICE_DEPS],[glib-2.0 >= $GLIB_REQUIRED_VERSION gio-2.0 >= $GIO_REQUIRED_VERSION gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION - gudev-1.0 >= $GUDEV_REQUIRED_VERSION]) + gudev-1.0 >= $GUDEV_REQUIRED_VERSION + url-dispatcher-1]) ########################### # GSETTINGS -- cgit v1.2.3 From 2dc4a6eac35392b8bc8428198b33759e19d57640 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 29 Aug 2013 16:27:16 -0500 Subject: Add a new action for phone settings and call the dispatcher --- src/service.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/service.c b/src/service.c index 1976332..b4f05ea 100644 --- a/src/service.c +++ b/src/service.c @@ -22,6 +22,7 @@ #include #include +#include #include "device.h" #include "device-provider.h" @@ -532,7 +533,7 @@ create_phone_settings_section (IndicatorPowerService * self G_GNUC_UNUSED) update_brightness_action_state (self); g_object_unref (item); - g_menu_append (section, _("Battery settings…"), "indicator.activate-settings"); + g_menu_append (section, _("Battery settings…"), "indicator.activate-phone-settings"); return G_MENU_MODEL (section); } @@ -685,8 +686,6 @@ on_settings_activated (GSimpleAction * a G_GNUC_UNUSED, GVariant * param G_GNUC_UNUSED, gpointer gself G_GNUC_UNUSED) { - /* FIXME: unity8 settings */ - execute_command ("gnome-control-center power"); } @@ -698,6 +697,14 @@ on_statistics_activated (GSimpleAction * a G_GNUC_UNUSED, execute_command ("gnome-power-statistics"); } +static void +on_phone_settings_activated (GSimpleAction * a G_GNUC_UNUSED, + GVariant * param G_GNUC_UNUSED, + gpointer gself G_GNUC_UNUSED) +{ + url_dispatch_send("settings://system/battery", NULL, NULL); +} + /*** **** ***/ @@ -739,6 +746,7 @@ init_gactions (IndicatorPowerService * self) GActionEntry entries[] = { { "activate-settings", on_settings_activated }, + { "activate-phone-settings", on_phone_settings_activated }, { "activate-statistics", on_statistics_activated } }; -- cgit v1.2.3 From 7b1c7e89d51ec3f9acdccecf50a1e19f57669f62 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Fri, 30 Aug 2013 11:22:59 +0200 Subject: revert previous commit, liburl-dispatcher1 depends on upstart-app-launch which is in universe, that's blocking indicators from landing. --- configure.ac | 3 +-- debian/control | 1 - src/service.c | 14 +++----------- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index ca7e793..ba39dec 100644 --- a/configure.ac +++ b/configure.ac @@ -40,8 +40,7 @@ GUDEV_REQUIRED_VERSION=204 PKG_CHECK_MODULES([SERVICE_DEPS],[glib-2.0 >= $GLIB_REQUIRED_VERSION gio-2.0 >= $GIO_REQUIRED_VERSION gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION - gudev-1.0 >= $GUDEV_REQUIRED_VERSION - url-dispatcher-1]) + gudev-1.0 >= $GUDEV_REQUIRED_VERSION]) ########################### # GSETTINGS diff --git a/debian/control b/debian/control index f0ed35e..81006ae 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,6 @@ Build-Depends: debhelper (>= 9), libgtest-dev, libglib2.0-dev (>= 2.36), libgudev-1.0-dev, - liburl-dispatcher1-dev, python, Standards-Version: 3.9.2 Homepage: https://launchpad.net/indicator-power diff --git a/src/service.c b/src/service.c index b4f05ea..1976332 100644 --- a/src/service.c +++ b/src/service.c @@ -22,7 +22,6 @@ #include #include -#include #include "device.h" #include "device-provider.h" @@ -533,7 +532,7 @@ create_phone_settings_section (IndicatorPowerService * self G_GNUC_UNUSED) update_brightness_action_state (self); g_object_unref (item); - g_menu_append (section, _("Battery settings…"), "indicator.activate-phone-settings"); + g_menu_append (section, _("Battery settings…"), "indicator.activate-settings"); return G_MENU_MODEL (section); } @@ -686,6 +685,8 @@ on_settings_activated (GSimpleAction * a G_GNUC_UNUSED, GVariant * param G_GNUC_UNUSED, gpointer gself G_GNUC_UNUSED) { + /* FIXME: unity8 settings */ + execute_command ("gnome-control-center power"); } @@ -697,14 +698,6 @@ on_statistics_activated (GSimpleAction * a G_GNUC_UNUSED, execute_command ("gnome-power-statistics"); } -static void -on_phone_settings_activated (GSimpleAction * a G_GNUC_UNUSED, - GVariant * param G_GNUC_UNUSED, - gpointer gself G_GNUC_UNUSED) -{ - url_dispatch_send("settings://system/battery", NULL, NULL); -} - /*** **** ***/ @@ -746,7 +739,6 @@ init_gactions (IndicatorPowerService * self) GActionEntry entries[] = { { "activate-settings", on_settings_activated }, - { "activate-phone-settings", on_phone_settings_activated }, { "activate-statistics", on_statistics_activated } }; -- cgit v1.2.3 From 81d519f3ba785f6acf80193062ab09d7fdd41e3c Mon Sep 17 00:00:00 2001 From: Automatic PS uploader Date: Fri, 30 Aug 2013 10:07:39 +0000 Subject: Releasing 12.10.6+13.10.20130830.2-0ubuntu1, based on r193 --- debian/changelog | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/debian/changelog b/debian/changelog index 30f05ff..d071831 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,22 @@ +indicator-power (12.10.6+13.10.20130830.2-0ubuntu1) saucy; urgency=low + + [ Sebastien Bacher ] + * don't depends on gnome-control-center, recommends is enough, since + it's only required for the preferences menu item. Let ubuntu-system- + settings replace it as an alternative, that's needed on the touch + image. + * revert previous commit, liburl-dispatcher1 depends on upstart-app- + launch which is in universe, that's blocking indicators from + landing. + + [ Ted Gould ] + * Make settings work on the phone. + + [ Ubuntu daily release ] + * Automatic snapshot from revision 193 + + -- Ubuntu daily release Fri, 30 Aug 2013 10:07:38 +0000 + indicator-power (12.10.6+13.10.20130823-0ubuntu1) saucy; urgency=low [ Charles Kerr ] -- cgit v1.2.3 From a3bfe6c08f027ffead9ff0b1d40be39aa4e4f1a2 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 4 Sep 2013 10:32:09 -0500 Subject: Adding a build dep on URL dispatcher --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index 81006ae..f0ed35e 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,7 @@ Build-Depends: debhelper (>= 9), libgtest-dev, libglib2.0-dev (>= 2.36), libgudev-1.0-dev, + liburl-dispatcher1-dev, python, Standards-Version: 3.9.2 Homepage: https://launchpad.net/indicator-power -- cgit v1.2.3 From 627005e7c04157b25f016f9fdafa5293c7aceb9d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 4 Sep 2013 10:32:28 -0500 Subject: Grabbing the URL dispatcher build --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ba39dec..ca7e793 100644 --- a/configure.ac +++ b/configure.ac @@ -40,7 +40,8 @@ GUDEV_REQUIRED_VERSION=204 PKG_CHECK_MODULES([SERVICE_DEPS],[glib-2.0 >= $GLIB_REQUIRED_VERSION gio-2.0 >= $GIO_REQUIRED_VERSION gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION - gudev-1.0 >= $GUDEV_REQUIRED_VERSION]) + gudev-1.0 >= $GUDEV_REQUIRED_VERSION + url-dispatcher-1]) ########################### # GSETTINGS -- cgit v1.2.3 From 5ec494416be68f1231331a68b80cac1087c04ba0 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 4 Sep 2013 10:32:43 -0500 Subject: Adding a phone settings action --- src/service.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/service.c b/src/service.c index 1976332..b4f05ea 100644 --- a/src/service.c +++ b/src/service.c @@ -22,6 +22,7 @@ #include #include +#include #include "device.h" #include "device-provider.h" @@ -532,7 +533,7 @@ create_phone_settings_section (IndicatorPowerService * self G_GNUC_UNUSED) update_brightness_action_state (self); g_object_unref (item); - g_menu_append (section, _("Battery settings…"), "indicator.activate-settings"); + g_menu_append (section, _("Battery settings…"), "indicator.activate-phone-settings"); return G_MENU_MODEL (section); } @@ -685,8 +686,6 @@ on_settings_activated (GSimpleAction * a G_GNUC_UNUSED, GVariant * param G_GNUC_UNUSED, gpointer gself G_GNUC_UNUSED) { - /* FIXME: unity8 settings */ - execute_command ("gnome-control-center power"); } @@ -698,6 +697,14 @@ on_statistics_activated (GSimpleAction * a G_GNUC_UNUSED, execute_command ("gnome-power-statistics"); } +static void +on_phone_settings_activated (GSimpleAction * a G_GNUC_UNUSED, + GVariant * param G_GNUC_UNUSED, + gpointer gself G_GNUC_UNUSED) +{ + url_dispatch_send("settings://system/battery", NULL, NULL); +} + /*** **** ***/ @@ -739,6 +746,7 @@ init_gactions (IndicatorPowerService * self) GActionEntry entries[] = { { "activate-settings", on_settings_activated }, + { "activate-phone-settings", on_phone_settings_activated }, { "activate-statistics", on_statistics_activated } }; -- cgit v1.2.3 From ce4067c8054de62ac8f54676103253312d80396f Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 11 Sep 2013 11:39:45 -0500 Subject: add a title entry to the header action's state --- src/service.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/service.c b/src/service.c index b4f05ea..85d6202 100644 --- a/src/service.c +++ b/src/service.c @@ -332,6 +332,8 @@ create_header_state (IndicatorPowerService * self) g_variant_builder_init (&b, G_VARIANT_TYPE("a{sv}")); + g_variant_builder_add (&b, "{sv}", "title", g_variant_new_string (_("Battery"))); + g_variant_builder_add (&b, "{sv}", "visible", g_variant_new_boolean (should_be_visible (self))); -- cgit v1.2.3 From 4ca541cc16b60f29a03694034900c30b4d8a5cbd Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 11 Sep 2013 11:40:40 -0500 Subject: use g_variant_new_take_string() where appropriate --- src/service.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/service.c b/src/service.c index 85d6202..b5227f6 100644 --- a/src/service.c +++ b/src/service.c @@ -338,11 +338,7 @@ create_header_state (IndicatorPowerService * self) g_variant_new_boolean (should_be_visible (self))); if (label != NULL) - { - g_variant_builder_add (&b, "{sv}", "label", g_variant_new_string (label)); - - g_free (label); - } + g_variant_builder_add (&b, "{sv}", "label", g_variant_new_take_string (label)); if (icon != NULL) { @@ -352,12 +348,7 @@ create_header_state (IndicatorPowerService * self) } if (a11y != NULL) - { - g_variant_builder_add (&b, "{sv}", "accessible-desc", - g_variant_new_string (a11y)); - - g_free (a11y); - } + g_variant_builder_add (&b, "{sv}", "accessible-desc", g_variant_new_take_string (a11y)); return g_variant_builder_end (&b); } -- cgit v1.2.3 From a14a925bb75d798a45fe8f757e59e951677e5a68 Mon Sep 17 00:00:00 2001 From: Automatic PS uploader Date: Fri, 13 Sep 2013 15:15:32 +0000 Subject: Releasing 12.10.6+13.10.20130913-0ubuntu1, based on r196 --- debian/changelog | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/debian/changelog b/debian/changelog index d071831..05a590c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +indicator-power (12.10.6+13.10.20130913-0ubuntu1) saucy; urgency=low + + [ Charles Kerr ] + * Adds a title in the header's action state. (LP: #1223635) + + [ Ted Gould ] + * Use URL Dispatcher for settings on the phone. + + [ Ubuntu daily release ] + * Automatic snapshot from revision 196 + + -- Ubuntu daily release Fri, 13 Sep 2013 15:15:31 +0000 + indicator-power (12.10.6+13.10.20130830.2-0ubuntu1) saucy; urgency=low [ Sebastien Bacher ] -- cgit v1.2.3 From 8d0580572ab5697e11f74cc427b199fab349ed24 Mon Sep 17 00:00:00 2001 From: Stéphane Graber Date: Fri, 13 Sep 2013 22:43:47 -0400 Subject: Revert the previous upload as it caused 10 extra packages to be installed on all Ubuntu desktop machines and as a result caused a FeatureFreeze violation. --- configure.ac | 3 +-- debian/changelog | 7 +++++++ debian/control | 1 - src/service.c | 29 ++++++++++++++--------------- 4 files changed, 22 insertions(+), 18 deletions(-) diff --git a/configure.ac b/configure.ac index ca7e793..ba39dec 100644 --- a/configure.ac +++ b/configure.ac @@ -40,8 +40,7 @@ GUDEV_REQUIRED_VERSION=204 PKG_CHECK_MODULES([SERVICE_DEPS],[glib-2.0 >= $GLIB_REQUIRED_VERSION gio-2.0 >= $GIO_REQUIRED_VERSION gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION - gudev-1.0 >= $GUDEV_REQUIRED_VERSION - url-dispatcher-1]) + gudev-1.0 >= $GUDEV_REQUIRED_VERSION]) ########################### # GSETTINGS diff --git a/debian/changelog b/debian/changelog index 05a590c..8179a38 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-power (12.10.6+13.10.20130913-0ubuntu2) saucy; urgency=low + + * Revert previous upload since this was bringing quite a few extra and + likely unwanted dependencies on Ubuntu desktop after FeatureFreeze. + + -- Stéphane Graber Fri, 13 Sep 2013 21:46:57 -0400 + indicator-power (12.10.6+13.10.20130913-0ubuntu1) saucy; urgency=low [ Charles Kerr ] diff --git a/debian/control b/debian/control index f0ed35e..81006ae 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,6 @@ Build-Depends: debhelper (>= 9), libgtest-dev, libglib2.0-dev (>= 2.36), libgudev-1.0-dev, - liburl-dispatcher1-dev, python, Standards-Version: 3.9.2 Homepage: https://launchpad.net/indicator-power diff --git a/src/service.c b/src/service.c index b5227f6..1976332 100644 --- a/src/service.c +++ b/src/service.c @@ -22,7 +22,6 @@ #include #include -#include #include "device.h" #include "device-provider.h" @@ -332,13 +331,15 @@ create_header_state (IndicatorPowerService * self) g_variant_builder_init (&b, G_VARIANT_TYPE("a{sv}")); - g_variant_builder_add (&b, "{sv}", "title", g_variant_new_string (_("Battery"))); - g_variant_builder_add (&b, "{sv}", "visible", g_variant_new_boolean (should_be_visible (self))); if (label != NULL) - g_variant_builder_add (&b, "{sv}", "label", g_variant_new_take_string (label)); + { + g_variant_builder_add (&b, "{sv}", "label", g_variant_new_string (label)); + + g_free (label); + } if (icon != NULL) { @@ -348,7 +349,12 @@ create_header_state (IndicatorPowerService * self) } if (a11y != NULL) - g_variant_builder_add (&b, "{sv}", "accessible-desc", g_variant_new_take_string (a11y)); + { + g_variant_builder_add (&b, "{sv}", "accessible-desc", + g_variant_new_string (a11y)); + + g_free (a11y); + } return g_variant_builder_end (&b); } @@ -526,7 +532,7 @@ create_phone_settings_section (IndicatorPowerService * self G_GNUC_UNUSED) update_brightness_action_state (self); g_object_unref (item); - g_menu_append (section, _("Battery settings…"), "indicator.activate-phone-settings"); + g_menu_append (section, _("Battery settings…"), "indicator.activate-settings"); return G_MENU_MODEL (section); } @@ -679,6 +685,8 @@ on_settings_activated (GSimpleAction * a G_GNUC_UNUSED, GVariant * param G_GNUC_UNUSED, gpointer gself G_GNUC_UNUSED) { + /* FIXME: unity8 settings */ + execute_command ("gnome-control-center power"); } @@ -690,14 +698,6 @@ on_statistics_activated (GSimpleAction * a G_GNUC_UNUSED, execute_command ("gnome-power-statistics"); } -static void -on_phone_settings_activated (GSimpleAction * a G_GNUC_UNUSED, - GVariant * param G_GNUC_UNUSED, - gpointer gself G_GNUC_UNUSED) -{ - url_dispatch_send("settings://system/battery", NULL, NULL); -} - /*** **** ***/ @@ -739,7 +739,6 @@ init_gactions (IndicatorPowerService * self) GActionEntry entries[] = { { "activate-settings", on_settings_activated }, - { "activate-phone-settings", on_phone_settings_activated }, { "activate-statistics", on_statistics_activated } }; -- cgit v1.2.3 From 7b46f6c74aee2ca3a4d64f8d3f91d98719dab551 Mon Sep 17 00:00:00 2001 From: Timo Jyrinki Date: Wed, 18 Sep 2013 12:54:08 +0300 Subject: Manual changelog entry to indicate why the reverting of the revert is ok now. The dependency url-dispatcher was fixed to not pull in extra packages on the desktop images, fixing the issue that caused the previous revert. --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8179a38..7c05fe8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-power (12.10.6+13.10.20130913-0ubuntu3) UNRELEASED; urgency=low + + * The dependency url-dispatcher was fixed to not pull in extra packages + on the desktop images, fixing the issue that caused the previous revert. + + -- Timo Jyrinki Wed, 18 Sep 2013 12:52:51 +0300 + indicator-power (12.10.6+13.10.20130913-0ubuntu2) saucy; urgency=low * Revert previous upload since this was bringing quite a few extra and -- cgit v1.2.3 From 97e7e6d7151ecdcb007d68596e86ecb134c4441d Mon Sep 17 00:00:00 2001 From: Łukasz 'sil2100' Zemczak Date: Wed, 18 Sep 2013 15:51:46 +0200 Subject: Add the FFe bug number to the last changelog entry (LP: #1215980) --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7c05fe8..a1855c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ indicator-power (12.10.6+13.10.20130913-0ubuntu3) UNRELEASED; urgency=low * The dependency url-dispatcher was fixed to not pull in extra packages - on the desktop images, fixing the issue that caused the previous revert. + on the desktop images, fixing the issue that caused the previous revert + (FFe bug - LP: #1215980) -- Timo Jyrinki Wed, 18 Sep 2013 12:52:51 +0300 -- cgit v1.2.3 From 9b17a6b627923cd783757c66c60665c7fe225995 Mon Sep 17 00:00:00 2001 From: Automatic PS uploader Date: Wed, 18 Sep 2013 13:57:00 +0000 Subject: Releasing 12.10.6+13.10.20130918.2-0ubuntu1, based on r201 --- debian/changelog | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a1855c5..36e3f96 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,17 @@ -indicator-power (12.10.6+13.10.20130913-0ubuntu3) UNRELEASED; urgency=low +indicator-power (12.10.6+13.10.20130918.2-0ubuntu1) saucy; urgency=low + [ Timo Jyrinki ] * The dependency url-dispatcher was fixed to not pull in extra packages on the desktop images, fixing the issue that caused the previous revert (FFe bug - LP: #1215980) - -- Timo Jyrinki Wed, 18 Sep 2013 12:52:51 +0300 + [ Ted Gould ] + * Use URL dispatcher to show settings on the phone. + + [ Ubuntu daily release ] + * Automatic snapshot from revision 201 + + -- Ubuntu daily release Wed, 18 Sep 2013 13:57:00 +0000 indicator-power (12.10.6+13.10.20130913-0ubuntu2) saucy; urgency=low -- cgit v1.2.3 From 3fe1d262f1947ca126a85bdc165a14ee6f26cc4a Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 1 Oct 2013 09:05:32 -0500 Subject: use the correct battery icon when charging/discharging --- src/device.c | 9 +-------- tests/test-device.cc | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/src/device.c b/src/device.c index 9dc4647..508a734 100644 --- a/src/device.c +++ b/src/device.c @@ -328,10 +328,7 @@ device_kind_to_string (UpDeviceKind kind) This function's logic differs from GSD's power plugin in some ways: - 1. All charging batteries use the same icon regardless of progress. - - - 2. For discharging batteries, we decide whether or not to use the 'caution' + 1. For discharging batteries, we decide whether or not to use the 'caution' icon based on whether or not we have <= 30 minutes remaining, rather than looking at the battery's percentage left. @@ -389,10 +386,6 @@ indicator_power_device_get_icon_names (const IndicatorPowerDevice * device) case UP_DEVICE_STATE_CHARGING: case UP_DEVICE_STATE_PENDING_CHARGE: - /* When charging, always use the same icon regardless of percentage. - */ - percentage = 0; - suffix_str = get_device_icon_suffix (percentage); index_str = get_device_icon_index (percentage); g_ptr_array_add (names, g_strdup_printf ("%s-%s-charging-symbolic", kind_str, suffix_str)); diff --git a/tests/test-device.cc b/tests/test-device.cc index 0ccd8d1..2762d4a 100644 --- a/tests/test-device.cc +++ b/tests/test-device.cc @@ -318,9 +318,9 @@ TEST_F(DeviceTest, IconNames) INDICATOR_POWER_DEVICE_PERCENTAGE, 95.0, NULL); - g_string_append_printf (expected, "%s-caution-charging-symbolic;", kind_str); - g_string_append_printf (expected, "gpm-%s-000-charging;", kind_str); - g_string_append_printf (expected, "%s-caution-charging", kind_str); + g_string_append_printf (expected, "%s-full-charging-symbolic;", kind_str); + g_string_append_printf (expected, "gpm-%s-100-charging;", kind_str); + g_string_append_printf (expected, "%s-full-charging", kind_str); check_icon_names (device, expected->str); g_string_truncate (expected, 0); @@ -329,9 +329,9 @@ TEST_F(DeviceTest, IconNames) INDICATOR_POWER_DEVICE_STATE, UP_DEVICE_STATE_CHARGING, INDICATOR_POWER_DEVICE_PERCENTAGE, 85.0, NULL); - g_string_append_printf (expected, "%s-caution-charging-symbolic;", kind_str); - g_string_append_printf (expected, "gpm-%s-000-charging;", kind_str); - g_string_append_printf (expected, "%s-caution-charging", kind_str); + g_string_append_printf (expected, "%s-full-charging-symbolic;", kind_str); + g_string_append_printf (expected, "gpm-%s-080-charging;", kind_str); + g_string_append_printf (expected, "%s-full-charging", kind_str); check_icon_names (device, expected->str); g_string_truncate (expected, 0); @@ -340,9 +340,9 @@ TEST_F(DeviceTest, IconNames) INDICATOR_POWER_DEVICE_STATE, UP_DEVICE_STATE_CHARGING, INDICATOR_POWER_DEVICE_PERCENTAGE, 50.0, NULL); - g_string_append_printf (expected, "%s-caution-charging-symbolic;", kind_str); - g_string_append_printf (expected, "gpm-%s-000-charging;", kind_str); - g_string_append_printf (expected, "%s-caution-charging", kind_str); + g_string_append_printf (expected, "%s-good-charging-symbolic;", kind_str); + g_string_append_printf (expected, "gpm-%s-060-charging;", kind_str); + g_string_append_printf (expected, "%s-good-charging", kind_str); check_icon_names (device, expected->str); g_string_truncate (expected, 0); @@ -351,9 +351,9 @@ TEST_F(DeviceTest, IconNames) INDICATOR_POWER_DEVICE_STATE, UP_DEVICE_STATE_CHARGING, INDICATOR_POWER_DEVICE_PERCENTAGE, 25.0, NULL); - g_string_append_printf (expected, "%s-caution-charging-symbolic;", kind_str); - g_string_append_printf (expected, "gpm-%s-000-charging;", kind_str); - g_string_append_printf (expected, "%s-caution-charging", kind_str); + g_string_append_printf (expected, "%s-low-charging-symbolic;", kind_str); + g_string_append_printf (expected, "gpm-%s-020-charging;", kind_str); + g_string_append_printf (expected, "%s-low-charging", kind_str); check_icon_names (device, expected->str); g_string_truncate (expected, 0); -- cgit v1.2.3 From 5a739fd7ee27a99f98edc469ab839c6c52d861cb Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 1 Oct 2013 13:50:10 -0500 Subject: replace a g_print() call with g_debug() --- src/ib-brightness-control.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ib-brightness-control.c b/src/ib-brightness-control.c index 2b9b79d..ddc82e5 100644 --- a/src/ib-brightness-control.c +++ b/src/ib-brightness-control.c @@ -52,7 +52,7 @@ ib_brightness_control_new (void) (g_strcmp0 (device_type, "platform") == 0) || (g_strcmp0 (device_type, "raw") == 0)) { path = g_strdup (g_udev_device_get_sysfs_path (device->data)); - g_print ("found: %s\n", path); + g_debug ("found: %s", path); break; } } -- cgit v1.2.3 From 76c62923635e09d63d6407fed0b8648eead6ece8 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 1 Oct 2013 13:50:48 -0500 Subject: Listen for the 'Resuming' signal from upower. When it's received, refresh all our devices. --- src/device-provider-upower.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/device-provider-upower.c b/src/device-provider-upower.c index 05faeab..1b1b7bd 100644 --- a/src/device-provider-upower.c +++ b/src/device-provider-upower.c @@ -248,6 +248,22 @@ on_upower_device_removed (DbusUPower * unused G_GNUC_UNUSED, emit_devices_changed (self); } +static void +on_upower_resuming (DbusUPower * unused G_GNUC_UNUSED, + gpointer gself) +{ + IndicatorPowerDeviceProviderUPower * self; + GHashTableIter iter; + gpointer object_path; + + self = INDICATOR_POWER_DEVICE_PROVIDER_UPOWER (gself); + + g_debug ("Resumed from hibernate/sleep; queueing all devices for a refresh"); + g_hash_table_iter_init (&iter, self->priv->devices); + while (g_hash_table_iter_next (&iter, &object_path, NULL)) + refresh_device_soon (self, object_path); +} + static void on_upower_proxy_ready (GObject * source G_GNUC_UNUSED, GAsyncResult * res, @@ -272,6 +288,8 @@ on_upower_proxy_ready (GObject * source G_GNUC_UNUSED, p = self->priv; p->upower_proxy = proxy; + g_signal_connect (proxy, "resuming", + G_CALLBACK (on_upower_resuming), self); g_signal_connect (proxy, "device-changed", G_CALLBACK (on_upower_device_changed), self); g_signal_connect (proxy, "device-added", -- cgit v1.2.3 From cca397579b2d799eb99a2ce92a843d17479f7a6a Mon Sep 17 00:00:00 2001 From: Automatic PS uploader Date: Fri, 4 Oct 2013 02:28:43 +0000 Subject: Releasing 12.10.6+13.10.20131004-0ubuntu1, based on r204 --- debian/changelog | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/debian/changelog b/debian/changelog index 36e3f96..5b81768 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +indicator-power (12.10.6+13.10.20131004-0ubuntu1) saucy; urgency=low + + [ Charles Kerr ] + * Revert bug #824629 code -- use the correct charge % when deciding + what icon to use. (LP: #1215520, #824629) + * Listen for the "Resuming" signal from upower to refresh devices when + resuming from suspend/hibernate. (LP: #1224931) + + [ Ubuntu daily release ] + * Automatic snapshot from revision 204 + + -- Ubuntu daily release Fri, 04 Oct 2013 02:28:43 +0000 + indicator-power (12.10.6+13.10.20130918.2-0ubuntu1) saucy; urgency=low [ Timo Jyrinki ] -- cgit v1.2.3 From 5cc73ec03c4470b721e264263f5f7102d71cf9e2 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 4 Oct 2013 09:36:34 -0500 Subject: Adding an additional slash to the settings URL --- src/service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/service.c b/src/service.c index b5227f6..5e00370 100644 --- a/src/service.c +++ b/src/service.c @@ -695,7 +695,7 @@ on_phone_settings_activated (GSimpleAction * a G_GNUC_UNUSED, GVariant * param G_GNUC_UNUSED, gpointer gself G_GNUC_UNUSED) { - url_dispatch_send("settings://system/battery", NULL, NULL); + url_dispatch_send("settings:///system/battery", NULL, NULL); } /*** -- cgit v1.2.3 From 2d02157d59f2290617b2fc4e112900d16fc1853a Mon Sep 17 00:00:00 2001 From: Automatic PS uploader Date: Tue, 8 Oct 2013 02:34:02 +0000 Subject: Releasing 12.10.6+13.10.20131008-0ubuntu1, based on r206 --- debian/changelog | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5b81768..be60f61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +indicator-power (12.10.6+13.10.20131008-0ubuntu1) saucy; urgency=low + + [ Ted Gould ] + * Adding an additional slash to the settings URL. (LP: #1231444) + + [ Ubuntu daily release ] + * Automatic snapshot from revision 206 + + -- Ubuntu daily release Tue, 08 Oct 2013 02:34:01 +0000 + indicator-power (12.10.6+13.10.20131004-0ubuntu1) saucy; urgency=low [ Charles Kerr ] -- cgit v1.2.3 From f192ac00d09deab88849ed4676d3ef979d265367 Mon Sep 17 00:00:00 2001 From: Marcus Tomlinson Date: Thu, 10 Oct 2013 16:24:18 +0200 Subject: Added "torch-on" and "torch-off" icons to brightness slider menu item. --- src/service.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/service.c b/src/service.c index 5e00370..c70723a 100644 --- a/src/service.c +++ b/src/service.c @@ -463,6 +463,9 @@ create_brightness_menuitem (IndicatorPowerService * self) g_menu_item_set_attribute (item, "x-canonical-type", "s", "com.canonical.unity.slider"); g_menu_item_set_attribute (item, "min-value", "d", brightness_to_percentage (self, lo)); g_menu_item_set_attribute (item, "max-value", "d", brightness_to_percentage (self, hi)); + g_menu_item_set_attribute (item, "min-icon", "s", "torch-off" ); + g_menu_item_set_attribute (item, "max-icon", "s", "torch-on" ); + return item; } -- cgit v1.2.3 From e1e4997683838addfd8ecb37a7f8dee117b63b6e Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Thu, 24 Oct 2013 16:13:57 -0400 Subject: Don't leak the g_file_get_contents value, reported by valgrind --- src/ib-brightness-control.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ib-brightness-control.c b/src/ib-brightness-control.c index ddc82e5..4fb6bc5 100644 --- a/src/ib-brightness-control.c +++ b/src/ib-brightness-control.c @@ -126,6 +126,7 @@ ib_brightness_control_get_value_from_file (IbBrightnessControl *self, const gcha g_error_free (error); } else { value = atoi (svalue); + g_free (svalue); } g_free (filename); -- cgit v1.2.3 From 30747fc6d4dfec1a0e3a4d68f598126922da08d1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 28 Oct 2013 10:24:11 -0700 Subject: Adding a phone_greeter profile --- data/com.canonical.indicator.power | 3 +++ 1 file changed, 3 insertions(+) diff --git a/data/com.canonical.indicator.power b/data/com.canonical.indicator.power index 329728f..65fd646 100644 --- a/data/com.canonical.indicator.power +++ b/data/com.canonical.indicator.power @@ -11,3 +11,6 @@ ObjectPath=/com/canonical/indicator/power/desktop [desktop_greeter] ObjectPath=/com/canonical/indicator/power/desktop_greeter + +[phone_greeter] +ObjectPath=/com/canonical/indicator/power/desktop_greeter -- cgit v1.2.3 From 52f40f1e32ce05f9a3d1c4f026d91d53c904b35e Mon Sep 17 00:00:00 2001 From: Automatic PS uploader Date: Tue, 29 Oct 2013 10:31:05 +0000 Subject: Releasing 12.10.6+14.04.20131029.1-0ubuntu1, based on r210 --- debian/changelog | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/debian/changelog b/debian/changelog index be60f61..e340616 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +indicator-power (12.10.6+14.04.20131029.1-0ubuntu1) trusty; urgency=low + + [ Sebastien Bacher ] + * Don't leak the g_file_get_contents value, reported by valgrind . + + [ Marcus Tomlinson ] + * Added torch icons to either end of brightness slider. (LP: #1227250) + + [ Ted Gould ] + * Adding a phone_greeter profile. + + [ Ubuntu daily release ] + * Automatic snapshot from revision 210 + + -- Ubuntu daily release Tue, 29 Oct 2013 10:31:03 +0000 + indicator-power (12.10.6+13.10.20131008-0ubuntu1) saucy; urgency=low [ Ted Gould ] -- cgit v1.2.3