From 522fdc6abbfee52dec5c6b0194cf87ffcc0f3dcd Mon Sep 17 00:00:00 2001
From: Marc Deslauriers <marc.deslauriers@canonical.com>
Date: Tue, 2 Jun 2015 19:18:22 -0400
Subject: Don't prioritize discharging items with no time estimate that have
 more than 10% power remaining.

Devices with no time estimates are most likely low-power devices that
have long-lasting batteries, such as a mouse with AA batteries. For those
type of devices that contain batteries that last weeks, there is no value
in displaying their status in preference to devices that have a rapid
charge/discharge cycle.

However, there is value in knowing if the device has a battery that needs
replacing imminently, so only display it if it falls to a 10% charge or
under.
---
 src/service.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/service.c b/src/service.c
index c93c4b6..73fcf46 100644
--- a/src/service.c
+++ b/src/service.c
@@ -162,12 +162,12 @@ get_device_kind_weight (const IndicatorPowerDevice * device)
 }
 
 /* sort devices from most interesting to least interesting on this criteria:
-   1. device that supplied the power to the system
-   2. discharging items from least time remaining until most time remaining
-   3. charging items from most time left to charge to least time left to charge
-   4. charging items with an unknown time remaining
-   5. discharging items with an unknown time remaining
-   6. batteries, then non-line power, then line-power */
+   1. discharging items from least time remaining until most time remaining
+   2. charging items from most time left to charge to least time left to charge
+   3. charging items with an unknown time remaining
+   4. discharging items with an unknown time remaining, but 10% or below
+   5. batteries, then non-line power, then line-power
+   6. discharging items with an unknown time remaining, but above 10% */
 static gint
 device_compare_func (gconstpointer ga, gconstpointer gb)
 {
@@ -199,6 +199,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)))
     {
-- 
cgit v1.2.3


From c5f9fe4e21d24581aad7bfd7b73fb060aaf440ff Mon Sep 17 00:00:00 2001
From: charles kerr <charlesk@canonical.com>
Date: Fri, 1 Jan 2016 12:14:40 -0600
Subject: add an XDG friendly way of finding app-specific datafiles

---
 src/CMakeLists.txt |  1 +
 src/datafiles.c    | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/datafiles.h    | 37 ++++++++++++++++++++++++++++
 3 files changed, 109 insertions(+)
 create mode 100644 src/datafiles.c
 create mode 100644 src/datafiles.h

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fb8ffef..b68619c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -10,6 +10,7 @@ endif()
 # handwritten sources
 set(SERVICE_MANUAL_SOURCES
     brightness.c
+    datafiles.c
     device-provider-mock.c
     device-provider-upower.c
     device-provider.c
diff --git a/src/datafiles.c b/src/datafiles.c
new file mode 100644
index 0000000..dba8048
--- /dev/null
+++ b/src/datafiles.c
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2015 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..f624b9c
--- /dev/null
+++ b/src/datafiles.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2015 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__ */
-- 
cgit v1.2.3


From 4fc7a4e4d0346e1aad32057536301620e138bf30 Mon Sep 17 00:00:00 2001
From: charles kerr <charlesk@canonical.com>
Date: Fri, 1 Jan 2016 12:34:41 -0600
Subject: add logic to call sound_play_file() when the low battery notification
 is shown

---
 src/CMakeLists.txt |  3 ++-
 src/notifier.c     | 30 ++++++++++++++++++++++++++++++
 src/sound.c        | 29 +++++++++++++++++++++++++++++
 src/sound.h        | 31 +++++++++++++++++++++++++++++++
 4 files changed, 92 insertions(+), 1 deletion(-)
 create mode 100644 src/sound.c
 create mode 100644 src/sound.h

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b68619c..ed0e0ff 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -19,7 +19,8 @@ set(SERVICE_MANUAL_SOURCES
     notifier.c
     testing.c
     service.c
-    utils.c)
+    utils.c
+    sound.c)
 
 # generated sources
 include(GdbusCodegen)
diff --git a/src/notifier.c b/src/notifier.c
index 123ee6f..47690ca 100644
--- a/src/notifier.c
+++ b/src/notifier.c
@@ -17,10 +17,16 @@
  *   Charles Kerr <charles.kerr@canonical.com>
  */
 
+#include "datafiles.h"
 #include "dbus-battery.h"
 #include "dbus-shared.h"
 #include "notifier.h"
 #include "utils.h"
+#include "sound.h"
+
+#ifdef HAS_URLDISPATCHER
+# include <lomiri-url-dispatcher.h>
+#endif
 
 #include <libnotify/notify.h>
 
@@ -129,6 +135,29 @@ get_battery_power_level (IndicatorPowerDevice * battery)
   return ret;
 }
 
+/***
+****  Sounds
+***/
+
+static void
+play_low_battery_sound (void)
+{
+  const gchar * key;
+  gchar * filename;
+
+  key = "Low battery.ogg";
+  filename = datafile_find(DATAFILE_TYPE_SOUND, key);
+  if (filename != NULL)
+    {
+      sound_play_file(filename);
+      g_free(filename);
+    }
+  else
+    {
+      g_warning("Unable to find '%s' in XDG data dirs", key);
+    }
+}
+
 /***
 ****  Notifications
 ***/
@@ -299,6 +328,7 @@ on_battery_property_changed (IndicatorPowerNotifier * self)
       ((new_power_level != POWER_LEVEL_OK) && new_discharging && !old_discharging))
     {
       notification_show (self);
+      play_low_battery_sound();
     }
   else if (!new_discharging || (new_power_level == POWER_LEVEL_OK))
     {
diff --git a/src/sound.c b/src/sound.c
new file mode 100644
index 0000000..d92aee8
--- /dev/null
+++ b/src/sound.c
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2015 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 "sound.h"
+
+#include <gio/gio.h>
+
+void
+sound_play_file(const char* filename)
+{
+    g_message("playing sound '%s'", filename);
+}
+
diff --git a/src/sound.h b/src/sound.h
new file mode 100644
index 0000000..a241e5d
--- /dev/null
+++ b/src/sound.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2015 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_SOUND_H__
+#define __INDICATOR_POWER_SOUND_H__
+
+#include <gio/gio.h>
+
+G_BEGIN_DECLS
+
+void sound_play_file(const char* filename);
+
+G_END_DECLS
+
+#endif /* __INDICATOR_POWER_SOUND_H__ */
-- 
cgit v1.2.3


From 2b939453598cc1fd8f1c40e5d6cbfd63cb852fb4 Mon Sep 17 00:00:00 2001
From: charles kerr <charlesk@canonical.com>
Date: Fri, 1 Jan 2016 13:53:48 -0600
Subject: use gstreamer to play the sound

---
 src/notifier.c |  4 ++-
 src/sound.c    | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 src/sound.h    |  2 +-
 3 files changed, 82 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/notifier.c b/src/notifier.c
index 47690ca..63e7c89 100644
--- a/src/notifier.c
+++ b/src/notifier.c
@@ -149,7 +149,9 @@ play_low_battery_sound (void)
   filename = datafile_find(DATAFILE_TYPE_SOUND, key);
   if (filename != NULL)
     {
-      sound_play_file(filename);
+      gchar * uri = g_filename_to_uri(filename, NULL, NULL);
+      sound_play_uri(uri);
+      g_free(uri);
       g_free(filename);
     }
   else
diff --git a/src/sound.c b/src/sound.c
index d92aee8..37c2a8d 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -19,11 +19,86 @@
 
 #include "sound.h"
 
-#include <gio/gio.h>
+#include <glib.h>
+
+#include <gst/gst.h>
+
+static void
+gst_init_once(void)
+{
+  static gboolean gst_init_checked = FALSE;
+
+  if (G_UNLIKELY(!gst_init_checked))
+    {
+      GError* error = NULL;
+      if (!gst_init_check(NULL, NULL, &error))
+        {
+          g_critical("Unable to play alarm sound: %s", error->message);
+          g_error_free(error);
+        }
+      gst_init_checked = TRUE;
+    }
+}
+
+static gboolean bus_callback(GstBus* bus G_GNUC_UNUSED, GstMessage* msg, gpointer gelement)
+{
+  const GstMessageType message_type = GST_MESSAGE_TYPE(msg);
+
+  if (GST_MESSAGE_SRC(msg) != gelement)
+    return G_SOURCE_CONTINUE;
+
+  /* on eos, cleanup the element and cancel our gst bus subscription */
+  if (message_type == GST_MESSAGE_EOS)
+    {
+      g_debug("got GST_MESSAGE_EOS on sound play");
+      gst_element_set_state(GST_ELEMENT(gelement), GST_STATE_NULL);
+      gst_object_unref(gelement);
+      return G_SOURCE_REMOVE;
+    }
+
+  /* on stream start, set the media role to 'alert' if we're using pulsesink */
+  if (message_type == GST_MESSAGE_STREAM_START)
+    {
+      GstElement* audio_sink = NULL;
+      g_debug("got GST_MESSAGE_STREAM_START on sound play");
+      g_object_get(gelement, "audio-sink", &audio_sink, NULL);
+      if (audio_sink != NULL)
+        {
+          GstPluginFeature* feature;
+          feature = GST_PLUGIN_FEATURE_CAST(GST_ELEMENT_GET_CLASS(audio_sink)->elementfactory);
+          if (feature && g_strcmp0(gst_plugin_feature_get_name(feature), "pulsesink") == 0)
+            {
+              const gchar* const props_str = "props,media.role=alert";
+              GstStructure* props = gst_structure_from_string(props_str, NULL);
+              g_debug("setting audio sink properties to '%s'", props_str);
+              g_object_set(audio_sink, "stream-properties", props, NULL);
+              g_clear_pointer(&props, gst_structure_free);
+            }
+          gst_object_unref(audio_sink);
+        }
+    }
+
+  return G_SOURCE_CONTINUE;
+}
 
 void
-sound_play_file(const char* filename)
+sound_play_uri(const char* uri)
 {
-    g_message("playing sound '%s'", filename);
+  GstElement * element;
+  GstBus * bus;
+
+  gst_init_once();
+
+  element = gst_element_factory_make("playbin", NULL);
+
+  /* start listening for gst events */
+  bus = gst_pipeline_get_bus(GST_PIPELINE(element));
+  gst_bus_add_watch(bus, bus_callback, element);
+  gst_object_unref(bus);
+
+  /* play the sound */
+  g_debug("Playing '%s'", uri);
+  g_object_set(element, "uri", uri, NULL);
+  gst_element_set_state(element, GST_STATE_PLAYING);
 }
 
diff --git a/src/sound.h b/src/sound.h
index a241e5d..f201fe9 100644
--- a/src/sound.h
+++ b/src/sound.h
@@ -24,7 +24,7 @@
 
 G_BEGIN_DECLS
 
-void sound_play_file(const char* filename);
+void sound_play_uri(const char* uri);
 
 G_END_DECLS
 
-- 
cgit v1.2.3


From a8fd3f49bf6509bd4545aec3292d2fc022d847ca Mon Sep 17 00:00:00 2001
From: charles kerr <charlesk@canonical.com>
Date: Fri, 1 Jan 2016 15:58:55 -0600
Subject: make a SoundPlayer interface so we can mock it in the tests

this requires an annoying amount of scaffolding:
1. implement gst and mock classes to implement the SoundPlayer interface
2. modify notifier to take a SoundPlayer argument in its ctor
3. modify service to take a Notifier argument in its ctor instead of instantiating it on its own
4. change main to update the startup steps for player/notifier/service
---
 src/CMakeLists.txt      |   4 +-
 src/main.c              |  12 +++-
 src/notifier.c          |  61 ++++++++++++++---
 src/notifier.h          |   6 +-
 src/service.c           |  38 +++++++++--
 src/service.h           |   7 +-
 src/sound-player-gst.c  | 173 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/sound-player-gst.h  |  70 ++++++++++++++++++++
 src/sound-player-mock.c |  94 ++++++++++++++++++++++++++
 src/sound-player-mock.h |  75 +++++++++++++++++++++
 src/sound-player.c      |  45 +++++++++++++
 src/sound-player.h      |  72 ++++++++++++++++++++
 src/sound.c             | 104 -----------------------------
 src/sound.h             |  31 ---------
 14 files changed, 639 insertions(+), 153 deletions(-)
 create mode 100644 src/sound-player-gst.c
 create mode 100644 src/sound-player-gst.h
 create mode 100644 src/sound-player-mock.c
 create mode 100644 src/sound-player-mock.h
 create mode 100644 src/sound-player.c
 create mode 100644 src/sound-player.h
 delete mode 100644 src/sound.c
 delete mode 100644 src/sound.h

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ed0e0ff..c99ce46 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,7 +20,9 @@ set(SERVICE_MANUAL_SOURCES
     testing.c
     service.c
     utils.c
-    sound.c)
+    sound-player.c
+    sound-player-gst.c
+    sound-player-mock.c)
 
 # generated sources
 include(GdbusCodegen)
