From 8d0580572ab5697e11f74cc427b199fab349ed24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= 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. --- src/service.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'src/service.c') 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