Merge branch 'tari01-pr/ubports-patches'

Attributes GH PR #33: https://github.com/AyatanaIndicators/ayatana-indicator-power/pull/33

12 files changed, 407 insertions, 66 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fb8ffef..d6e3c7b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,8 +1,3 @@
-set (SERVICE_LIB "ayatanaindicatorpowerservice")
-set (SERVICE_EXEC "ayatana-indicator-power-service")
-
-add_definitions(-DG_LOG_DOMAIN="ayatana-indicator-power")
-
 if(URLDISPATCHER_FOUND)
     add_definitions( -DHAS_URLDISPATCHER )
 endif()
@@ -10,6 +5,7 @@ endif()
 # handwritten sources
 set(SERVICE_MANUAL_SOURCES
     brightness.c
+    datafiles.c
     device-provider-mock.c
     device-provider-upower.c
     device-provider.c
@@ -23,10 +19,10 @@ set(SERVICE_MANUAL_SOURCES
 # generated sources
 include(GdbusCodegen)
 set(SERVICE_GENERATED_SOURCES)
-add_gdbus_codegen_with_namespace(SERVICE_GENERATED_SOURCES dbus-powerd
-                                 com.canonical
+add_gdbus_codegen_with_namespace(SERVICE_GENERATED_SOURCES dbus-repowerd
+                                 com.lomiri
                                  Dbus
-                                 ${CMAKE_SOURCE_DIR}/src/com.canonical.powerd.xml)
+                                 ${CMAKE_SOURCE_DIR}/src/com.lomiri.Repowerd.xml)
 add_gdbus_codegen_with_namespace(SERVICE_GENERATED_SOURCES dbus-battery
                                  org.ayatana.indicator.power
                                  Dbus
@@ -35,6 +31,14 @@ add_gdbus_codegen_with_namespace(SERVICE_GENERATED_SOURCES dbus-testing
                                  org.ayatana.indicator.power
                                  Dbus
                                  ${CMAKE_SOURCE_DIR}/data/org.ayatana.indicator.power.Testing.xml)
+
+if (HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS)
+    add_gdbus_codegen_with_namespace(SERVICE_GENERATED_SOURCES dbus-accounts-sound
+                                     com.ubuntu.touch
+                                     Dbus
+                                     /usr/share/accountsservice/interfaces/com.ubuntu.touch.AccountsService.Sound.xml)
+endif()
+
 # add the bin dir to our include path so the code can find the generated header files
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
@@ -44,7 +48,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 set(C_WARNING_ARGS "${C_WARNING_ARGS} -Wno-bad-function-cast") # g_clear_object()
 set(C_WARNING_ARGS "${C_WARNING_ARGS} -Wno-switch-enum")
 set_source_files_properties(${SERVICE_MANUAL_SOURCES}
-                            PROPERTIES COMPILE_FLAGS "${C_WARNING_ARGS} -g -std=c99")
+                            PROPERTIES COMPILE_FLAGS "${C_WARNING_ARGS} -std=c99")
 
 # the service library for tests to link against (basically, everything except main())
 add_library(${SERVICE_LIB} STATIC ${SERVICE_MANUAL_SOURCES} ${SERVICE_GENERATED_SOURCES})
diff --git a/src/brightness.c b/src/brightness.c
index eb48515..4b00568 100644
--- a/src/brightness.c
+++ b/src/brightness.c
@@ -18,7 +18,7 @@
  */
 
 #include "brightness.h"
-#include "dbus-powerd.h"
+#include "dbus-repowerd.h"
 
 #include <gio/gio.h>
 
@@ -46,7 +46,7 @@ typedef struct
 
   GSettings * settings;
 
-  DbusPowerd * powerd_proxy;
+  DbusRepowerd * powerd_proxy;
   char * powerd_name_owner;
 
   double percentage;
@@ -198,7 +198,7 @@ percentage_to_brightness(IndicatorPowerBrightness * self, double percentage)
 }
 
 /**
- * DBus Chatter: com.canonical.powerd
+ * DBus Chatter: com.lomiri.Repowerd
  *
  * This is used to get default value, and upper and lower bounds,
  * of the brightness setting
@@ -217,7 +217,7 @@ on_powerd_brightness_params_ready(GObject      * oproxy,
 
   v = NULL;
   error = NULL;
-  if (dbus_powerd_call_get_brightness_params_finish(DBUS_POWERD(oproxy), &v, res, &error))
+  if (dbus_repowerd_call_get_brightness_params_finish(DBUS_REPOWERD(oproxy), &v, res, &error))
     {
       IndicatorPowerBrightness * self = INDICATOR_POWER_BRIGHTNESS(gself);
       priv_t * p = get_priv(self);
@@ -235,12 +235,12 @@ on_powerd_brightness_params_ready(GObject      * oproxy,
               p->powerd_max,
               p->powerd_default_value,
               (int)p->powerd_ab_supported);
- 
+
       if (old_ab_supported != p->powerd_ab_supported)
         g_object_notify_by_pspec(G_OBJECT(self), properties[PROP_AUTO_SUPPORTED]);
 
       if (p->settings != NULL)
-        { 
+        {
           if (g_settings_get_boolean(p->settings, KEY_NEED_DEFAULT))
             {
               /* user's first session, so init the schema's default
@@ -282,7 +282,7 @@ on_powerd_name_owner_changed(GDBusProxy * powerd_proxy,
 
       if (owner != NULL)
         {
-          dbus_powerd_call_get_brightness_params(DBUS_POWERD(powerd_proxy),
+          dbus_repowerd_call_get_brightness_params(DBUS_REPOWERD(powerd_proxy),
                                                  p->cancellable,
                                                  on_powerd_brightness_params_ready,
                                                  gself);
@@ -294,11 +294,11 @@ on_powerd_name_owner_changed(GDBusProxy * powerd_proxy,
 }
 
 static void
-on_powerd_brightness_changed(DbusPowerd * powerd_proxy,
+on_powerd_brightness_changed(DbusRepowerd * powerd_proxy,
                              GParamSpec * pspec         G_GNUC_UNUSED,
                              gpointer     gself)
 {
-  set_brightness_local(gself, dbus_powerd_get_brightness(powerd_proxy));
+  set_brightness_local(gself, dbus_repowerd_get_brightness(powerd_proxy));
 }
 
 static void
@@ -307,10 +307,10 @@ on_powerd_proxy_ready(GObject      * source_object G_GNUC_UNUSED,
                       gpointer       gself)
 {
   GError * error;
-  DbusPowerd * powerd_proxy;
+  DbusRepowerd * powerd_proxy;
 
   error = NULL;
-  powerd_proxy = dbus_powerd_proxy_new_for_bus_finish(res, &error);
+  powerd_proxy = dbus_repowerd_proxy_new_for_bus_finish(res, &error);
 
   if (powerd_proxy != NULL)
     {
@@ -461,10 +461,10 @@ indicator_power_brightness_init(IndicatorPowerBrightness * self)
       g_settings_schema_unref(schema);
     }
 
-  dbus_powerd_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
+  dbus_repowerd_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
                                  G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES,
-                                 "com.canonical.powerd",
-                                 "/com/canonical/powerd",
+                                 "com.lomiri.Repowerd",
+                                 "/com/lomiri/Repowerd",
                                  p->cancellable,
                                  on_powerd_proxy_ready,
                                  self);
diff --git a/src/com.canonical.powerd.xml b/src/com.lomiri.Repowerd.xml
index b5b4ac4..377eeab 100644
--- a/src/com.canonical.powerd.xml
+++ b/src/com.lomiri.Repowerd.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/">
-  <interface name="com.canonical.powerd">
+  <interface name="com.lomiri.Repowerd">
     <!-- Properties -->
 
     <property name="brightness" type="i" access="readwrite">
diff --git a/src/datafiles.c b/src/datafiles.c
new file mode 100644
index 0000000..6d9962c
--- /dev/null
+++ b/src/datafiles.c
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *   Charles Kerr <charles.kerr@canonical.com>
+ */
+
+#include "datafiles.h"
+
+static const gchar*
+get_directory_prefix_for_type (DatafileType type)
+{
+  switch (type)
+    {
+      case DATAFILE_TYPE_SOUND:
+        return "sounds";
+
+      default:
+        g_critical("unknown type");
+        return "";
+    }
+}
+
+static gchar*
+test_directory_for_file(const char* dir, DatafileType type, const char* basename)
+{
+  gchar* filename = g_build_filename(dir,
+                                     GETTEXT_PACKAGE,
+                                     get_directory_prefix_for_type(type),
+                                     basename,
+                                     NULL);
+
+  g_debug("looking for \"%s\" at \"%s\"", basename, filename);
+  if (g_file_test(filename, G_FILE_TEST_EXISTS))
+    return filename;
+
+  g_free(filename);
+  return NULL;
+}
+
+gchar*
+datafile_find(DatafileType type, const char * basename)
+{
+  gchar * filename;
+  const gchar * user_data_dir;
+  const gchar * const * system_data_dirs;
+  gsize i;
+
+  user_data_dir = g_get_user_data_dir();
+  if ((filename = test_directory_for_file(user_data_dir, type, basename)))
+    return filename;
+  
+  system_data_dirs = g_get_system_data_dirs();
+  for (i=0; system_data_dirs && system_data_dirs[i]; ++i)
+    if ((filename = test_directory_for_file(system_data_dirs[i], type, basename)))
+      return filename;
+
+  return NULL;
+}
diff --git a/src/datafiles.h b/src/datafiles.h
new file mode 100644
index 0000000..95c5bc9
--- /dev/null
+++ b/src/datafiles.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *   Charles Kerr <charles.kerr@canonical.com>
+ */
+
+#ifndef __INDICATOR_POWER_DATAFILES_H__
+#define __INDICATOR_POWER_DATAFILES_H__
+
+#include <gio/gio.h>
+
+G_BEGIN_DECLS
+
+typedef enum 
+{
+  DATAFILE_TYPE_SOUND
+}
+DatafileType;
+
+gchar* datafile_find(DatafileType type, const char * basename);
+
+G_END_DECLS
+
+#endif /* __INDICATOR_POWER_DATAFILES_H__ */
diff --git a/src/flashlight.c b/src/flashlight.c
index 55a108a..064bd31 100644
--- a/src/flashlight.c
+++ b/src/flashlight.c
@@ -26,17 +26,29 @@
 
 #define QCOM_ENABLE "255"
 #define QCOM_DISABLE "0"
+#define SIMPLE_ENABLE "1"
+#define SIMPLE_DISABLE "0"
 
-const size_t qcom_sysfs_size = 5;
+const size_t qcom_sysfs_size = 7;
 const char* const qcom_sysfs[] = {"/sys/class/leds/torch-light/brightness",
                                   "/sys/class/leds/led:flash_torch/brightness",
                                   "/sys/class/leds/flashlight/brightness",
                                   "/sys/class/leds/torch-light0/brightness",
-                                  "/sys/class/leds/torch-light1/brightness"};
+                                  "/sys/class/leds/torch-light1/brightness",
+                                  "/sys/class/leds/led:torch_0/brightness",
+                                  "/sys/class/leds/led:torch_1/brightness"};
+const size_t qcom_switch_size = 2;
+const char* const qcom_switch[] = {"/sys/class/leds/led:switch/brightness",
+                                   "/sys/class/leds/led:switch_0/brightness"};
 