diff --git a/src/main.c b/src/main.c
index 03e100d..2837b59 100644
--- a/src/main.c
+++ b/src/main.c
@@ -23,7 +23,9 @@
 #include <glib/gi18n.h>
 
 #include "device.h"
+#include "notifier.h"
 #include "service.h"
+#include "sound-player-gst.h"
 #include "testing.h"
 
 /***
@@ -40,6 +42,8 @@ on_name_lost (gpointer instance G_GNUC_UNUSED, gpointer loop)
 int
 main (int argc G_GNUC_UNUSED, char ** argv G_GNUC_UNUSED)
 {
+  IndicatorPowerSoundPlayer * sound_player;
+  IndicatorPowerNotifier * notifier;
   IndicatorPowerService * service;
   IndicatorPowerTesting * testing;
   GMainLoop * loop;
@@ -50,7 +54,9 @@ main (int argc G_GNUC_UNUSED, char ** argv G_GNUC_UNUSED)
   textdomain (GETTEXT_PACKAGE);
 
   /* run */
-  service = indicator_power_service_new (NULL);
+  sound_player = indicator_power_sound_player_gst_new ();
+  notifier = indicator_power_notifier_new (sound_player);
+  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 +65,9 @@ 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);
+  g_clear_object (&sound_player);
   return 0;
 }
diff --git a/src/notifier.c b/src/notifier.c
index 63e7c89..b50f48c 100644
--- a/src/notifier.c
+++ b/src/notifier.c
@@ -22,10 +22,10 @@
 #include "dbus-shared.h"
 #include "notifier.h"
 #include "utils.h"
-#include "sound.h"
+#include "sound-player.h"
 
 #ifdef HAS_URLDISPATCHER
-# include <lomiri-url-dispatcher.h>
+#include <lomiri-url-dispatcher.h>
 #endif
 
 #include <libnotify/notify.h>
@@ -51,10 +51,12 @@ enum
 {
   PROP_0,
   PROP_BATTERY,
+  PROP_SOUND_PLAYER,
   LAST_PROP
 };
 
 #define PROP_BATTERY_NAME "battery"
+#define PROP_SOUND_PLAYER_NAME "sound-player"
 
 static GParamSpec * properties[LAST_PROP];
 
@@ -82,6 +84,8 @@ typedef struct
 
   gboolean caps_queried;
   gboolean actions_supported;
+
+  IndicatorPowerSoundPlayer * sound_player;
 }
 IndicatorPowerNotifierPrivate;
 
@@ -140,17 +144,19 @@ get_battery_power_level (IndicatorPowerDevice * battery)
 ***/
 
 static void
-play_low_battery_sound (void)
+play_low_battery_sound (IndicatorPowerNotifier * self)
 {
-  const gchar * key;
+  const gchar * const key = "Low battery.ogg";
   gchar * filename;
+  priv_t * const p = get_priv(self);
+
+  g_return_if_fail (p->sound_player != NULL);
 
-  key = "Low battery.ogg";
   filename = datafile_find(DATAFILE_TYPE_SOUND, key);
   if (filename != NULL)
     {
       gchar * uri = g_filename_to_uri(filename, NULL, NULL);
-      sound_play_uri(uri);
+      indicator_power_sound_player_play_uri (p->sound_player, uri);
       g_free(uri);
       g_free(filename);
     }
@@ -330,7 +336,7 @@ on_battery_property_changed (IndicatorPowerNotifier * self)
       ((new_power_level != POWER_LEVEL_OK) && new_discharging && !old_discharging))
     {
       notification_show (self);
-      play_low_battery_sound();
+      play_low_battery_sound (self);
     }
   else if (!new_discharging || (new_power_level == POWER_LEVEL_OK))
     {
@@ -361,6 +367,10 @@ my_get_property (GObject     * o,
         g_value_set_object (value, p->battery);
         break;
 
+      case PROP_SOUND_PLAYER:
+        g_value_set_object (value, p->sound_player);
+        break;
+
       default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (o, property_id, pspec);
     }
@@ -380,6 +390,10 @@ my_set_property (GObject       * o,
         indicator_power_notifier_set_battery (self, g_value_get_object(value));
         break;
 
+      case PROP_SOUND_PLAYER:
+        indicator_power_notifier_set_sound_player (self, g_value_get_object(value));
+        break;
+
       default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (o, property_id, pspec);
     }
@@ -446,6 +460,13 @@ indicator_power_notifier_class_init (IndicatorPowerNotifierClass * klass)
     G_TYPE_OBJECT,
     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
 
+  properties[PROP_SOUND_PLAYER] = g_param_spec_object (
+    PROP_SOUND_PLAYER_NAME,
+    "Sound Player",
+    "The current battery",
+    G_TYPE_OBJECT,
+    G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+
   g_object_class_install_properties (object_class, LAST_PROP, properties);
 }
 
@@ -454,9 +475,11 @@ indicator_power_notifier_class_init (IndicatorPowerNotifierClass * klass)
 ***/
 
 IndicatorPowerNotifier *
-indicator_power_notifier_new (void)
+indicator_power_notifier_new (IndicatorPowerSoundPlayer * sound_player)
 {
-  GObject * o = g_object_new (INDICATOR_TYPE_POWER_NOTIFIER, NULL);
+  GObject * o = g_object_new (INDICATOR_TYPE_POWER_NOTIFIER,
+                              PROP_SOUND_PLAYER_NAME, sound_player,
+                              NULL);
 
   return INDICATOR_POWER_NOTIFIER (o);
 }
@@ -495,6 +518,26 @@ indicator_power_notifier_set_battery (IndicatorPowerNotifier * self,
     }
 }
 
+void
+indicator_power_notifier_set_sound_player (IndicatorPowerNotifier * self,
+                                           IndicatorPowerSoundPlayer * sound_player)
+{
+  priv_t * p;
+
+  g_return_if_fail(INDICATOR_IS_POWER_NOTIFIER(self));
+  g_return_if_fail((sound_player == NULL) || INDICATOR_IS_POWER_SOUND_PLAYER(sound_player));
+
+  p = get_priv (self);
+
+  if (p->sound_player == sound_player)
+    return;
+
+  g_clear_object(&p->sound_player);
+
+  if (sound_player != NULL)
+      p->sound_player = g_object_ref(sound_player);
+}
+
 void
 indicator_power_notifier_set_bus (IndicatorPowerNotifier * self,
                                   GDBusConnection        * bus)
diff --git a/src/notifier.h b/src/notifier.h
index 18e25d7..9625c07 100644
--- a/src/notifier.h
+++ b/src/notifier.h
@@ -23,6 +23,7 @@
 #include <gio/gio.h>
 
 #include "device.h"
+#include "sound-player.h"
 
 G_BEGIN_DECLS
 
@@ -55,7 +56,7 @@ struct _IndicatorPowerNotifierClass
 
 GType indicator_power_notifier_get_type (void);
 
-IndicatorPowerNotifier * indicator_power_notifier_new (void);
+IndicatorPowerNotifier * indicator_power_notifier_new (IndicatorPowerSoundPlayer * sound_player);
 
 void indicator_power_notifier_set_bus (IndicatorPowerNotifier  * self,
                                        GDBusConnection         * connection);
@@ -63,6 +64,9 @@ void indicator_power_notifier_set_bus (IndicatorPowerNotifier  * self,
 void indicator_power_notifier_set_battery (IndicatorPowerNotifier  * self,
                                            IndicatorPowerDevice    * battery);
 
+void indicator_power_notifier_set_sound_player (IndicatorPowerNotifier     * self,
+                                                IndicatorPowerSoundPlayer  * battery);
+
 #define POWER_LEVEL_STR_OK "ok"
 #define POWER_LEVEL_STR_LOW "low"
 #define POWER_LEVEL_STR_VERY_LOW "very_low"
diff --git a/src/service.c b/src/service.c
index 73fcf46..07f1106 100644
--- a/src/service.c
+++ b/src/service.c
@@ -52,6 +52,7 @@ enum
   PROP_0,
   PROP_BUS,
   PROP_DEVICE_PROVIDER,
+  PROP_NOTIFIER,
   LAST_PROP
 };
 
@@ -976,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,
@@ -1118,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);
     }
@@ -1137,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);
     }
@@ -1179,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);
 }
