From 9660d0b5c1cee59d7b34e989fc2da19b67167619 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 10 Feb 2014 11:54:07 -0600
Subject: Trying to put together all our account service pieces

---
 ....canonical.indicator.sound.AccountsService.pkla |  6 ++++
 data/CMakeLists.txt                                | 32 ++++++++++++++++++++++
 ...anonical.indicator.sound.AccountsService.policy | 23 ++++++++++++++++
 ...m.canonical.indicator.sound.AccountsService.xml | 20 ++++++++++++++
 4 files changed, 81 insertions(+)
 create mode 100644 data/50-com.canonical.indicator.sound.AccountsService.pkla
 create mode 100644 data/com.canonical.indicator.sound.AccountsService.policy
 create mode 100644 data/com.canonical.indicator.sound.AccountsService.xml

(limited to 'data')

diff --git a/data/50-com.canonical.indicator.sound.AccountsService.pkla b/data/50-com.canonical.indicator.sound.AccountsService.pkla
new file mode 100644
index 0000000..bbcca1e
--- /dev/null
+++ b/data/50-com.canonical.indicator.sound.AccountsService.pkla
@@ -0,0 +1,6 @@
+[Allow LightDM to set Unity AccountsService fields]
+Identity=unix-user:lightdm
+Action=com.canonical.indicator.sound.AccountsService.ModifyAnyUser
+ResultActive=yes
+ResultInactive=yes
+ResultAny=yes
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 565e652..9694a9e 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -61,3 +61,35 @@ install(
 ###########################
 
 add_schema ("com.canonical.indicator.sound.gschema.xml")
+
+###########################
+# Accounts Service
+###########################
+
+
+set(POLKIT_LIB_DIR "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/polkit-1")
+set(POLKIT_DATA_DIR "${CMAKE_INSTALL_PREFIX}/share/polkit-1")
+set(DBUS_IFACE_DIR "${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces")
+set(ACCOUNTS_IFACE_DIR "${CMAKE_INSTALL_PREFIX}/share/accountsservice/interfaces")
+
+install(FILES com.canonical.indicator.sound.AccountsService.xml
+	DESTINATION "${DBUS_IFACE_DIR}"
+)
+
+# Create accountsservice symlink for above dbus interface
+install(CODE "
+	execute_process(COMMAND mkdir -p \"\$ENV{DESTDIR}${ACCOUNTS_IFACE_DIR}\")
+	execute_process(COMMAND ln -sf ../../dbus-1/interfaces/com.canonical.indicator.sound.AccountsService.xml \"\$ENV{DESTDIR}${ACCOUNTS_IFACE_DIR}\")
+")
+
+install(FILES com.canonical.indicator.sound.AccountsService.policy
+DESTINATION "${POLKIT_DATA_DIR}/actions"
+)
+
+install(FILES 50-com.canonical.indicator.sound.AccountsService.pkla
+DESTINATION "${POLKIT_LIB_DIR}/localauthority/10-vendor.d"
+)
+
+
+
+
diff --git a/data/com.canonical.indicator.sound.AccountsService.policy b/data/com.canonical.indicator.sound.AccountsService.policy
new file mode 100644
index 0000000..4d0ee75
--- /dev/null
+++ b/data/com.canonical.indicator.sound.AccountsService.policy
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<policyconfig>
+        <action id="com.canonical.indicator.sound.AccountsService.ModifyOwnUser">
+                <description>Set properties of own user</description>
+                <message>Authentication is required to set one's own indicator sound properties.</message>
+                <defaults>
+                        <allow_any>yes</allow_any>
+                        <allow_inactive>yes</allow_inactive>
+                        <allow_active>yes</allow_active>
+                </defaults>
+        </action>
+
+        <action id="com.canonical.indicator.sound.AccountsService.ModifyAnyUser">
+                <description>Set properties of any user</description>
+                <message>Authentication is required to set another user's indicator sound properties.</message>
+                <defaults>
+                        <allow_any>no</allow_any>
+                        <allow_inactive>no</allow_inactive>
+                        <allow_active>no</allow_active>
+                </defaults>
+        </action>
+</policyconfig>
diff --git a/data/com.canonical.indicator.sound.AccountsService.xml b/data/com.canonical.indicator.sound.AccountsService.xml
new file mode 100644
index 0000000..bb73efd
--- /dev/null
+++ b/data/com.canonical.indicator.sound.AccountsService.xml
@@ -0,0 +1,20 @@
+<node>
+  <interface name="com.canonical.indicator.sound.AccountsService">
+
+    <annotation name="org.freedesktop.Accounts.VendorExtension" value="true"/>
+
+    <annotation name="org.freedesktop.Accounts.Authentication.ChangeOwn"
+                value="com.canonical.indicator.sound.AccountsService.ModifyOwnUser"/>
+
+    <annotation name="org.freedesktop.Accounts.Authentication.ReadAny"
+                value="com.canonical.indicator.sound.AccountsService.ModifyAnyUser"/>
+
+    <annotation name="org.freedesktop.Accounts.Authentication.ChangeAny"
+                value="com.canonical.indicator.sound.AccountsService.ModifyAnyUser"/>
+
+    <property name="playing" type="b" access="readwrite">
+      <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
+    </property>
+
+  </interface>
+</node>
-- 
cgit v1.2.3


From 28e3a8eff7e1305c93c5c7b8283bb7aedfce56b2 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 11 Feb 2014 17:33:42 -0600
Subject: All the properties we need

---
 ...m.canonical.indicator.sound.AccountsService.xml | 23 ++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

(limited to 'data')

diff --git a/data/com.canonical.indicator.sound.AccountsService.xml b/data/com.canonical.indicator.sound.AccountsService.xml
index bb73efd..1651a43 100644
--- a/data/com.canonical.indicator.sound.AccountsService.xml
+++ b/data/com.canonical.indicator.sound.AccountsService.xml
@@ -12,8 +12,27 @@
     <annotation name="org.freedesktop.Accounts.Authentication.ChangeAny"
                 value="com.canonical.indicator.sound.AccountsService.ModifyAnyUser"/>
 
-    <property name="playing" type="b" access="readwrite">
-      <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
+    <property name="PlayerName" type="s" access="readwrite">
+      <annotation name="org.freedesktop.Accounts.DefaultValue" value=""/>
+    </property>
+    <property name="PlayerIcon" type="v" access="readwrite"/>
+    <property name="Running" type="b" access="readwrite">
+      <annotation name="org.freedesktop.Accounts.DefaultValue" value="false"/>
+    </property>
+    <property name="State" type="s" access="readwrite">
+      <annotation name="org.freedesktop.Accounts.DefaultValue" value=""/>
+    </property>
+    <property name="Title" type="s" access="readwrite">
+      <annotation name="org.freedesktop.Accounts.DefaultValue" value=""/>
+    </property>
+    <property name="Artist" type="s" access="readwrite">
+      <annotation name="org.freedesktop.Accounts.DefaultValue" value=""/>
+    </property>
+    <property name="Album" type="s" access="readwrite">
+      <annotation name="org.freedesktop.Accounts.DefaultValue" value=""/>
+    </property>
+    <property name="ArtUrl" type="s" access="readwrite">
+      <annotation name="org.freedesktop.Accounts.DefaultValue" value=""/>
     </property>
 
   </interface>
-- 
cgit v1.2.3


From 6974a81bd969f97fb685ea021af4d1406fa13679 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 21 Feb 2014 12:11:02 -0600
Subject: Make sure to timestamp our updates

---
 data/com.canonical.indicator.sound.AccountsService.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'data')

diff --git a/data/com.canonical.indicator.sound.AccountsService.xml b/data/com.canonical.indicator.sound.AccountsService.xml
index 1651a43..fb7e96f 100644
--- a/data/com.canonical.indicator.sound.AccountsService.xml
+++ b/data/com.canonical.indicator.sound.AccountsService.xml
@@ -12,6 +12,9 @@
     <annotation name="org.freedesktop.Accounts.Authentication.ChangeAny"
                 value="com.canonical.indicator.sound.AccountsService.ModifyAnyUser"/>
 
+    <property name="Timestamp" type="t" access="readwrite">
+      <annotation name="org.freedesktop.Accounts.DefaultValue" value="0"/>
+    </property>
     <property name="PlayerName" type="s" access="readwrite">
       <annotation name="org.freedesktop.Accounts.DefaultValue" value=""/>
     </property>
-- 
cgit v1.2.3


From bef0abe544ecbb9e020b7d9f99255acefa5073ed Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 19 Mar 2014 16:00:43 -0500
Subject: Adding a setting for greeter exporting

---
 data/com.canonical.indicator.sound.gschema.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'data')

diff --git a/data/com.canonical.indicator.sound.gschema.xml b/data/com.canonical.indicator.sound.gschema.xml
index 102a1db..c34dfd6 100644
--- a/data/com.canonical.indicator.sound.gschema.xml
+++ b/data/com.canonical.indicator.sound.gschema.xml
@@ -48,5 +48,14 @@
         Whether or not to show the sound indicator in the menu bar.
       </description>
     </key>
+    <key name="greeter-export" type="b">
+      <default>true</default>
+      <summary>Whether or not to export the currently playing song to the greeter.</summary>
+      <description>
+        If enabled the sound indicator will export the current player and
+        song to the greeter so that it can be shown if the user is selected
+        and the sound menu is shown.
+      </description>
+    </key>
   </schema>
 </schemalist>
-- 
cgit v1.2.3