-const char* qcom_torch_enable = "/sys/class/leds/led:switch/brightness";
+const size_t simple_sysfs_size = 2;
+const char* const simple_sysfs[] = {"/sys/class/flashlight_core/flashlight/flashlight_torch",
+                                    "/sys/class/leds/white:flash/brightness"};
 
 char* flash_sysfs_path = NULL;
+char* qcom_switch_path = NULL;
+
+enum TorchType torch_type = SIMPLE;
 gboolean activated = 0;
 
 int
@@ -45,6 +57,18 @@ set_sysfs_path()
   for (size_t i = 0; i < qcom_sysfs_size; i++) {
     if (access(qcom_sysfs[i], F_OK ) != -1){
         flash_sysfs_path = (char*)qcom_sysfs[i];
+        torch_type = QCOM;
+        /* Qualcomm torch; determine switch file (if one is needed) */
+        for (size_t i = 0; i < qcom_switch_size; i++) {
+          if (access(qcom_switch[i], F_OK ) != -1)
+              qcom_switch_path = (char*)qcom_switch[i];
+        }
+        return 1;
+    }
+  }
+  for (size_t i = 0; i < simple_sysfs_size; i++) {
+    if (access(simple_sysfs[i], F_OK ) != -1){
+        flash_sysfs_path = (char*)simple_sysfs[i];
         return 1;
     }
   }