@@ -1200,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);
@@ -1269,10 +1278,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);
@@ -1311,6 +1322,25 @@ 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)
+    {
+      g_clear_object (&p->notifier);
+      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);
 
 
diff --git a/src/sound-player-gst.c b/src/sound-player-gst.c
new file mode 100644
index 0000000..9b3f11a
--- /dev/null
+++ b/src/sound-player-gst.c
@@ -0,0 +1,173 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ *   Charles Kerr <charles.kerr@canonical.com>
+ *
+ * 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/>.
+ */
+
+#include "sound-player.h"
+#include "sound-player-gst.h"
+
+#include <gst/gst.h>
+
+
+/***
+****  private struct
+***/
+
+typedef struct
+{
+  int unused;
+}
+IndicatorPowerSoundPlayerGSTPrivate;
+
+typedef IndicatorPowerSoundPlayerGSTPrivate priv_t;
+
+#define get_priv(o) ((priv_t*)indicator_power_sound_player_gst_get_instance_private(o))
+
+
+/***
+****  GObject boilerplate
+***/
+
+static void indicator_power_device_provider_interface_init (
+                                IndicatorPowerSoundPlayerInterface * iface);
+
+G_DEFINE_TYPE_WITH_CODE (
+  IndicatorPowerSoundPlayerGST,
+  indicator_power_sound_player_gst,
+  G_TYPE_OBJECT,
+  G_ADD_PRIVATE(IndicatorPowerSoundPlayerGST)
+  G_IMPLEMENT_INTERFACE (INDICATOR_TYPE_POWER_SOUND_PLAYER,
+                         indicator_power_device_provider_interface_init))
+
+/***
+****  GSTREAMER
+***/
+
+static void
+gst_init_once(void)
+{
+  static gboolean gst_init_checked = FALSE;
+
+  if (G_UNLIKELY(!gst_init_checked))
+    {
+      GError* error = NULL;
+      if (!gst_init_check(NULL, NULL, &error))
+        {
+          g_critical("Unable to play alarm sound: %s", error->message);
+          g_error_free(error);
+        }
+      gst_init_checked = TRUE;
+    }
+}
+
+static gboolean bus_callback(GstBus* bus G_GNUC_UNUSED, GstMessage* msg, gpointer gelement)
+{
+  const GstMessageType message_type = GST_MESSAGE_TYPE(msg);
+
+  if (GST_MESSAGE_SRC(msg) != gelement)
+    return G_SOURCE_CONTINUE;
+
+  /* on eos, cleanup the element and cancel our gst bus subscription */
+  if (message_type == GST_MESSAGE_EOS)
+    {
+      g_debug("got GST_MESSAGE_EOS on sound play");
+      gst_element_set_state(GST_ELEMENT(gelement), GST_STATE_NULL);
+      gst_object_unref(gelement);
+      return G_SOURCE_REMOVE;
+    }
+
+  /* on stream start, set the media role to 'alert' if we're using pulsesink */
+  if (message_type == GST_MESSAGE_STREAM_START)
+    {
+      GstElement* audio_sink = NULL;
+      g_debug("got GST_MESSAGE_STREAM_START on sound play");
+      g_object_get(gelement, "audio-sink", &audio_sink, NULL);
+      if (audio_sink != NULL)
+        {
+          GstPluginFeature* feature;
+          feature = GST_PLUGIN_FEATURE_CAST(GST_ELEMENT_GET_CLASS(audio_sink)->elementfactory);
+          if (feature && g_strcmp0(gst_plugin_feature_get_name(feature), "pulsesink") == 0)
+            {
+              const gchar* const props_str = "props,media.role=alert";
+              GstStructure* props = gst_structure_from_string(props_str, NULL);
+              g_debug("setting audio sink properties to '%s'", props_str);
+              g_object_set(audio_sink, "stream-properties", props, NULL);
+              g_clear_pointer(&props, gst_structure_free);
+            }
+          gst_object_unref(audio_sink);
+        }
+    }
+
+  return G_SOURCE_CONTINUE;
+}
+
+/***
+****  IndicatorPowerSoundPlayer virtual functions
+***/
+
+static void
+my_play_uri (IndicatorPowerSoundPlayer * self G_GNUC_UNUSED, const gchar * uri)
+{
+  GstElement * element;
+  GstBus * bus;
+
+  /* create the element */
+  element = gst_element_factory_make("playbin", NULL);
+
+  /* start listening for gst events */
+  bus = gst_pipeline_get_bus(GST_PIPELINE(element));
+  gst_bus_add_watch(bus, bus_callback, element);
+  gst_object_unref(bus);
+
+  /* play the sound */
+  g_debug("Playing '%s'", uri);
+  g_object_set(element, "uri", uri, NULL);
+  gst_element_set_state(element, GST_STATE_PLAYING);
+}
+
+/***
+****  Instantiation
+***/
+
+static void
+indicator_power_sound_player_gst_class_init (IndicatorPowerSoundPlayerGSTClass * klass)
+{
+  gst_init_once();
+}
+
+static void
+indicator_power_device_provider_interface_init (IndicatorPowerSoundPlayerInterface * iface)
+{
+  iface->play_uri = my_play_uri;
+}
+
+static void
+indicator_power_sound_player_gst_init (IndicatorPowerSoundPlayerGST * self G_GNUC_UNUSED)
+{
+}
+
+/***
+****  Public API
+***/
+
+IndicatorPowerSoundPlayer *
+indicator_power_sound_player_gst_new(void)
+{
+  gpointer o = g_object_new (INDICATOR_TYPE_POWER_SOUND_PLAYER_GST, NULL);
+
+  return INDICATOR_POWER_SOUND_PLAYER (o);
+}
diff --git a/src/sound-player-gst.h b/src/sound-player-gst.h
new file mode 100644
index 0000000..6ef8866
--- /dev/null
+++ b/src/sound-player-gst.h
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ *   Charles Kerr <charles.kerr@canonical.com>
+ *
+ * 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/>.
+ */
+
+#ifndef __INDICATOR_POWER_SOUND_PLAYER_GST__H__
+#define __INDICATOR_POWER_SOUND_PLAYER_GST__H__
+
+#include <glib-object.h> /* parent class */
+
+#include "device-provider.h"
+
+G_BEGIN_DECLS
+
+#define INDICATOR_TYPE_POWER_SOUND_PLAYER_GST \
+  (indicator_power_sound_player_gst_get_type())
+
+#define INDICATOR_POWER_SOUND_PLAYER_GST(o) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((o), \
+                               INDICATOR_TYPE_POWER_SOUND_PLAYER_GST, \
+                               IndicatorPowerSoundPlayerGST))
+
+#define INDICATOR_POWER_SOUND_PLAYER_GST_GET_CLASS(o) \
+ (G_TYPE_INSTANCE_GET_CLASS ((o), \
+                             INDICATOR_TYPE_POWER_SOUND_PLAYER_GST, \
+                             IndicatorPowerSoundPlayerGSTClass))
+
+#define INDICATOR_IS_POWER_SOUND_PLAYER_GST(o) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
+                               INDICATOR_TYPE_POWER_SOUND_PLAYER_GST))
+
+typedef struct _IndicatorPowerSoundPlayerGST
+                IndicatorPowerSoundPlayerGST;
+typedef struct _IndicatorPowerSoundPlayerGSTClass
+                IndicatorPowerSoundPlayerGSTClass;
+
+/**
+ * An IndicatorPowerSoundPlayer which gets its devices from GST.
+ */
+struct _IndicatorPowerSoundPlayerGST
+{
+  GObject parent_instance;
+};
+
+struct _IndicatorPowerSoundPlayerGSTClass
+{
+  GObjectClass parent_class;
+};
+
+GType indicator_power_sound_player_gst_get_type (void);
+
+IndicatorPowerSoundPlayer * indicator_power_sound_player_gst_new (void);
+
+G_END_DECLS
+
+#endif /* __INDICATOR_POWER_SOUND_PLAYER_GST__H__ */
diff --git a/src/sound-player-mock.c b/src/sound-player-mock.c
new file mode 100644
index 0000000..17eff21
--- /dev/null
+++ b/src/sound-player-mock.c
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2014 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 "sound-player.h"
+#include "sound-player-mock.h"
+
+enum
+{
+  SIGNAL_URI_PLAYED,
+  LAST_SIGNAL
+};
+
+static guint signals[LAST_SIGNAL] = { 0 };
+
+/***
+****  GObject boilerplate
+***/
+
+static void indicator_power_sound_player_interface_init (
+                                IndicatorPowerSoundPlayerInterface * iface);
+
+G_DEFINE_TYPE_WITH_CODE (
+  IndicatorPowerSoundPlayerMock,
+  indicator_power_sound_player_mock,
+  G_TYPE_OBJECT,
+  G_IMPLEMENT_INTERFACE (INDICATOR_TYPE_POWER_SOUND_PLAYER,
+                         indicator_power_sound_player_interface_init))
+
+/***
+****  IndicatorPowerSoundPlayer virtual functions
+***/
+
+static void
+my_play_uri (IndicatorPowerSoundPlayer * self, const gchar * uri)
+{
+  g_signal_emit (self, signals[SIGNAL_URI_PLAYED], 0, uri, NULL);
+}
+
+/***
+****  Instantiation
+***/
+
+static void
+indicator_power_sound_player_mock_class_init (IndicatorPowerSoundPlayerMockClass * klass G_GNUC_UNUSED)
+{
+  signals[SIGNAL_URI_PLAYED] = g_signal_new (
+    "uri-played",
+    G_TYPE_FROM_CLASS(klass),
+    G_SIGNAL_RUN_LAST,
+    G_STRUCT_OFFSET (IndicatorPowerSoundPlayerMockClass, uri_played),
+    NULL, NULL,
+    g_cclosure_marshal_VOID__STRING,
+    G_TYPE_NONE, 1, G_TYPE_STRING);
+}
+
+static void
+indicator_power_sound_player_interface_init (IndicatorPowerSoundPlayerInterface * iface)
+{
+  iface->play_uri = my_play_uri;
+}
+
+static void
+indicator_power_sound_player_mock_init (IndicatorPowerSoundPlayerMock * self G_GNUC_UNUSED)
+{
+}
+
+/***
+****  Public API
+***/
+
+IndicatorPowerSoundPlayer *
+indicator_power_sound_player_mock_new (void)
+{
+  gpointer o = g_object_new (INDICATOR_TYPE_POWER_SOUND_PLAYER_MOCK, NULL);
+
+  return INDICATOR_POWER_SOUND_PLAYER (o);
+}
+
diff --git a/src/sound-player-mock.h b/src/sound-player-mock.h
new file mode 100644
index 0000000..f7f2653
--- /dev/null
+++ b/src/sound-player-mock.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2014 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_SOUND_PLAYER_MOCK__H__
+#define __INDICATOR_POWER_SOUND_PLAYER_MOCK__H__
+
+#include <glib-object.h> /* parent class */
+
+#include "sound-player.h"
+
+G_BEGIN_DECLS
+
+#define INDICATOR_TYPE_POWER_SOUND_PLAYER_MOCK \
+  (indicator_power_sound_player_mock_get_type())
+
+#define INDICATOR_POWER_SOUND_PLAYER_MOCK(o) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((o), \
+                               INDICATOR_TYPE_POWER_SOUND_PLAYER_MOCK, \
+                               IndicatorPowerSoundPlayerMock))
+
+#define INDICATOR_POWER_SOUND_PLAYER_MOCK_GET_CLASS(o) \
+ (G_TYPE_INSTANCE_GET_CLASS ((o), \
+                             INDICATOR_TYPE_POWER_SOUND_PLAYER_MOCK, \
+                             IndicatorPowerSoundPlayerMockClass))
+
+#define INDICATOR_IS_POWER_SOUND_PLAYER_MOCK(o) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
+                               INDICATOR_TYPE_POWER_SOUND_PLAYER_MOCK))
+
+typedef struct _IndicatorPowerSoundPlayerMock
+                IndicatorPowerSoundPlayerMock;
+typedef struct _IndicatorPowerSoundPlayerMockPriv
+                IndicatorPowerSoundPlayerMockPriv;
+typedef struct _IndicatorPowerSoundPlayerMockClass
+                IndicatorPowerSoundPlayerMockClass;
+
+/**
+ * An IndicatorPowerSoundPlayer which gets its devices from Mock.
+ */
+struct _IndicatorPowerSoundPlayerMock
+{
+  GObject parent_instance;
+};
+
+struct _IndicatorPowerSoundPlayerMockClass
+{
+  GObjectClass parent_class;
+
+  /* signals */
+  void (*uri_played) (IndicatorPowerSoundPlayer * self, const gchar* uri);
+};
+
+GType indicator_power_sound_player_mock_get_type (void);
+
+IndicatorPowerSoundPlayer * indicator_power_sound_player_mock_new (void);
+
+G_END_DECLS
+
+#endif /* __INDICATOR_POWER_SOUND_PLAYER_MOCK__H__ */
diff --git a/src/sound-player.c b/src/sound-player.c
new file mode 100644
index 0000000..f6421ad
--- /dev/null
+++ b/src/sound-player.c
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ *   Charles Kerr <charles.kerr@canonical.com>
+ *
+ * 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/>.
+ */
+
+#include "sound-player.h"
+
+G_DEFINE_INTERFACE (IndicatorPowerSoundPlayer,
+                    indicator_power_sound_player,
+                    0)
+
+static void
+indicator_power_sound_player_default_init (IndicatorPowerSoundPlayerInterface * klass G_GNUC_UNUSED)
+{
+}
+
+/***
+****  PUBLIC API
+***/
+
+void
+indicator_power_sound_player_play_uri (IndicatorPowerSoundPlayer * self,
+                                       const gchar               * uri)
+{
+  IndicatorPowerSoundPlayerInterface * iface;
+
+  g_return_if_fail (INDICATOR_IS_POWER_SOUND_PLAYER (self));
+  iface = INDICATOR_POWER_SOUND_PLAYER_GET_INTERFACE (self);
+  g_return_if_fail (iface->play_uri != NULL);
+  iface->play_uri (self, uri);
+}
diff --git a/src/sound-player.h b/src/sound-player.h
new file mode 100644
index 0000000..ac7e261
--- /dev/null
+++ b/src/sound-player.h
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ *   Charles Kerr <charles.kerr@canonical.com>
+ *
+ * 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/>.
+ */
+
+#ifndef __INDICATOR_POWER_SOUND_PLAYER__H__
+#define __INDICATOR_POWER_SOUND_PLAYER__H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define INDICATOR_TYPE_POWER_SOUND_PLAYER \
+  (indicator_power_sound_player_get_type ())
+
+#define INDICATOR_POWER_SOUND_PLAYER(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+                               INDICATOR_TYPE_POWER_SOUND_PLAYER, \
+                               IndicatorPowerSoundPlayer))
+
+#define INDICATOR_IS_POWER_SOUND_PLAYER(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INDICATOR_TYPE_POWER_SOUND_PLAYER))
+
+#define INDICATOR_POWER_SOUND_PLAYER_GET_INTERFACE(inst) \
+  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), \
+                                  INDICATOR_TYPE_POWER_SOUND_PLAYER, \
+                                  IndicatorPowerSoundPlayerInterface))
+
+typedef struct _IndicatorPowerSoundPlayer
+                IndicatorPowerSoundPlayer;
+
+typedef struct _IndicatorPowerSoundPlayerInterface
+                IndicatorPowerSoundPlayerInterface;
+
+/**
+ * An interface class for an object that plays sounds.
+ */
+struct _IndicatorPowerSoundPlayerInterface
+{
+  GTypeInterface parent_iface;
+
+  /* virtual functions */
+  void (*play_uri) (IndicatorPowerSoundPlayer * self,
+                    const gchar * uri);
+};
+
+GType indicator_power_sound_player_get_type (void);
+
+/***
+****
+***/
+
+void indicator_power_sound_player_play_uri (IndicatorPowerSoundPlayer * self,
+                                            const gchar * uri);
+
+G_END_DECLS
+
+#endif /* __INDICATOR_POWER_SOUND_PLAYER__H__ */
diff --git a/src/sound.c b/src/sound.c
deleted file mode 100644
index 37c2a8d..0000000
--- a/src/sound.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright 2015 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 "sound.h"
-
-#include <glib.h>
-
-#include <gst/gst.h>
-
-static void
-gst_init_once(void)
-{
-  static gboolean gst_init_checked = FALSE;
-
-  if (G_UNLIKELY(!gst_init_checked))
-    {
-      GError* error = NULL;
-      if (!gst_init_check(NULL, NULL, &error))
-        {
-          g_critical("Unable to play alarm sound: %s", error->message);
-          g_error_free(error);
-        }
-      gst_init_checked = TRUE;
-    }
-}
-
-static gboolean bus_callback(GstBus* bus G_GNUC_UNUSED, GstMessage* msg, gpointer gelement)
-{
-  const GstMessageType message_type = GST_MESSAGE_TYPE(msg);
-
-  if (GST_MESSAGE_SRC(msg) != gelement)
-    return G_SOURCE_CONTINUE;
-
-  /* on eos, cleanup the element and cancel our gst bus subscription */
-  if (message_type == GST_MESSAGE_EOS)
-    {
-      g_debug("got GST_MESSAGE_EOS on sound play");
-      gst_element_set_state(GST_ELEMENT(gelement), GST_STATE_NULL);
-      gst_object_unref(gelement);
-      return G_SOURCE_REMOVE;
-    }
-
-  /* on stream start, set the media role to 'alert' if we're using pulsesink */
-  if (message_type == GST_MESSAGE_STREAM_START)
-    {
-      GstElement* audio_sink = NULL;
-      g_debug("got GST_MESSAGE_STREAM_START on sound play");
-      g_object_get(gelement, "audio-sink", &audio_sink, NULL);
-      if (audio_sink != NULL)
-        {
-          GstPluginFeature* feature;
-          feature = GST_PLUGIN_FEATURE_CAST(GST_ELEMENT_GET_CLASS(audio_sink)->elementfactory);
-          if (feature && g_strcmp0(gst_plugin_feature_get_name(feature), "pulsesink") == 0)
-            {
-              const gchar* const props_str = "props,media.role=alert";
-              GstStructure* props = gst_structure_from_string(props_str, NULL);
-              g_debug("setting audio sink properties to '%s'", props_str);
-              g_object_set(audio_sink, "stream-properties", props, NULL);
-              g_clear_pointer(&props, gst_structure_free);
-            }
-          gst_object_unref(audio_sink);
-        }
-    }
-
-  return G_SOURCE_CONTINUE;
-}
-
-void
-sound_play_uri(const char* uri)
-{
-  GstElement * element;
-  GstBus * bus;
-
-  gst_init_once();
-
-  element = gst_element_factory_make("playbin", NULL);
-
-  /* start listening for gst events */
-  bus = gst_pipeline_get_bus(GST_PIPELINE(element));
-  gst_bus_add_watch(bus, bus_callback, element);
-  gst_object_unref(bus);
-
-  /* play the sound */
-  g_debug("Playing '%s'", uri);
-  g_object_set(element, "uri", uri, NULL);
-  gst_element_set_state(element, GST_STATE_PLAYING);
-}
-
diff --git a/src/sound.h b/src/sound.h
deleted file mode 100644
index f201fe9..0000000
--- a/src/sound.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2015 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_SOUND_H__
-#define __INDICATOR_POWER_SOUND_H__
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-void sound_play_uri(const char* uri);
-
-G_END_DECLS
-
-#endif /* __INDICATOR_POWER_SOUND_H__ */
-- 
cgit v1.2.3


