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