diff options
| author | Ted Gould <ted@gould.cx> | 2013-09-09 14:28:07 +0000 |
|---|---|---|
| committer | Tarmac <Unknown> | 2013-09-09 14:28:07 +0000 |
| commit | 5507ff922d38d898d021b5246e27a720920e6d23 (patch) | |
| tree | 45dc33460ae77c3bcb44240fd3d491253e193737 | |
| parent | f4ae2d0157b582d3a97c19220249810f01ebd4e3 (diff) | |
| parent | 5ec494416be68f1231331a68b80cac1087c04ba0 (diff) | |
| download | ayatana-indicator-power-5507ff922d38d898d021b5246e27a720920e6d23.tar.gz ayatana-indicator-power-5507ff922d38d898d021b5246e27a720920e6d23.tar.bz2 ayatana-indicator-power-5507ff922d38d898d021b5246e27a720920e6d23.zip | |
Use URL Dispatcher for settings on the phone.
Approved by Charles Kerr, PS Jenkins bot.
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | src/service.c | 14 |
3 files changed, 14 insertions, 4 deletions
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 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 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 <glib/gi18n.h> #include <gio/gio.h> +#include <url-dispatcher.h> #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 } }; |