From bdc03e1cddb8811651f22e0bb423bf3385cbc793 Mon Sep 17 00:00:00 2001
From: charles kerr <charlesk@canonical.com>
Date: Fri, 1 Jan 2016 16:12:16 -0600
Subject: update copyright years on changed/new files

---
 src/notifier.c          | 2 +-
 src/notifier.h          | 2 +-
 src/sound-player-gst.c  | 8 ++++----
 src/sound-player-gst.h  | 8 ++++----
 src/sound-player-mock.c | 2 +-
 src/sound-player-mock.h | 2 +-
 src/sound-player.c      | 8 ++++----
 src/sound-player.h      | 8 ++++----
 8 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'src')

diff --git a/src/notifier.c b/src/notifier.c
index b50f48c..0907a14 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
diff --git a/src/notifier.h b/src/notifier.h
index 9625c07..602f6e5 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/sound-player-gst.c b/src/sound-player-gst.c
index 9b3f11a..25c3884 100644
--- a/src/sound-player-gst.c
+++ b/src/sound-player-gst.c
@@ -1,8 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
- *
- * Authors:
- *   Charles Kerr <charles.kerr@canonical.com>
+ * 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
@@ -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 "sound-player.h"
diff --git a/src/sound-player-gst.h b/src/sound-player-gst.h
index 6ef8866..3075738 100644
--- a/src/sound-player-gst.h
+++ b/src/sound-player-gst.h
@@ -1,8 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
- *
- * Authors:
- *   Charles Kerr <charles.kerr@canonical.com>
+ * 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
@@ -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>
  */
 
 #ifndef __INDICATOR_POWER_SOUND_PLAYER_GST__H__
diff --git a/src/sound-player-mock.c b/src/sound-player-mock.c
index 17eff21..35c3b57 100644
--- a/src/sound-player-mock.c
+++ b/src/sound-player-mock.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * 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
diff --git a/src/sound-player-mock.h b/src/sound-player-mock.h
index f7f2653..f844924 100644
--- a/src/sound-player-mock.h
+++ b/src/sound-player-mock.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * 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
diff --git a/src/sound-player.c b/src/sound-player.c
index f6421ad..dcbb27b 100644
--- a/src/sound-player.c
+++ b/src/sound-player.c
@@ -1,8 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
- *
- * Authors:
- *   Charles Kerr <charles.kerr@canonical.com>
+ * 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
@@ -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 "sound-player.h"
diff --git a/src/sound-player.h b/src/sound-player.h
index ac7e261..adff924 100644
--- a/src/sound-player.h
+++ b/src/sound-player.h
@@ -1,8 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
- *
- * Authors:
- *   Charles Kerr <charles.kerr@canonical.com>
+ * 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
@@ -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>
  */
 
 #ifndef __INDICATOR_POWER_SOUND_PLAYER__H__
-- 
cgit v1.2.3


From 46efcd909dc04f6474f275071aadf41e7547f6d8 Mon Sep 17 00:00:00 2001
From: charles kerr <charlesk@canonical.com>
Date: Fri, 1 Jan 2016 16:17:52 -0600
Subject: in Notifier's destructor, unref its SoundPlayer field

---
 src/notifier.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/notifier.c b/src/notifier.c
index 0907a14..d5e8b5d 100644
--- a/src/notifier.c
+++ b/src/notifier.c
@@ -406,6 +406,7 @@ my_dispose (GObject * o)
   priv_t * const p = get_priv (self);
 
   indicator_power_notifier_set_bus (self, NULL);
+  indicator_power_notifier_set_sound_player (self, NULL);
   notification_clear (self);
   indicator_power_notifier_set_battery (self, NULL);
   g_clear_object (&p->dbus_battery);
-- 
cgit v1.2.3


From 61327b52f353c829ed10b452d17fec3d36b8c601 Mon Sep 17 00:00:00 2001
From: charles kerr <charlesk@canonical.com>
Date: Fri, 1 Jan 2016 16:26:35 -0600
Subject: fix notifier property in service

---
 src/service.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src')

diff --git a/src/service.c b/src/service.c
index 07f1106..a6c3432 100644
--- a/src/service.c
+++ b/src/service.c
@@ -1270,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);
 }
 
-- 
cgit v1.2.3


From 9b631e9353d206ab5c8bb64317f584024ebe0f4a Mon Sep 17 00:00:00 2001
From: charles kerr <charlesk@canonical.com>
Date: Fri, 1 Jan 2016 18:49:13 -0600
Subject: fix another touched file's copyright date

---
 src/main.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/main.c b/src/main.c
index 2837b59..34185b4 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>
-- 
cgit v1.2.3


From 460f1464709a4c5e2c1594045961be9108ae2afd Mon Sep 17 00:00:00 2001
From: charles kerr <charlesk@canonical.com>
Date: Fri, 1 Jan 2016 19:37:51 -0600
Subject: use a symbolic constant for the low battery sound's filename

---
 src/notifier.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/notifier.c b/src/notifier.c
index d5e8b5d..7d81f3a 100644
--- a/src/notifier.c
+++ b/src/notifier.c
@@ -146,7 +146,7 @@ get_battery_power_level (IndicatorPowerDevice * battery)
 static void
 play_low_battery_sound (IndicatorPowerNotifier * self)
 {
-  const gchar * const key = "Low battery.ogg";
+  const gchar * const key = LOW_BATTERY_SOUND;
   gchar * filename;
   priv_t * const p = get_priv(self);
 
-- 
cgit v1.2.3


From 97130ad08300c3ec6ab2165ff7506cd7f25af0d6 Mon Sep 17 00:00:00 2001
From: charles kerr <charlesk@canonical.com>
Date: Fri, 1 Jan 2016 20:08:05 -0600
Subject: honor com.ubuntu.touch.AccountsService.Sound.SilentMode

---
 src/CMakeLists.txt                             |  5 ++
 src/com.ubuntu.touch.AccountsService.Sound.xml | 47 +++++++++++++++++++
 src/notifier.c                                 | 64 +++++++++++++++++++++++++-
 3 files changed, 115 insertions(+), 1 deletion(-)
 create mode 100644 src/com.ubuntu.touch.AccountsService.Sound.xml

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c99ce46..01a0558 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -39,6 +39,11 @@ 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)
+add_gdbus_codegen_with_namespace(SERVICE_GENERATED_SOURCES dbus-accounts-sound
+                                 com.ubuntu.touch
+                                 Dbus
+                                 ${CMAKE_SOURCE_DIR}/src/com.ubuntu.touch.AccountsService.Sound.xml)
+
 # add the bin dir to our include path so the code can find the generated header files
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
diff --git a/src/com.ubuntu.touch.AccountsService.Sound.xml b/src/com.ubuntu.touch.AccountsService.Sound.xml
new file mode 100644
index 0000000..6e2ca5f
--- /dev/null
+++ b/src/com.ubuntu.touch.AccountsService.Sound.xml
@@ -0,0 +1,47 @@
+<node>
+    <interface name="com.ubuntu.touch.AccountsService.Sound">
+
+        <annotation name="org.freedesktop.Accounts.VendorExtension" value="true"/>
+
+        <!-- Muted is all sound, SilentMode is only non-user-initiated sounds -->
+        <property name="SilentMode" type="b" access="readwrite">
+            <annotation name="org.freedesktop.Accounts.DefaultValue" value="false"/>
+        </property>
+
+        <property name="IncomingCallSound" type="s" access="readwrite">
+            <annotation name="org.freedesktop.Accounts.DefaultValue.String" 
+                value="/usr/share/sounds/ubuntu/ringtones/Ubuntu.ogg"/>
+        </property>
+
+        <property name="IncomingMessageSound" type="s" access="readwrite">
+            <annotation name="org.freedesktop.Accounts.DefaultValue.String" 
+                value="/usr/share/sounds/ubuntu/notifications/Xylo.ogg"/>
+        </property>
+
+        <property name="IncomingCallVibrate" type="b" access="readwrite">
+            <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
+        </property>
+
+        <property name="IncomingCallVibrateSilentMode" type="b" access="readwrite">
+            <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
+        </property>
+
+        <property name="IncomingMessageVibrate" type="b" access="readwrite">
+            <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
+        </property>
+
+        <property name="IncomingMessageVibrateSilentMode" type="b" access="readwrite">
+            <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
+        </property>
+
+        <!-- "Other vibrations" should cover all vibrations except for those relating to phone calls and messages -->
+        <property name="OtherVibrate" type="b" access="readwrite">
+            <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
+        </property>
+
+        <property name="DialpadSoundsEnabled" type="b" access="readwrite">
+            <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
+        </property>
+
+    </interface>
+</node>
diff --git a/src/notifier.c b/src/notifier.c
index 7d81f3a..ad7efb0 100644
--- a/src/notifier.c
+++ b/src/notifier.c
@@ -18,6 +18,7 @@
  */
 
 #include "datafiles.h"
+#include "dbus-accounts-sound.h"
 #include "dbus-battery.h"
 #include "dbus-shared.h"
 #include "notifier.h"
@@ -86,6 +87,9 @@ typedef struct
   gboolean actions_supported;
 
   IndicatorPowerSoundPlayer * sound_player;
+
+  GCancellable * cancellable;
+  DbusAccountsServiceSound * accounts_service_sound_proxy;
 }
 IndicatorPowerNotifierPrivate;
 
@@ -143,6 +147,40 @@ get_battery_power_level (IndicatorPowerDevice * battery)
 ****  Sounds
 ***/
 
+static void
+on_sound_proxy_ready (GObject      * source_object G_GNUC_UNUSED,
+                      GAsyncResult * res,
+                      gpointer       gself)
+{
+  GError * error;
+  DbusAccountsServiceSound * proxy;
+
+  error = NULL;
+  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))
+        g_warning("%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);
+      p->accounts_service_sound_proxy = proxy;
+    }
+}
+
+static gboolean
+silent_mode (IndicatorPowerNotifier * self)
+{
+  priv_t * const p = get_priv (self);
+
+  return (p->accounts_service_sound_proxy != NULL)
+      && (dbus_accounts_service_sound_get_silent_mode(p->accounts_service_sound_proxy));
+}
+
 static void
 play_low_battery_sound (IndicatorPowerNotifier * self)
 {
@@ -150,8 +188,13 @@ play_low_battery_sound (IndicatorPowerNotifier * self)
   gchar * filename;
   priv_t * const p = get_priv(self);
 
+  /* can't play? */
   g_return_if_fail (p->sound_player != NULL);
 
+  /* won't play? */
+  if (silent_mode(self))
+    return;
+
   filename = datafile_find(DATAFILE_TYPE_SOUND, key);
   if (filename != NULL)
     {
@@ -405,11 +448,18 @@ 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);
   indicator_power_notifier_set_sound_player (self, NULL);
   notification_clear (self);
   indicator_power_notifier_set_battery (self, NULL);
   g_clear_object (&p->dbus_battery);
+  g_clear_object (&p->accounts_service_sound_proxy);
 
   G_OBJECT_CLASS (indicator_power_notifier_parent_class)->dispose (o);
 }
