diff options
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | debian/rules | 9 | ||||
| -rw-r--r-- | src/service.c | 26 |
3 files changed, 11 insertions, 26 deletions
diff --git a/debian/control b/debian/control index b11fd60..28ab3fd 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9), libglib2.0-dev (>= 2.36), libgudev-1.0-dev, liburl-dispatcher1-dev, - python, + python:any, Standards-Version: 3.9.2 Homepage: https://launchpad.net/indicator-power # If you aren't a member of ~indicator-applet-developers but need to upload diff --git a/debian/rules b/debian/rules index 83edd94..36a22d7 100755 --- a/debian/rules +++ b/debian/rules @@ -6,12 +6,21 @@ export DPKG_GENSYMBOLS_CHECK_LEVEL=4 +ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) + TESTS=yes +else + TESTS=no +endif + %: dh $@ --with autoreconf override_dh_autoreconf: NOCONFIGURE=1 dh_autoreconf ./autogen.sh +override_dh_auto_configure: + dh_auto_configure -- --enable-tests=$(TESTS) + override_dh_install: find debian/indicator-power -name \*.la -delete find debian/indicator-power -name \*.a -delete diff --git a/src/service.c b/src/service.c index 00efe9b..46ad802 100644 --- a/src/service.c +++ b/src/service.c @@ -491,24 +491,6 @@ percentage_to_brightness (IndicatorPowerService * self, double percentage) return (int)(lo + (percentage*(hi-lo))); } -static GMenuItem * -create_brightness_menuitem (IndicatorPowerService * self) -{ - int lo, hi; - GMenuItem * item; - - get_brightness_range (self, &lo, &hi); - - item = g_menu_item_new (NULL, "indicator.brightness"); - g_menu_item_set_attribute (item, "x-canonical-type", "s", "com.canonical.unity.slider"); - g_menu_item_set_attribute (item, "min-value", "d", brightness_to_percentage (self, lo)); - g_menu_item_set_attribute (item, "max-value", "d", brightness_to_percentage (self, hi)); - g_menu_item_set_attribute (item, "min-icon", "s", "torch-off" ); - g_menu_item_set_attribute (item, "max-icon", "s", "torch-on" ); - - return item; -} - static GVariant * action_state_for_brightness (IndicatorPowerService * self) { @@ -574,18 +556,12 @@ create_desktop_settings_section (IndicatorPowerService * self G_GNUC_UNUSED) } static GMenuModel * -create_phone_settings_section (IndicatorPowerService * self G_GNUC_UNUSED) +create_phone_settings_section (IndicatorPowerService * self) { GMenu * section; - GMenuItem * item; section = g_menu_new (); - - item = create_brightness_menuitem (self); - g_menu_append_item (section, item); update_brightness_action_state (self); - g_object_unref (item); - g_menu_append (section, _("Battery settings…"), "indicator.activate-phone-settings"); return G_MENU_MODEL (section); |