@@ -57,27 +81,17 @@ flashlight_activated()
   return activated;
 }
 
-void
-toggle_flashlight_action(GAction *action,
-                         GVariant *parameter G_GNUC_UNUSED,
-                         gpointer data G_GNUC_UNUSED)
+int
+toggle_flashlight_action_qcom()
 {
-  GVariant *state;
   FILE *fd1 = NULL, *fd2 = NULL;
-
   int needs_enable;
 
-  if (!set_sysfs_path())
-    return;
-
-  state = g_action_get_state(action);
-  activated = g_variant_get_boolean(state);
-  g_variant_unref(state);
   fd1 = fopen(flash_sysfs_path, "w");
   if (fd1 != NULL) {
-    needs_enable = access(qcom_torch_enable, F_OK ) != -1;
+    needs_enable = access(qcom_switch_path, F_OK ) != -1;
     if (needs_enable)
-      fd2 = fopen(qcom_torch_enable, "w");
+      fd2 = fopen(qcom_switch_path, "w");
     if (activated)
       if (needs_enable && fd2 != NULL)
         fprintf(fd2, "0");
@@ -91,8 +105,47 @@ toggle_flashlight_action(GAction *action,
     fclose(fd1);
     if (fd2 !=NULL)
       fclose(fd2);
-    g_action_change_state(action, g_variant_new_boolean(!activated));
+    return 1;
+  }
+  return 0;
+}
+
+int
+toggle_flashlight_action_simple()
+{
+  FILE *fd = NULL;
+
+  fd = fopen(flash_sysfs_path, "w");
+  if (fd != NULL) {
+    fprintf(fd, activated ? SIMPLE_DISABLE : SIMPLE_ENABLE);
+    fclose(fd);
+    return 1;
   }
+  return 0;
+}
+
+void
+toggle_flashlight_action(GAction *action,
+                         GVariant *parameter G_GNUC_UNUSED,
+                         gpointer data G_GNUC_UNUSED)
+{
+  GVariant *state;
+  int toggled;
+
+  if (!set_sysfs_path())
+    return;
+
+  state = g_action_get_state(action);
+  activated = g_variant_get_boolean(state);
+  g_variant_unref(state);
+
+  if (torch_type == QCOM)
+    toggled = toggle_flashlight_action_qcom();
+  else
+    toggled = toggle_flashlight_action_simple();
+
+  if (toggled)
+    g_action_change_state(action, g_variant_new_boolean(!activated));
 }
 
 int
diff --git a/src/flashlight.h b/src/flashlight.h
index 51ed5e7..19f738e 100644
--- a/src/flashlight.h
+++ b/src/flashlight.h
@@ -24,6 +24,12 @@
 
 G_BEGIN_DECLS
 
+int
+toggle_flashlight_action_qcom();
+
+int
+toggle_flashlight_action_simple();
+
 void
 toggle_flashlight_action(GAction *action,
                          GVariant *parameter G_GNUC_UNUSED,
@@ -35,6 +41,9 @@ flashlight_supported();
 gboolean
 flashlight_activated();
 
+enum
+TorchType { SIMPLE = 1, QCOM };
+
 G_END_DECLS
 
 #endif /* INDICATOR_POWER_FLASHLIGHT__H */
diff --git a/src/main.c b/src/main.c
index 03e100d..ce54ae8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,8 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
- *
- * Authors:
- *   Charles Kerr <charles.kerr@canonical.com>
+ * Copyright 2013-2016 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -15,6 +12,9 @@
  *
  * You should have received a copy of the GNU General Public License along
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *   Charles Kerr <charles.kerr@canonical.com>
  */
 
 #include <locale.h>
@@ -23,6 +23,7 @@
 #include <glib/gi18n.h>
 
 #include "device.h"
+#include "notifier.h"
 #include "service.h"
 #include "testing.h"
 
@@ -40,6 +41,7 @@ on_name_lost (gpointer instance G_GNUC_UNUSED, gpointer loop)
 int
 main (int argc G_GNUC_UNUSED, char ** argv G_GNUC_UNUSED)
 {
+  IndicatorPowerNotifier * notifier;
   IndicatorPowerService * service;
   IndicatorPowerTesting * testing;
   GMainLoop * loop;
@@ -50,7 +52,8 @@ main (int argc G_GNUC_UNUSED, char ** argv G_GNUC_UNUSED)
   textdomain (GETTEXT_PACKAGE);
 
   /* run */
-  service = indicator_power_service_new (NULL);
+  notifier = indicator_power_notifier_new();
+  service = indicator_power_service_new(NULL, notifier);
   testing = indicator_power_testing_new (service);
   loop = g_main_loop_new (NULL, FALSE);
   g_signal_connect (service, INDICATOR_POWER_SERVICE_SIGNAL_NAME_LOST,
@@ -59,7 +62,8 @@ main (int argc G_GNUC_UNUSED, char ** argv G_GNUC_UNUSED)
 
   /* cleanup */
   g_main_loop_unref (loop);
-  g_clear_object (&service);
   g_clear_object (&testing);
+  g_clear_object (&service);
+  g_clear_object (&notifier);
   return 0;
 }
diff --git a/src/notifier.c b/src/notifier.c
index 123ee6f..d982ac2 100644
--- a/src/notifier.c
+++ b/src/notifier.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2016 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -17,11 +17,21 @@
  *   Charles Kerr <charles.kerr@canonical.com>
  */
 
+#include "datafiles.h"
+
+#ifdef HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS
+#include "dbus-accounts-sound.h"
+#endif
+
 #include "dbus-battery.h"
 #include "dbus-shared.h"
 #include "notifier.h"
 #include "utils.h"
 
+#ifdef HAS_URLDISPATCHER
+#include <lomiri-url-dispatcher.h>
+#endif
+
 #include <libnotify/notify.h>
 
 #include <glib/gi18n.h>
@@ -76,6 +86,12 @@ typedef struct
 
   gboolean caps_queried;
   gboolean actions_supported;
+
+  GCancellable * cancellable;
+  #ifdef HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS
+  DbusAccountsServiceSound * accounts_service_sound_proxy;
+  gboolean accounts_service_sound_proxy_pending;
+  #endif
 }
 IndicatorPowerNotifierPrivate;
 
@@ -130,6 +146,58 @@ get_battery_power_level (IndicatorPowerDevice * battery)
 }
 
 /***
+****  Sounds
+***/
+
+#ifdef HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS
+static void
+on_sound_proxy_ready (GObject      * source_object G_GNUC_UNUSED,
+                      GAsyncResult * res,
+                      gpointer       gself)
+{
+  GError * error;
+  error = NULL;
+
+  DbusAccountsServiceSound * proxy;
+  proxy = dbus_accounts_service_sound_proxy_new_for_bus_finish (res, &error);
+
+  if (error != NULL)
+    {
+      if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+        {
+          get_priv(gself)->accounts_service_sound_proxy_pending = FALSE;
+          g_debug("%s Couldn't find accounts service sound proxy: %s", G_STRLOC, error->message);
+        }
+
+      g_clear_error(&error);
+    }
+  else
+    {
+      IndicatorPowerNotifier * const self = INDICATOR_POWER_NOTIFIER(gself);
+      priv_t * const p = get_priv (self);
+      g_clear_object (&p->accounts_service_sound_proxy);
+      p->accounts_service_sound_proxy = proxy;
+      p->accounts_service_sound_proxy_pending = FALSE;
+    }
+}
+
+
+static gboolean
+silent_mode (IndicatorPowerNotifier * self)
+{
+  priv_t * const p = get_priv (self);
+
+  /* if we don't have a proxy yet, assume we're in silent mode
+     as a "do no harm" level of response */
+  if (p->accounts_service_sound_proxy_pending)
+    return TRUE;
+
+  return (p->accounts_service_sound_proxy != NULL)
+      && dbus_accounts_service_sound_get_silent_mode(p->accounts_service_sound_proxy);
+}
+#endif
+
+/***
 ****  Notifications
 ***/
 
@@ -243,6 +311,23 @@ notification_show(IndicatorPowerNotifier * self)
 
   if (are_actions_supported(self))
     {
+      #ifdef HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS
+      if (!silent_mode(self))
+      #endif
+        {
+          gchar* filename = datafile_find(DATAFILE_TYPE_SOUND, LOW_BATTERY_SOUND);
+          if (filename != NULL)
+            {
+              gchar * uri = g_filename_to_uri(filename, NULL, NULL);
+              notify_notification_set_hint(nn, "sound-file", g_variant_new_take_string(uri));
+              g_clear_pointer(&filename, g_free);
+            }
+          else
+            {
+              g_warning("Unable to find '%s' in XDG data dirs", LOW_BATTERY_SOUND);
+            }
+        }
+
       notify_notification_set_hint(nn, "x-canonical-snap-decisions", g_variant_new_string("true"));
       notify_notification_set_hint(nn, "x-canonical-non-shaped-icon", g_variant_new_string("true"));
       notify_notification_set_hint(nn, "x-canonical-private-affirmative-tint", g_variant_new_string("true"));
@@ -359,18 +444,28 @@ my_dispose (GObject * o)
   IndicatorPowerNotifier * const self = INDICATOR_POWER_NOTIFIER(o);
   priv_t * const p = get_priv (self);
 
+  if (p->cancellable != NULL)
+    {
+      g_cancellable_cancel(p->cancellable);
+      g_clear_object(&p->cancellable);
+    }
+
   indicator_power_notifier_set_bus (self, NULL);
   notification_clear (self);
   indicator_power_notifier_set_battery (self, NULL);
   g_clear_object (&p->dbus_battery);
 
+  #ifdef HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS
+  g_clear_object (&p->accounts_service_sound_proxy);
+  #endif
+
   G_OBJECT_CLASS (indicator_power_notifier_parent_class)->dispose (o);
 }
 
 static void
 my_finalize (GObject * o G_GNUC_UNUSED)
 {
-  /* FIXME: This is an awkward place to put this. 
+  /* FIXME: This is an awkward place to put this.
      Ordinarily something like this would go in main(), but we need libnotify
      to clean itself up before shutting down the bus in the unit tests as well. */
   if (!--instance_count)
@@ -381,7 +476,6 @@ my_finalize (GObject * o G_GNUC_UNUSED)
 ****  Instantiation
 ***/
 
-
 static void
 indicator_power_notifier_init (IndicatorPowerNotifier * self)
 {
@@ -393,8 +487,24 @@ indicator_power_notifier_init (IndicatorPowerNotifier * self)
 
   p->power_level = POWER_LEVEL_OK;
 
-  if (!instance_count++ && !notify_init("ayatana-indicator-power-service"))
+  p->cancellable = g_cancellable_new();
+
+  if (!instance_count++ && !notify_init(SERVICE_EXEC))
     g_critical("Unable to initialize libnotify! Notifications might not be shown.");
+
+  #ifdef HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS
+  p->accounts_service_sound_proxy_pending = TRUE;
+  gchar* object_path = g_strdup_printf("/org/freedesktop/Accounts/User%lu", (gulong)getuid());
+  dbus_accounts_service_sound_proxy_new_for_bus(
+    G_BUS_TYPE_SYSTEM,
+    G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES,
+    "org.freedesktop.Accounts",
+    object_path,
+    p->cancellable,
+    on_sound_proxy_ready,
+    self);
+  g_clear_pointer(&object_path, g_free);
+  #endif
 }
 
 static void
@@ -425,7 +535,6 @@ IndicatorPowerNotifier *
 indicator_power_notifier_new (void)
 {
   GObject * o = g_object_new (INDICATOR_TYPE_POWER_NOTIFIER, NULL);
-
   return INDICATOR_POWER_NOTIFIER (o);
 }
 
diff --git a/src/notifier.h b/src/notifier.h
index 18e25d7..1b04943 100644
--- a/src/notifier.h
+++ b/src/notifier.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2016 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
diff --git a/src/service.c b/src/service.c
index c93c4b6..9b99a05 100644
--- a/src/service.c
+++ b/src/service.c
@@ -1,12 +1,7 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2016 Canonical Ltd.
  * Copytight 2021 AyatanaIndicators
  *
- * Authors:
- *   Charles Kerr <charles.kerr@canonical.com>
- *   Ted Gould <ted@canonical.com>
- *   Robert Tari <robert@tari.in>
- *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
  * by the Free Software Foundation.
@@ -18,6 +13,11 @@
  *
  * You should have received a copy of the GNU General Public License along
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *   Charles Kerr <charles.kerr@canonical.com>
+ *   Ted Gould <ted@canonical.com>
+ *   Robert Tari <robert@tari.in>
  */
 
 #include <glib/gi18n.h>
@@ -52,6 +52,7 @@ enum
   PROP_0,
   PROP_BUS,
   PROP_DEVICE_PROVIDER,
+  PROP_NOTIFIER,
   LAST_PROP
 };
 
@@ -199,6 +200,14 @@ device_compare_func (gconstpointer ga, gconstpointer gb)
     }
 
   state = UP_DEVICE_STATE_DISCHARGING;