@@ -428,7 +478,6 @@ my_finalize (GObject * o G_GNUC_UNUSED)
 ****  Instantiation
 ***/
 
-
 static void
 indicator_power_notifier_init (IndicatorPowerNotifier * self)
 {
@@ -440,8 +489,21 @@ indicator_power_notifier_init (IndicatorPowerNotifier * self)
 
   p->power_level = POWER_LEVEL_OK;
 
+  p->cancellable = g_cancellable_new();
+
   if (!instance_count++ && !notify_init("ayatana-indicator-power-service"))
     g_critical("Unable to initialize libnotify! Notifications might not be shown.");
+
+  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);
 }
 
 static void
-- 
cgit v1.2.3


From deca915372eddd1e0a1fa219cb26d7f6541d1f80 Mon Sep 17 00:00:00 2001
From: charles kerr <charlesk@canonical.com>
Date: Fri, 1 Jan 2016 20:14:14 -0600
Subject: update copyright dates on changed files (again)

---
 src/datafiles.c |  2 +-
 src/datafiles.h |  2 +-
 src/service.c   | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/datafiles.c b/src/datafiles.c
index dba8048..6d9962c 100644
--- a/src/datafiles.c
+++ b/src/datafiles.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * 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
diff --git a/src/datafiles.h b/src/datafiles.h
index f624b9c..95c5bc9 100644
--- a/src/datafiles.h
+++ b/src/datafiles.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * 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
diff --git a/src/service.c b/src/service.c
index a6c3432..17414c7 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>
-- 
cgit v1.2.3


From 5d038638f58765ec3859797704c5d0e1c0fa7903 Mon Sep 17 00:00:00 2001
From: charles kerr <charlesk@canonical.com>
Date: Fri, 1 Jan 2016 20:19:45 -0600
Subject: handle service_set_notifier(NULL) gracefully

---
 src/service.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/service.c b/src/service.c
index 17414c7..c04122f 100644
--- a/src/service.c
+++ b/src/service.c
@@ -1339,9 +1339,13 @@ indicator_power_service_set_notifier (IndicatorPowerService  * self,
   g_return_if_fail (!notifier || INDICATOR_IS_POWER_NOTIFIER (notifier));
   p = self->priv;
 
-  if (p->notifier != notifier)
+  if (p->notifier == notifier)
+    return;
+
+  g_clear_object (&p->notifier);
+
+  if (notifier != NULL)
     {
-      g_clear_object (&p->notifier);
       p->notifier = g_object_ref (notifier);
       indicator_power_notifier_set_bus (p->notifier, p->conn);
     }
-- 
cgit v1.2.3


From 1182c7fb79942c14f2a713063182778e6af94cd1 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Mon, 4 Jan 2016 09:38:01 -0600
Subject: add build-dep to accountsservice-ubuntu-schemas instead of bundling
 com.ubuntu.touch.AccountsService.Sound.xml into our source tree

---
 src/CMakeLists.txt                             | 11 +++---
 src/com.ubuntu.touch.AccountsService.Sound.xml | 47 --------------------------
 src/notifier.c                                 | 23 +++++++++++--
 3 files changed, 27 insertions(+), 54 deletions(-)
 delete mode 100644 src/com.ubuntu.touch.AccountsService.Sound.xml

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 01a0558..4654380 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -39,10 +39,13 @@ 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)
-add_gdbus_codegen_with_namespace(SERVICE_GENERATED_SOURCES dbus-accounts-sound
-                                 com.ubuntu.touch
-                                 Dbus
-                                 ${CMAKE_SOURCE_DIR}/src/com.ubuntu.touch.AccountsService.Sound.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})
diff --git a/src/com.ubuntu.touch.AccountsService.Sound.xml b/src/com.ubuntu.touch.AccountsService.Sound.xml
deleted file mode 100644
index 6e2ca5f..0000000
--- a/src/com.ubuntu.touch.AccountsService.Sound.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<node>
-    <interface name="com.ubuntu.touch.AccountsService.Sound">
-
-        <annotation name="org.freedesktop.Accounts.VendorExtension" value="true"/>
-
-        <!-- Muted is all sound, SilentMode is only non-user-initiated sounds -->
-        <property name="SilentMode" type="b" access="readwrite">
-            <annotation name="org.freedesktop.Accounts.DefaultValue" value="false"/>
-        </property>
-
-        <property name="IncomingCallSound" type="s" access="readwrite">
-            <annotation name="org.freedesktop.Accounts.DefaultValue.String" 
-                value="/usr/share/sounds/ubuntu/ringtones/Ubuntu.ogg"/>
-        </property>
-
-        <property name="IncomingMessageSound" type="s" access="readwrite">
-            <annotation name="org.freedesktop.Accounts.DefaultValue.String" 
-                value="/usr/share/sounds/ubuntu/notifications/Xylo.ogg"/>
-        </property>
-
-        <property name="IncomingCallVibrate" type="b" access="readwrite">
-            <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
-        </property>
-
-        <property name="IncomingCallVibrateSilentMode" type="b" access="readwrite">
-            <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
-        </property>
-
-        <property name="IncomingMessageVibrate" type="b" access="readwrite">
-            <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
-        </property>
-
-        <property name="IncomingMessageVibrateSilentMode" type="b" access="readwrite">
-            <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
-        </property>
-
-        <!-- "Other vibrations" should cover all vibrations except for those relating to phone calls and messages -->
-        <property name="OtherVibrate" type="b" access="readwrite">
-            <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
-        </property>
-
-        <property name="DialpadSoundsEnabled" type="b" access="readwrite">
-            <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
-        </property>
-
-    </interface>
-</node>
diff --git a/src/notifier.c b/src/notifier.c
index ad7efb0..487f889 100644
--- a/src/notifier.c
+++ b/src/notifier.c
@@ -18,7 +18,11 @@
  */
 
 #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"
@@ -89,7 +93,9 @@ typedef struct
   IndicatorPowerSoundPlayer * sound_player;
 
   GCancellable * cancellable;
+  #ifdef HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS
   DbusAccountsServiceSound * accounts_service_sound_proxy;
+  #endif
 }
 IndicatorPowerNotifierPrivate;
 
@@ -147,16 +153,18 @@ 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;
-  DbusAccountsServiceSound * proxy;
-
   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))
@@ -172,6 +180,7 @@ on_sound_proxy_ready (GObject      * source_object G_GNUC_UNUSED,
     }
 }
 
+
 static gboolean
 silent_mode (IndicatorPowerNotifier * self)
 {
@@ -180,6 +189,7 @@ silent_mode (IndicatorPowerNotifier * self)
   return (p->accounts_service_sound_proxy != NULL)
       && (dbus_accounts_service_sound_get_silent_mode(p->accounts_service_sound_proxy));
 }
+#endif
 
 static void
 play_low_battery_sound (IndicatorPowerNotifier * self)
@@ -191,9 +201,11 @@ play_low_battery_sound (IndicatorPowerNotifier * self)
   /* can't play? */
   g_return_if_fail (p->sound_player != NULL);
 
+  #ifdef HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS
   /* won't play? */
   if (silent_mode(self))
     return;
+  #endif
 
   filename = datafile_find(DATAFILE_TYPE_SOUND, key);
   if (filename != NULL)
@@ -459,7 +471,10 @@ my_dispose (GObject * o)
   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);
 }
@@ -467,7 +482,7 @@ my_dispose (GObject * 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)
@@ -494,6 +509,7 @@ indicator_power_notifier_init (IndicatorPowerNotifier * self)
   if (!instance_count++ && !notify_init("ayatana-indicator-power-service"))
     g_critical("Unable to initialize libnotify! Notifications might not be shown.");
 
+  #ifdef HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS
   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,
@@ -504,6 +520,7 @@ indicator_power_notifier_init (IndicatorPowerNotifier * self)
     on_sound_proxy_ready,
     self);
   g_clear_pointer(&object_path, g_free);
+  #endif
 }
 
 static void
-- 
cgit v1.2.3


From afc091939635eb46f2947cfe1aaadcb408de2835 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Mon, 4 Jan 2016 10:08:39 -0600
Subject: add a leak safeguard to accounts_service_sound_proxy

---
 src/notifier.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/notifier.c b/src/notifier.c
index 487f889..696556a 100644
--- a/src/notifier.c
+++ b/src/notifier.c
@@ -176,6 +176,7 @@ on_sound_proxy_ready (GObject      * source_object G_GNUC_UNUSED,
     {
       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;
     }
 }
-- 
cgit v1.2.3


From 27122e92856bbe4efcdfc4975b46a0c6dee67cb9 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Mon, 4 Jan 2016 10:10:25 -0600
Subject: assume we're in silent mode if we can't get an accounts-service proxy

---
 src/notifier.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/notifier.c b/src/notifier.c
