aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStéphane Graber <stgraber@ubuntu.com>2013-09-14 03:22:27 +0000
committerTarmac <Unknown>2013-09-14 03:22:27 +0000
commit5fbb8ed00a6f88f2be4c7a84ae485623a1b3443d (patch)
treee147e9561c0a043e3eaaa5586ae8d149fc31213a
parent830e6a6aa03392294bc8fcb8e57b52f502ce93ba (diff)
parent8d0580572ab5697e11f74cc427b199fab349ed24 (diff)
downloadayatana-indicator-power-5fbb8ed00a6f88f2be4c7a84ae485623a1b3443d.tar.gz
ayatana-indicator-power-5fbb8ed00a6f88f2be4c7a84ae485623a1b3443d.tar.bz2
ayatana-indicator-power-5fbb8ed00a6f88f2be4c7a84ae485623a1b3443d.zip
Revert previous upload.
Approved by PS Jenkins bot, Didier Roche.
-rw-r--r--configure.ac3
-rw-r--r--debian/changelog7
-rw-r--r--debian/control1
-rw-r--r--src/service.c29
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 <stgraber@ubuntu.com> 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 <glib/gi18n.h>
#include <gio/gio.h>
-#include <url-dispatcher.h>
#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 }
};