diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2013-08-30 09:48:33 +0000 |
|---|---|---|
| committer | Tarmac <Unknown> | 2013-08-30 09:48:33 +0000 |
| commit | eae82894d130e4b882996402b713e3e7dcac20bf (patch) | |
| tree | 6913817f9097165be29f7184e778fd2004a3ed2a | |
| parent | 4179a8137d043516f1360c4c550f988097f57646 (diff) | |
| parent | 7b1c7e89d51ec3f9acdccecf50a1e19f57669f62 (diff) | |
| download | ayatana-indicator-power-eae82894d130e4b882996402b713e3e7dcac20bf.tar.gz ayatana-indicator-power-eae82894d130e4b882996402b713e3e7dcac20bf.tar.bz2 ayatana-indicator-power-eae82894d130e4b882996402b713e3e7dcac20bf.zip | |
revert previous commit, liburl-dispatcher1 depends on upstart-app-launch
which is in universe, that's blocking indicators from landing.
Approved by PS Jenkins bot, Lars Uebernickel.
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | 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 <glib/gi18n.h> #include <gio/gio.h> -#include <url-dispatcher.h> #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 } }; |