index 696556a..4b7aede 100644
--- a/src/notifier.c
+++ b/src/notifier.c
@@ -187,8 +187,12 @@ silent_mode (IndicatorPowerNotifier * self)
 {
   priv_t * const p = get_priv (self);
 
-  return (p->accounts_service_sound_proxy != NULL)
-      && (dbus_accounts_service_sound_get_silent_mode(p->accounts_service_sound_proxy));
+  /* 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 == NULL)
+    return TRUE;
+
+  return dbus_accounts_service_sound_get_silent_mode(p->accounts_service_sound_proxy);
 }
 #endif
 
-- 
cgit v1.2.3


From 1d9e1e532b6e52c974a6889706e02a500290ea51 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Mon, 4 Jan 2016 10:11:18 -0600
Subject: fix copy-paste typo

---
 src/notifier.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/notifier.c b/src/notifier.c
index 4b7aede..93ab461 100644
--- a/src/notifier.c
+++ b/src/notifier.c
@@ -548,7 +548,7 @@ indicator_power_notifier_class_init (IndicatorPowerNotifierClass * klass)
   properties[PROP_SOUND_PLAYER] = g_param_spec_object (
     PROP_SOUND_PLAYER_NAME,
     "Sound Player",
-    "The current battery",
+    "The current sound player",
     G_TYPE_OBJECT,
     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
 
-- 
cgit v1.2.3


From f829a7e9bc11614bf75dff270f161bff71c8ae4d Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Mon, 4 Jan 2016 10:19:59 -0600
Subject: move sound-player-mock into the tests/ directory

---
 src/CMakeLists.txt      |  3 +-
 src/sound-player-mock.c | 94 -------------------------------------------------
 src/sound-player-mock.h | 75 ---------------------------------------
 3 files changed, 1 insertion(+), 171 deletions(-)
 delete mode 100644 src/sound-player-mock.c
 delete mode 100644 src/sound-player-mock.h

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4654380..8eac086 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -21,8 +21,7 @@ set(SERVICE_MANUAL_SOURCES
     service.c
     utils.c
     sound-player.c
-    sound-player-gst.c
-    sound-player-mock.c)
+    sound-player-gst.c)
 
 # generated sources
 include(GdbusCodegen)
diff --git a/src/sound-player-mock.c b/src/sound-player-mock.c
deleted file mode 100644
index 35c3b57..0000000
--- a/src/sound-player-mock.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * 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 "sound-player.h"
-#include "sound-player-mock.h"
-
-enum
-{
-  SIGNAL_URI_PLAYED,
-  LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-/***
-****  GObject boilerplate
-***/
-
-static void indicator_power_sound_player_interface_init (
-                                IndicatorPowerSoundPlayerInterface * iface);
-
-G_DEFINE_TYPE_WITH_CODE (
-  IndicatorPowerSoundPlayerMock,
-  indicator_power_sound_player_mock,
-  G_TYPE_OBJECT,
-  G_IMPLEMENT_INTERFACE (INDICATOR_TYPE_POWER_SOUND_PLAYER,
-                         indicator_power_sound_player_interface_init))
-
-/***
-****  IndicatorPowerSoundPlayer virtual functions
-***/
-
-static void
-my_play_uri (IndicatorPowerSoundPlayer * self, const gchar * uri)
-{
-  g_signal_emit (self, signals[SIGNAL_URI_PLAYED], 0, uri, NULL);
-}
-
-/***
-****  Instantiation
-***/
-
-static void
-indicator_power_sound_player_mock_class_init (IndicatorPowerSoundPlayerMockClass * klass G_GNUC_UNUSED)
-{
-  signals[SIGNAL_URI_PLAYED] = g_signal_new (
-    "uri-played",
-    G_TYPE_FROM_CLASS(klass),
-    G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (IndicatorPowerSoundPlayerMockClass, uri_played),
-    NULL, NULL,
-    g_cclosure_marshal_VOID__STRING,
-    G_TYPE_NONE, 1, G_TYPE_STRING);
-}
-
-static void
-indicator_power_sound_player_interface_init (IndicatorPowerSoundPlayerInterface * iface)
-{
-  iface->play_uri = my_play_uri;
-}
-
-static void
-indicator_power_sound_player_mock_init (IndicatorPowerSoundPlayerMock * self G_GNUC_UNUSED)
-{
-}
-
-/***
-****  Public API
-***/
-
-IndicatorPowerSoundPlayer *
-indicator_power_sound_player_mock_new (void)
-{
-  gpointer o = g_object_new (INDICATOR_TYPE_POWER_SOUND_PLAYER_MOCK, NULL);
-
-  return INDICATOR_POWER_SOUND_PLAYER (o);
-}
-
diff --git a/src/sound-player-mock.h b/src/sound-player-mock.h
deleted file mode 100644
index f844924..0000000
--- a/src/sound-player-mock.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * 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_SOUND_PLAYER_MOCK__H__
-#define __INDICATOR_POWER_SOUND_PLAYER_MOCK__H__
-
-#include <glib-object.h> /* parent class */
-
-#include "sound-player.h"
-
-G_BEGIN_DECLS
-
-#define INDICATOR_TYPE_POWER_SOUND_PLAYER_MOCK \
-  (indicator_power_sound_player_mock_get_type())
-
-#define INDICATOR_POWER_SOUND_PLAYER_MOCK(o) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((o), \
-                               INDICATOR_TYPE_POWER_SOUND_PLAYER_MOCK, \
-                               IndicatorPowerSoundPlayerMock))
-
-#define INDICATOR_POWER_SOUND_PLAYER_MOCK_GET_CLASS(o) \
- (G_TYPE_INSTANCE_GET_CLASS ((o), \
-                             INDICATOR_TYPE_POWER_SOUND_PLAYER_MOCK, \
-                             IndicatorPowerSoundPlayerMockClass))
-
-#define INDICATOR_IS_POWER_SOUND_PLAYER_MOCK(o) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
-                               INDICATOR_TYPE_POWER_SOUND_PLAYER_MOCK))
-
-typedef struct _IndicatorPowerSoundPlayerMock
-                IndicatorPowerSoundPlayerMock;
-typedef struct _IndicatorPowerSoundPlayerMockPriv
-                IndicatorPowerSoundPlayerMockPriv;
-typedef struct _IndicatorPowerSoundPlayerMockClass
-                IndicatorPowerSoundPlayerMockClass;
-
-/**
- * An IndicatorPowerSoundPlayer which gets its devices from Mock.
- */
-struct _IndicatorPowerSoundPlayerMock
-{
-  GObject parent_instance;
-};
-
-struct _IndicatorPowerSoundPlayerMockClass
-{
-  GObjectClass parent_class;
-
-  /* signals */
-  void (*uri_played) (IndicatorPowerSoundPlayer * self, const gchar* uri);
-};
-
-GType indicator_power_sound_player_mock_get_type (void);
-
-IndicatorPowerSoundPlayer * indicator_power_sound_player_mock_new (void);
-
-G_END_DECLS
-
-#endif /* __INDICATOR_POWER_SOUND_PLAYER_MOCK__H__ */
-- 
cgit v1.2.3


From d2e654d53f5dbe89cce2fe08a7e6dbcae4a6d835 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Mon, 4 Jan 2016 12:52:04 -0600
Subject: don't disable the warning sound when AccountServices is completely
 unavailable

---
 src/notifier.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/notifier.c b/src/notifier.c
index 93ab461..e6c511f 100644
--- a/src/notifier.c
+++ b/src/notifier.c
@@ -95,6 +95,7 @@ typedef struct
   GCancellable * cancellable;
   #ifdef HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS
   DbusAccountsServiceSound * accounts_service_sound_proxy;
+  gboolean accounts_service_sound_proxy_pending;
   #endif
 }
 IndicatorPowerNotifierPrivate;
@@ -168,7 +169,10 @@ on_sound_proxy_ready (GObject      * source_object G_GNUC_UNUSED,
   if (error != NULL)
     {
       if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-        g_warning("%s Couldn't find accounts service sound proxy: %s", G_STRLOC, error->message);
+        {
+          get_priv(gself)->accounts_service_sound_proxy_pending = FALSE;
+          g_warning("%s Couldn't find accounts service sound proxy: %s", G_STRLOC, error->message);
+        }
 
       g_clear_error(&error);
     }
@@ -178,6 +182,7 @@ on_sound_proxy_ready (GObject      * source_object G_GNUC_UNUSED,
       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;
     }
 }
 
@@ -189,10 +194,11 @@ silent_mode (IndicatorPowerNotifier * 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 == NULL)
+  if (p->accounts_service_sound_proxy_pending)
     return TRUE;
 
-  return dbus_accounts_service_sound_get_silent_mode(p->accounts_service_sound_proxy);
+  return (p->accounts_service_sound_proxy != NULL)
+      && dbus_accounts_service_sound_get_silent_mode(p->accounts_service_sound_proxy);
 }
 #endif
 
@@ -515,6 +521,7 @@ indicator_power_notifier_init (IndicatorPowerNotifier * self)
     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,
-- 
cgit v1.2.3


From b9068926a006bfcae447d3d14ef9ef50af2388ee Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Mon, 4 Jan 2016 14:25:56 -0600
Subject: demote a spurious warning to a debug message

---
 src/notifier.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/notifier.c b/src/notifier.c
index e6c511f..b481fdf 100644
--- a/src/notifier.c
+++ b/src/notifier.c
@@ -171,7 +171,7 @@ on_sound_proxy_ready (GObject      * source_object G_GNUC_UNUSED,
       if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
         {
           get_priv(gself)->accounts_service_sound_proxy_pending = FALSE;
-          g_warning("%s Couldn't find accounts service sound proxy: %s", G_STRLOC, error->message);
+          g_debug("%s Couldn't find accounts service sound proxy: %s", G_STRLOC, error->message);
         }
 
       g_clear_error(&error);
-- 
cgit v1.2.3


From f4d66118c3a845892b32495efec3d6473e17baca Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Mon, 1 Feb 2016 10:53:07 -0600
Subject: for low power notifications, use libnotify's 'sound-file' property
 instead of indicator-power calling the sound player directly

---
 src/CMakeLists.txt     |   4 +-
 src/main.c             |   6 +-
 src/notifier.c         |  94 +++++----------------------
 src/notifier.h         |   6 +-
 src/sound-player-gst.c | 173 -------------------------------------------------
 src/sound-player-gst.h |  70 --------------------
 src/sound-player.c     |  45 -------------
 src/sound-player.h     |  72 --------------------
 8 files changed, 20 insertions(+), 450 deletions(-)
 delete mode 100644 src/sound-player-gst.c
 delete mode 100644 src/sound-player-gst.h
 delete mode 100644 src/sound-player.c
 delete mode 100644 src/sound-player.h

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8eac086..a5e6c57 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -19,9 +19,7 @@ set(SERVICE_MANUAL_SOURCES
     notifier.c
     testing.c
     service.c
-    utils.c
-    sound-player.c
-    sound-player-gst.c)
+    utils.c)
 
 # generated sources
 include(GdbusCodegen)
diff --git a/src/main.c b/src/main.c
index 34185b4..ce54ae8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -25,7 +25,6 @@
 #include "device.h"
 #include "notifier.h"
 #include "service.h"
-#include "sound-player-gst.h"
 #include "testing.h"
 
 /***
@@ -42,7 +41,6 @@ on_name_lost (gpointer instance G_GNUC_UNUSED, gpointer loop)
 int
 main (int argc G_GNUC_UNUSED, char ** argv G_GNUC_UNUSED)
 {
-  IndicatorPowerSoundPlayer * sound_player;
   IndicatorPowerNotifier * notifier;
   IndicatorPowerService * service;
   IndicatorPowerTesting * testing;
@@ -54,8 +52,7 @@ main (int argc G_GNUC_UNUSED, char ** argv G_GNUC_UNUSED)
   textdomain (GETTEXT_PACKAGE);
 
   /* run */
-  sound_player = indicator_power_sound_player_gst_new ();
-  notifier = indicator_power_notifier_new (sound_player);
+  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);
@@ -68,6 +65,5 @@ main (int argc G_GNUC_UNUSED, char ** argv G_GNUC_UNUSED)
   g_clear_object (&testing);
   g_clear_object (&service);
   g_clear_object (&notifier);
-  g_clear_object (&sound_player);
   return 0;
 }
diff --git a/src/notifier.c b/src/notifier.c
index b481fdf..00a00e5 100644
--- a/src/notifier.c
+++ b/src/notifier.c
@@ -27,7 +27,6 @@
 #include "dbus-shared.h"
 #include "notifier.h"
 #include "utils.h"
-#include "sound-player.h"
 
 #ifdef HAS_URLDISPATCHER
 #include <lomiri-url-dispatcher.h>
@@ -56,12 +55,10 @@ enum
 {
   PROP_0,
   PROP_BATTERY,
-  PROP_SOUND_PLAYER,
   LAST_PROP
 };
 
 #define PROP_BATTERY_NAME "battery"
-#define PROP_SOUND_PLAYER_NAME "sound-player"
 
 static GParamSpec * properties[LAST_PROP];
 
@@ -90,8 +87,6 @@ typedef struct
   gboolean caps_queried;
   gboolean actions_supported;
 
-  IndicatorPowerSoundPlayer * sound_player;
-
   GCancellable * cancellable;
   #ifdef HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS
   DbusAccountsServiceSound * accounts_service_sound_proxy;
@@ -202,36 +197,6 @@ silent_mode (IndicatorPowerNotifier * self)
 }
 #endif
 
-static void
-play_low_battery_sound (IndicatorPowerNotifier * self)
-{
-  const gchar * const key = LOW_BATTERY_SOUND;
-  gchar * filename;
-  priv_t * const p = get_priv(self);
-
-  /* can't play? */
-  g_return_if_fail (p->sound_player != NULL);
-
-  #ifdef HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS
-  /* won't play? */
-  if (silent_mode(self))
-    return;
-  #endif
-
-  filename = datafile_find(DATAFILE_TYPE_SOUND, key);
-  if (filename != NULL)
-    {
-      gchar * uri = g_filename_to_uri(filename, NULL, NULL);
-      indicator_power_sound_player_play_uri (p->sound_player, uri);
-      g_free(uri);
-      g_free(filename);
-    }
-  else
-    {
-      g_warning("Unable to find '%s' in XDG data dirs", key);
-    }
-}
-
 /***
 ****  Notifications
 ***/
@@ -346,6 +311,21 @@ notification_show(IndicatorPowerNotifier * self)
 
   if (are_actions_supported(self))
     {
+      if (!silent_mode(self))
+        {
+          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"));
@@ -402,7 +382,6 @@ on_battery_property_changed (IndicatorPowerNotifier * self)
       ((new_power_level != POWER_LEVEL_OK) && new_discharging && !old_discharging))
     {
       notification_show (self);
-      play_low_battery_sound (self);
     }
   else if (!new_discharging || (new_power_level == POWER_LEVEL_OK))
     {
@@ -433,10 +412,6 @@ my_get_property (GObject     * o,
         g_value_set_object (value, p->battery);
         break;
 
-      case PROP_SOUND_PLAYER:
-        g_value_set_object (value, p->sound_player);
-        break;
-
       default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (o, property_id, pspec);
     }
@@ -456,10 +431,6 @@ my_set_property (GObject       * o,
         indicator_power_notifier_set_battery (self, g_value_get_object(value));
         break;
 
-      case PROP_SOUND_PLAYER:
-        indicator_power_notifier_set_sound_player (self, g_value_get_object(value));
-        break;
-
       default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (o, property_id, pspec);
     }
@@ -478,7 +449,6 @@ my_dispose (GObject * o)
     }
 
   indicator_power_notifier_set_bus (self, NULL);
-  indicator_power_notifier_set_sound_player (self, NULL);
   notification_clear (self);
   indicator_power_notifier_set_battery (self, NULL);
   g_clear_object (&p->dbus_battery);
@@ -552,13 +522,6 @@ indicator_power_notifier_class_init (IndicatorPowerNotifierClass * klass)
     G_TYPE_OBJECT,
     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
 
-  properties[PROP_SOUND_PLAYER] = g_param_spec_object (
-    PROP_SOUND_PLAYER_NAME,
-    "Sound Player",
-    "The current sound player",
-    G_TYPE_OBJECT,
-    G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-
   g_object_class_install_properties (object_class, LAST_PROP, properties);
 }
 
@@ -567,12 +530,9 @@ indicator_power_notifier_class_init (IndicatorPowerNotifierClass * klass)
 ***/
 
 IndicatorPowerNotifier *
-indicator_power_notifier_new (IndicatorPowerSoundPlayer * sound_player)
+indicator_power_notifier_new (void)
 {
-  GObject * o = g_object_new (INDICATOR_TYPE_POWER_NOTIFIER,
-                              PROP_SOUND_PLAYER_NAME, sound_player,
-                              NULL);
-
+  GObject * o = g_object_new (INDICATOR_TYPE_POWER_NOTIFIER, NULL);
   return INDICATOR_POWER_NOTIFIER (o);
 }
 
@@ -610,26 +570,6 @@ indicator_power_notifier_set_battery (IndicatorPowerNotifier * self,
     }
 }
 