+
+  /* discharging items with more than 10% remaining always lose */
+  if (!ret && (((a_state == state) && !a_time && (a_percentage > 10))))
+      ret = 1;
+
+  if (!ret && (((b_state == state) && !b_time && (b_percentage > 10))))
+      ret = -1;
+
   if (!ret && (((a_state == state) && a_time) ||
                ((b_state == state) && b_time)))
     {
@@ -591,7 +600,7 @@ create_brightness_menu_item(void)
   GMenuItem * item;
 
   item = g_menu_item_new(NULL, "indicator.brightness");
-  g_menu_item_set_attribute(item, "x-ayatana-type", "s", "org.ayatana.unity.slider");
+  g_menu_item_set_attribute(item, "x-ayatana-type", "s", "org.ayatana.indicator.slider");
   g_menu_item_set_attribute(item, "min-value", "d", 0.0);
   g_menu_item_set_attribute(item, "max-value", "d", 1.0);
 
@@ -968,7 +977,8 @@ on_bus_acquired (GDBusConnection * connection,
   g_object_notify_by_pspec (G_OBJECT(self), properties[PROP_BUS]);
 
   /* export the battery properties */
-  indicator_power_notifier_set_bus (p->notifier, connection);
+  if (p->notifier != NULL)
+    indicator_power_notifier_set_bus (p->notifier, connection);
 
   /* export the actions */
   if ((id = g_dbus_connection_export_action_group (connection,
@@ -1110,6 +1120,10 @@ my_get_property (GObject     * o,
         g_value_set_object (value, p->device_provider);
         break;
 
+      case PROP_NOTIFIER:
+        g_value_set_object (value, p->notifier);
+        break;
+
       default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (o, property_id, pspec);
     }
@@ -1129,6 +1143,10 @@ my_set_property (GObject       * o,
         indicator_power_service_set_device_provider (self, g_value_get_object (value));
         break;
 
+      case PROP_NOTIFIER:
+        indicator_power_service_set_notifier (self, g_value_get_object (value));
+        break;
+
       default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (o, property_id, pspec);
     }
@@ -1171,6 +1189,7 @@ my_dispose (GObject * o)
   g_clear_object (&p->conn);
 
   indicator_power_service_set_device_provider (self, NULL);
+  indicator_power_service_set_notifier (self, NULL);
 
   G_OBJECT_CLASS (indicator_power_service_parent_class)->dispose (o);
 }
@@ -1192,8 +1211,6 @@ indicator_power_service_init (IndicatorPowerService * self)
 
   p->settings = g_settings_new ("org.ayatana.indicator.power");
 
-  p->notifier = indicator_power_notifier_new ();
-
   p->brightness = indicator_power_brightness_new();
   g_signal_connect_swapped(p->brightness, "notify::percentage",
                            G_CALLBACK(update_brightness_action_state), self);
@@ -1253,6 +1270,13 @@ indicator_power_service_class_init (IndicatorPowerServiceClass * klass)
     G_TYPE_OBJECT,
     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
 
+  properties[PROP_NOTIFIER] = g_param_spec_object (
+    "notifier",
+    "Notifier",
+    "Notifies user of important battery changes",
+    G_TYPE_OBJECT,
+    G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+
   g_object_class_install_properties (object_class, LAST_PROP, properties);
 }
 
@@ -1261,10 +1285,12 @@ indicator_power_service_class_init (IndicatorPowerServiceClass * klass)
 ***/
 
 IndicatorPowerService *
-indicator_power_service_new (IndicatorPowerDeviceProvider * device_provider)
+indicator_power_service_new (IndicatorPowerDeviceProvider * device_provider,
+                             IndicatorPowerNotifier * notifier)
 {
   GObject * o = g_object_new (INDICATOR_TYPE_POWER_SERVICE,
                               "device-provider", device_provider,
+                              "notifier", notifier,
                               NULL);
 
   return INDICATOR_POWER_SERVICE (o);
@@ -1303,6 +1329,29 @@ indicator_power_service_set_device_provider (IndicatorPowerService * self,
     }
 }
 
+void
+indicator_power_service_set_notifier (IndicatorPowerService  * self,
+                                      IndicatorPowerNotifier * notifier)
+{
+  priv_t * p;
+
+  g_return_if_fail (INDICATOR_IS_POWER_SERVICE (self));
+  g_return_if_fail (!notifier || INDICATOR_IS_POWER_NOTIFIER (notifier));
+  p = self->priv;
+
+  if (p->notifier == notifier)
+    return;
+
+  g_clear_object (&p->notifier);
+
+  if (notifier != NULL)
+    {
+      p->notifier = g_object_ref (notifier);
+      indicator_power_notifier_set_bus (p->notifier, p->conn);
+    }
+}
+
+
 /* If a device has multiple batteries and uses only one of them at a time,
    they should be presented as separate items inside the battery menu,
    but everywhere else they should be aggregated (bug 880881).
diff --git a/src/service.h b/src/service.h
index 76ed10f..00ed3e6 100644
--- a/src/service.h
+++ b/src/service.h
@@ -24,6 +24,7 @@
 #include <glib-object.h>
 
 #include "device-provider.h"
+#include "notifier.h"
 
 G_BEGIN_DECLS
 
@@ -64,11 +65,15 @@ struct _IndicatorPowerServiceClass
 
 GType indicator_power_service_get_type (void);
 
-IndicatorPowerService * indicator_power_service_new (IndicatorPowerDeviceProvider * provider);
+IndicatorPowerService * indicator_power_service_new (IndicatorPowerDeviceProvider * provider,
+                                                     IndicatorPowerNotifier       * notifier);
 
 void indicator_power_service_set_device_provider (IndicatorPowerService        * self,
                                                   IndicatorPowerDeviceProvider * provider);
 
+void indicator_power_service_set_notifier (IndicatorPowerService  * self,
+                                           IndicatorPowerNotifier * notifier);
+
 IndicatorPowerDevice * indicator_power_service_choose_primary_device (GList * devices);