-void
-indicator_power_notifier_set_sound_player (IndicatorPowerNotifier * self,
-                                           IndicatorPowerSoundPlayer * sound_player)
-{
-  priv_t * p;
-
-  g_return_if_fail(INDICATOR_IS_POWER_NOTIFIER(self));
-  g_return_if_fail((sound_player == NULL) || INDICATOR_IS_POWER_SOUND_PLAYER(sound_player));
-
-  p = get_priv (self);
-
-  if (p->sound_player == sound_player)
-    return;
-
-  g_clear_object(&p->sound_player);
-
-  if (sound_player != NULL)
-      p->sound_player = g_object_ref(sound_player);
-}
-
 void
 indicator_power_notifier_set_bus (IndicatorPowerNotifier * self,
                                   GDBusConnection        * bus)
diff --git a/src/notifier.h b/src/notifier.h
index 602f6e5..1b04943 100644
--- a/src/notifier.h
+++ b/src/notifier.h
@@ -23,7 +23,6 @@
 #include <gio/gio.h>
 
 #include "device.h"
-#include "sound-player.h"
 
 G_BEGIN_DECLS
 
@@ -56,7 +55,7 @@ struct _IndicatorPowerNotifierClass
 
 GType indicator_power_notifier_get_type (void);
 
-IndicatorPowerNotifier * indicator_power_notifier_new (IndicatorPowerSoundPlayer * sound_player);
+IndicatorPowerNotifier * indicator_power_notifier_new (void);
 
 void indicator_power_notifier_set_bus (IndicatorPowerNotifier  * self,
                                        GDBusConnection         * connection);
@@ -64,9 +63,6 @@ void indicator_power_notifier_set_bus (IndicatorPowerNotifier  * self,
 void indicator_power_notifier_set_battery (IndicatorPowerNotifier  * self,
                                            IndicatorPowerDevice    * battery);
 
-void indicator_power_notifier_set_sound_player (IndicatorPowerNotifier     * self,
-                                                IndicatorPowerSoundPlayer  * battery);
-
 #define POWER_LEVEL_STR_OK "ok"
 #define POWER_LEVEL_STR_LOW "low"
 #define POWER_LEVEL_STR_VERY_LOW "very_low"
diff --git a/src/sound-player-gst.c b/src/sound-player-gst.c
deleted file mode 100644
index 25c3884..0000000
--- a/src/sound-player-gst.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * 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 "sound-player.h"
-#include "sound-player-gst.h"
-
-#include <gst/gst.h>
-
-
-/***
-****  private struct
-***/
-
-typedef struct
-{
-  int unused;
-}
-IndicatorPowerSoundPlayerGSTPrivate;
-
-typedef IndicatorPowerSoundPlayerGSTPrivate priv_t;
-
-#define get_priv(o) ((priv_t*)indicator_power_sound_player_gst_get_instance_private(o))
-
-
-/***
-****  GObject boilerplate
-***/
-
-static void indicator_power_device_provider_interface_init (
-                                IndicatorPowerSoundPlayerInterface * iface);
-
-G_DEFINE_TYPE_WITH_CODE (
-  IndicatorPowerSoundPlayerGST,
-  indicator_power_sound_player_gst,
-  G_TYPE_OBJECT,
-  G_ADD_PRIVATE(IndicatorPowerSoundPlayerGST)
-  G_IMPLEMENT_INTERFACE (INDICATOR_TYPE_POWER_SOUND_PLAYER,
-                         indicator_power_device_provider_interface_init))
-
-/***
-****  GSTREAMER
-***/
-
-static void
-gst_init_once(void)
-{
-  static gboolean gst_init_checked = FALSE;
-
-  if (G_UNLIKELY(!gst_init_checked))
-    {
-      GError* error = NULL;
-      if (!gst_init_check(NULL, NULL, &error))
-        {
-          g_critical("Unable to play alarm sound: %s", error->message);
-          g_error_free(error);
-        }
-      gst_init_checked = TRUE;
-    }
-}
-
-static gboolean bus_callback(GstBus* bus G_GNUC_UNUSED, GstMessage* msg, gpointer gelement)
-{
-  const GstMessageType message_type = GST_MESSAGE_TYPE(msg);
-
-  if (GST_MESSAGE_SRC(msg) != gelement)
-    return G_SOURCE_CONTINUE;
-
-  /* on eos, cleanup the element and cancel our gst bus subscription */
-  if (message_type == GST_MESSAGE_EOS)
-    {
-      g_debug("got GST_MESSAGE_EOS on sound play");
-      gst_element_set_state(GST_ELEMENT(gelement), GST_STATE_NULL);
-      gst_object_unref(gelement);
-      return G_SOURCE_REMOVE;
-    }
-
-  /* on stream start, set the media role to 'alert' if we're using pulsesink */
-  if (message_type == GST_MESSAGE_STREAM_START)
-    {
-      GstElement* audio_sink = NULL;
-      g_debug("got GST_MESSAGE_STREAM_START on sound play");
-      g_object_get(gelement, "audio-sink", &audio_sink, NULL);
-      if (audio_sink != NULL)
-        {
-          GstPluginFeature* feature;
-          feature = GST_PLUGIN_FEATURE_CAST(GST_ELEMENT_GET_CLASS(audio_sink)->elementfactory);
-          if (feature && g_strcmp0(gst_plugin_feature_get_name(feature), "pulsesink") == 0)
-            {
-              const gchar* const props_str = "props,media.role=alert";
-              GstStructure* props = gst_structure_from_string(props_str, NULL);
-              g_debug("setting audio sink properties to '%s'", props_str);
-              g_object_set(audio_sink, "stream-properties", props, NULL);
-              g_clear_pointer(&props, gst_structure_free);
-            }
-          gst_object_unref(audio_sink);
-        }
-    }
-
-  return G_SOURCE_CONTINUE;
-}
-
-/***
-****  IndicatorPowerSoundPlayer virtual functions
-***/
-
-static void
-my_play_uri (IndicatorPowerSoundPlayer * self G_GNUC_UNUSED, const gchar * uri)
-{
-  GstElement * element;
-  GstBus * bus;
-
-  /* create the element */
-  element = gst_element_factory_make("playbin", NULL);
-
-  /* start listening for gst events */
-  bus = gst_pipeline_get_bus(GST_PIPELINE(element));
-  gst_bus_add_watch(bus, bus_callback, element);
-  gst_object_unref(bus);
-
-  /* play the sound */
-  g_debug("Playing '%s'", uri);
-  g_object_set(element, "uri", uri, NULL);
-  gst_element_set_state(element, GST_STATE_PLAYING);
-}
-
-/***
-****  Instantiation
-***/
-
-static void
-indicator_power_sound_player_gst_class_init (IndicatorPowerSoundPlayerGSTClass * klass)
-{
-  gst_init_once();
-}
-
-static void
-indicator_power_device_provider_interface_init (IndicatorPowerSoundPlayerInterface * iface)
-{
-  iface->play_uri = my_play_uri;
-}
-
-static void
-indicator_power_sound_player_gst_init (IndicatorPowerSoundPlayerGST * self G_GNUC_UNUSED)
-{
-}
-
-/***
-****  Public API
-***/
-
-IndicatorPowerSoundPlayer *
-indicator_power_sound_player_gst_new(void)
-{
-  gpointer o = g_object_new (INDICATOR_TYPE_POWER_SOUND_PLAYER_GST, NULL);
-
-  return INDICATOR_POWER_SOUND_PLAYER (o);
-}
diff --git a/src/sound-player-gst.h b/src/sound-player-gst.h
deleted file mode 100644
index 3075738..0000000
--- a/src/sound-player-gst.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * 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_SOUND_PLAYER_GST__H__
-#define __INDICATOR_POWER_SOUND_PLAYER_GST__H__
-
-#include <glib-object.h> /* parent class */
-
-#include "device-provider.h"
-
-G_BEGIN_DECLS
-
-#define INDICATOR_TYPE_POWER_SOUND_PLAYER_GST \
-  (indicator_power_sound_player_gst_get_type())
-
-#define INDICATOR_POWER_SOUND_PLAYER_GST(o) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((o), \
-                               INDICATOR_TYPE_POWER_SOUND_PLAYER_GST, \
-                               IndicatorPowerSoundPlayerGST))
-
-#define INDICATOR_POWER_SOUND_PLAYER_GST_GET_CLASS(o) \
- (G_TYPE_INSTANCE_GET_CLASS ((o), \
-                             INDICATOR_TYPE_POWER_SOUND_PLAYER_GST, \
-                             IndicatorPowerSoundPlayerGSTClass))
-
-#define INDICATOR_IS_POWER_SOUND_PLAYER_GST(o) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
-                               INDICATOR_TYPE_POWER_SOUND_PLAYER_GST))
-
-typedef struct _IndicatorPowerSoundPlayerGST
-                IndicatorPowerSoundPlayerGST;
-typedef struct _IndicatorPowerSoundPlayerGSTClass
-                IndicatorPowerSoundPlayerGSTClass;
-
-/**
- * An IndicatorPowerSoundPlayer which gets its devices from GST.
- */
-struct _IndicatorPowerSoundPlayerGST
-{
-  GObject parent_instance;
-};
-
-struct _IndicatorPowerSoundPlayerGSTClass
-{
-  GObjectClass parent_class;
-};
-
-GType indicator_power_sound_player_gst_get_type (void);
-
-IndicatorPowerSoundPlayer * indicator_power_sound_player_gst_new (void);
-
-G_END_DECLS
-
-#endif /* __INDICATOR_POWER_SOUND_PLAYER_GST__H__ */
diff --git a/src/sound-player.c b/src/sound-player.c
deleted file mode 100644
index dcbb27b..0000000
--- a/src/sound-player.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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 "sound-player.h"
-
-G_DEFINE_INTERFACE (IndicatorPowerSoundPlayer,
-                    indicator_power_sound_player,
-                    0)
-
-static void
-indicator_power_sound_player_default_init (IndicatorPowerSoundPlayerInterface * klass G_GNUC_UNUSED)
-{
-}
-
-/***
-****  PUBLIC API
-***/
-
-void
-indicator_power_sound_player_play_uri (IndicatorPowerSoundPlayer * self,
-                                       const gchar               * uri)
-{
-  IndicatorPowerSoundPlayerInterface * iface;
-
-  g_return_if_fail (INDICATOR_IS_POWER_SOUND_PLAYER (self));
-  iface = INDICATOR_POWER_SOUND_PLAYER_GET_INTERFACE (self);
-  g_return_if_fail (iface->play_uri != NULL);
-  iface->play_uri (self, uri);
-}
diff --git a/src/sound-player.h b/src/sound-player.h
deleted file mode 100644
index adff924..0000000
--- a/src/sound-player.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * 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_SOUND_PLAYER__H__
-#define __INDICATOR_POWER_SOUND_PLAYER__H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define INDICATOR_TYPE_POWER_SOUND_PLAYER \
-  (indicator_power_sound_player_get_type ())
-
-#define INDICATOR_POWER_SOUND_PLAYER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
-                               INDICATOR_TYPE_POWER_SOUND_PLAYER, \
-                               IndicatorPowerSoundPlayer))
-
-#define INDICATOR_IS_POWER_SOUND_PLAYER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INDICATOR_TYPE_POWER_SOUND_PLAYER))
-
-#define INDICATOR_POWER_SOUND_PLAYER_GET_INTERFACE(inst) \
-  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), \
-                                  INDICATOR_TYPE_POWER_SOUND_PLAYER, \
-                                  IndicatorPowerSoundPlayerInterface))
-
-typedef struct _IndicatorPowerSoundPlayer
-                IndicatorPowerSoundPlayer;
-
-typedef struct _IndicatorPowerSoundPlayerInterface
-                IndicatorPowerSoundPlayerInterface;
-
-/**
- * An interface class for an object that plays sounds.
- */
-struct _IndicatorPowerSoundPlayerInterface
-{
-  GTypeInterface parent_iface;
-
-  /* virtual functions */
-  void (*play_uri) (IndicatorPowerSoundPlayer * self,
-                    const gchar * uri);
-};
-
-GType indicator_power_sound_player_get_type (void);
-
-/***
-****
-***/
-
-void indicator_power_sound_player_play_uri (IndicatorPowerSoundPlayer * self,
-                                            const gchar * uri);
-
-G_END_DECLS
-
-#endif /* __INDICATOR_POWER_SOUND_PLAYER__H__ */
-- 
cgit v1.2.3


From 557e10a031b886dc670bdf5918c3984edbace5ac Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Mon, 1 Feb 2016 12:24:34 -0600
Subject: remove dead code

---
 src/notifier.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/notifier.c b/src/notifier.c
index 00a00e5..da5c5d5 100644
--- a/src/notifier.c
+++ b/src/notifier.c
@@ -311,7 +311,9 @@ 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)
-- 
cgit v1.2.3


From 39571b0e05c78627d233b2f77250de459d73f4a6 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Mon, 16 May 2016 12:59:03 -0500
Subject: fix cmake warning of the test apps' dependency on the service library

---
 src/CMakeLists.txt | 5 -----
 src/notifier.c     | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a5e6c57..bf85b77 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()
diff --git a/src/notifier.c b/src/notifier.c
index da5c5d5..d982ac2 100644
--- a/src/notifier.c
+++ b/src/notifier.c
@@ -489,7 +489,7 @@ indicator_power_notifier_init (IndicatorPowerNotifier * self)
 
   p->cancellable = g_cancellable_new();
 
-  if (!instance_count++ && !notify_init("ayatana-indicator-power-service"))
+  if (!instance_count++ && !notify_init(SERVICE_EXEC))
     g_critical("Unable to initialize libnotify! Notifications might not be shown.");
 
   #ifdef HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS
-- 
cgit v1.2.3


From 948a5107c479a72a2940316674fae6a3b55534ff Mon Sep 17 00:00:00 2001
From: Rodney <6557070+dobey@users.noreply.github.com>
Date: Sun, 28 Oct 2018 13:54:40 -0400
Subject: Pull in many fixes from the bionic branch. (#7)

* Pay attention to $SNAP prefix

* Releasing 12.10.6+17.04.20161201-0ubuntu1

* give sorting priority to devices with power supplies

* Releasing 12.10.6+17.04.20170116-0ubuntu1

* Remove old autostart files.

* Use gmock module from cmake-extras.

* Use coverage support from cmake-extras.

* Add gcovr and lcov dependencies.

* Use intltool support from cmake-extras.

* Remove usage of extra GCOV variables.

* Remove hard-coded -g compiler flag.

* Releasing 12.10.6+17.04.20170210-0ubuntu1

* no change rebuild

* Releasing 12.10.6+17.04.20170322-0ubuntu1

* Start indicator in systemd when indicators.target is started

* Build for bionic

* This is still xenial.

* Update translations from launchpad too.
---
 src/CMakeLists.txt |  2 +-
 src/service.c      | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bf85b77..b253d0a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -48,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/service.c b/src/service.c
index c04122f..9b99a05 100644
--- a/src/service.c
+++ b/src/service.c
@@ -163,12 +163,12 @@ get_device_kind_weight (const IndicatorPowerDevice * device)
 }
 
 /* sort devices from most interesting to least interesting on this criteria:
-   1. discharging items from least time remaining until most time remaining
-   2. charging items from most time left to charge to least time left to charge
-   3. charging items with an unknown time remaining
-   4. discharging items with an unknown time remaining, but 10% or below
-   5. batteries, then non-line power, then line-power
-   6. discharging items with an unknown time remaining, but above 10% */
+   1. device that supplied the power to the system
+   2. discharging items from least time remaining until most time remaining
+   3. charging items from most time left to charge to least time left to charge
+   4. charging items with an unknown time remaining
+   5. discharging items with an unknown time remaining
+   6. batteries, then non-line power, then line-power */
 static gint
 device_compare_func (gconstpointer ga, gconstpointer gb)
 {
@@ -600,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);
 
-- 
cgit v1.2.3


From 333a4273eb26ffc47b29f3ea8ce3213d36803894 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 16 Oct 2020 23:54:54 +0300
Subject: flashlight: Add support for simpler sysfs toggles (#34)

Unlike the overcomplicated Qualcomm mess, there are also simpler sysfs
toggles which you can just write 1/0 to when enabling/disabling the
flash.

This is used by the MediaTek flashlight_core driver on the Volla Phone
(Helio P23 / MT6763) for example, which this also adds support for. Pinephone
also uses a simple sysfs toggle for flashlight.
---
 src/flashlight.c | 70 ++++++++++++++++++++++++++++++++++++++++++++------------
 src/flashlight.h |  9 ++++++++
 2 files changed, 65 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/flashlight.c b/src/flashlight.c
index 55a108a..8aba2b5 100644
--- a/src/flashlight.c
+++ b/src/flashlight.c
@@ -26,6 +26,8 @@
 
 #define QCOM_ENABLE "255"
 #define QCOM_DISABLE "0"
+#define SIMPLE_ENABLE "1"
+#define SIMPLE_DISABLE "0"
 
 const size_t qcom_sysfs_size = 5;
 const char* const qcom_sysfs[] = {"/sys/class/leds/torch-light/brightness",
@@ -33,10 +35,14 @@ const char* const qcom_sysfs[] = {"/sys/class/leds/torch-light/brightness",
                                   "/sys/class/leds/flashlight/brightness",
                                   "/sys/class/leds/torch-light0/brightness",
                                   "/sys/class/leds/torch-light1/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;
+enum TorchType torch_type = SIMPLE;
 gboolean activated = 0;
 
 int
@@ -45,6 +51,13 @@ 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;
+        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,22 +70,12 @@ 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;
@@ -91,8 +94,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 */
-- 
cgit v1.2.3


From 2432f6b35d49b5f7f270a2408f26bbb658541a9d Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 3 Dec 2020 03:27:13 +0200
Subject: flashlight: Add support for PM8998 based SoCs

These sysfs and switch paths are used on Qualcomm SoCs which contain a
PM8998 PMIC block. This at the very least includes the Snapdragon 835
(MSM8998) and Snapdragon 845 (SDM845).

This was tested as working on the OnePlus 5 (MSM8998) and OnePlus 6
(SDM845) smartphones.
---
 src/flashlight.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/flashlight.c b/src/flashlight.c
index 8aba2b5..064bd31 100644
--- a/src/flashlight.c
+++ b/src/flashlight.c
@@ -29,19 +29,25 @@
 #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"};
-const char* qcom_torch_enable = "/sys/class/leds/led:switch/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 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;
 
@@ -52,6 +58,11 @@ set_sysfs_path()
     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;
     }
   }
@@ -78,9 +89,9 @@ toggle_flashlight_action_qcom()
 
   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");
-- 
cgit v1.2.3


From d5a53027e58b6153b86b6c4b832cfd393bcdefb0 Mon Sep 17 00:00:00 2001
From: Robert Tari <robert@tari.in>
Date: Tue, 27 Jul 2021 21:43:00 +0200
Subject: Rename com.canonical.powerd -> com.lomiri.Repowerd

---
 src/CMakeLists.txt           |  6 ++--
 src/brightness.c             | 28 +++++++--------
 src/com.canonical.powerd.xml | 84 --------------------------------------------
 src/com.lomiri.Repowerd.xml  | 84 ++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 101 insertions(+), 101 deletions(-)
 delete mode 100644 src/com.canonical.powerd.xml
 create mode 100644 src/com.lomiri.Repowerd.xml

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b253d0a..d6e3c7b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -19,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
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.canonical.powerd.xml
deleted file mode 100644
index b5b4ac4..0000000
--- a/src/com.canonical.powerd.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<node name="/">
-  <interface name="com.canonical.powerd">
-    <!-- Properties -->
-
-    <property name="brightness" type="i" access="readwrite">
-    </property>
-
-
-    <!-- Functions -->
-    <method name="requestSysState">
-      <arg type="s" name="name" direction="in" />
-      <arg type="i" name="state" direction="in" />
-      <arg type="s" name="cookie" direction="out" />
-    </method>
-
-    <method name="clearSysState">
-      <arg type="s" name="cookie" direction="in" />
-    </method>
-
-    <method name="requestWakeup">
-      <arg type="s" name="name" direction="in" />
-      <arg type="t" name="time" direction="in" />
-      <arg type="s" name="cookie" direction="out" />
-    </method>
-
-    <method name="enableProximityHandling">
-      <arg type="s" name="name" direction="in" />
-    </method>
-
-    <method name="disableProximityHandling">
-      <arg type="s" name="name" direction="in" />
-    </method>
-
-    <method name="clearWakeup">
-      <arg type="s" name="cookie" direction="in" />
-    </method>
-
-    <method name="registerClient">
-        <arg type="s" name="name" direction="in" />
-    </method>
-
-    <method name="unregisterClient">
-        <arg type="s" name="name" direction="in" />
-    </method>
-
-    <method name="ackStateChange">
-        <arg type="i" name="state" direction="in" />
-    </method>
-
-    <!-- User settings -->
-    <method name="userAutobrightnessEnable">
-        <arg type="b" name="enable" direction="in" />
-    </method>
-
-    <method name="getBrightnessParams">
-        <!-- Returns min, max, and default brighness and whether or not
-             autobrightness is supported, in that order -->
-        <arg type="(iiiib)" name="params" direction="out" />
-    </method>
-
-    <method name="setUserBrightness">
-        <arg type="i" name="brightness" direction="in" />
-    </method>
-
-    <!-- for debug/testing -->
-    <method name="listSysRequests">
-      <arg type="a(ssi)" name="requestList" direction="out" />
-    </method>
-
-    <method name="getSysRequestStats">
-      <arg type="a(ssuttt)" name="requestStats" direction="out" />
-    </method>
-
-    <!-- Signals -->
-    <signal name="SysPowerStateChange">
-      <arg type="i" name="sysState" direction="out" />
-    </signal>
-
-    <signal name="Wakeup">
-    </signal>
-
-  </interface>
-</node>
diff --git a/src/com.lomiri.Repowerd.xml b/src/com.lomiri.Repowerd.xml
new file mode 100644
index 0000000..377eeab
--- /dev/null
+++ b/src/com.lomiri.Repowerd.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
+  <interface name="com.lomiri.Repowerd">
+    <!-- Properties -->
+
+    <property name="brightness" type="i" access="readwrite">
+    </property>
+
+
+    <!-- Functions -->
+    <method name="requestSysState">
+      <arg type="s" name="name" direction="in" />
+      <arg type="i" name="state" direction="in" />
+      <arg type="s" name="cookie" direction="out" />
+    </method>
+
+    <method name="clearSysState">
+      <arg type="s" name="cookie" direction="in" />
+    </method>
+
+    <method name="requestWakeup">
+      <arg type="s" name="name" direction="in" />
+      <arg type="t" name="time" direction="in" />
+      <arg type="s" name="cookie" direction="out" />
+    </method>
+
+    <method name="enableProximityHandling">
+      <arg type="s" name="name" direction="in" />
+    </method>
+
+    <method name="disableProximityHandling">
+      <arg type="s" name="name" direction="in" />
+    </method>
+
+    <method name="clearWakeup">
+      <arg type="s" name="cookie" direction="in" />
+    </method>
+
+    <method name="registerClient">
+        <arg type="s" name="name" direction="in" />
+    </method>
+
+    <method name="unregisterClient">
+        <arg type="s" name="name" direction="in" />
+    </method>
+
+    <method name="ackStateChange">
+        <arg type="i" name="state" direction="in" />
+    </method>
+
+    <!-- User settings -->
+    <method name="userAutobrightnessEnable">
+        <arg type="b" name="enable" direction="in" />
+    </method>
+
+    <method name="getBrightnessParams">
+        <!-- Returns min, max, and default brighness and whether or not
+             autobrightness is supported, in that order -->
+        <arg type="(iiiib)" name="params" direction="out" />
+    </method>
+
+    <method name="setUserBrightness">
+        <arg type="i" name="brightness" direction="in" />
+    </method>
+
+    <!-- for debug/testing -->
+    <method name="listSysRequests">
+      <arg type="a(ssi)" name="requestList" direction="out" />
+    </method>
+
+    <method name="getSysRequestStats">
+      <arg type="a(ssuttt)" name="requestStats" direction="out" />
+    </method>
+
+    <!-- Signals -->
+    <signal name="SysPowerStateChange">
+      <arg type="i" name="sysState" direction="out" />
+    </signal>
+
+    <signal name="Wakeup">
+    </signal>
+
+  </interface>
+</node>
-- 
cgit v1.2.3