From b1800fd11ab5297585e0c2beb12b7fc058430bc1 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Sun, 22 Oct 2017 21:26:00 +0200
Subject: Fork from unity-greeter-session-broadcast.

---
 data/CMakeLists.txt                                | 14 +++---
 .../ayatana-greeter-session-broadcast-session.conf | 31 ++++++++++++++
 data/com.canonical.Unity.Greeter.Broadcast.conf    | 21 ---------
 ...m.canonical.Unity.Greeter.Broadcast.gschema.xml | 13 ------
 ...om.canonical.Unity.Greeter.Broadcast.service.in |  4 --
 data/com.canonical.Unity.Greeter.Broadcast.xml     | 50 ----------------------
 data/org.ayatana.Desktop.Greeter.Broadcast.conf    | 21 +++++++++
 ...g.ayatana.Desktop.Greeter.Broadcast.gschema.xml | 13 ++++++
 ...rg.ayatana.Desktop.Greeter.Broadcast.service.in |  4 ++
 data/org.ayatana.Desktop.Greeter.Broadcast.xml     | 50 ++++++++++++++++++++++
 data/unity-greeter-session-broadcast-session.conf  | 31 --------------
 11 files changed, 126 insertions(+), 126 deletions(-)
 create mode 100644 data/ayatana-greeter-session-broadcast-session.conf
 delete mode 100644 data/com.canonical.Unity.Greeter.Broadcast.conf
 delete mode 100644 data/com.canonical.Unity.Greeter.Broadcast.gschema.xml
 delete mode 100644 data/com.canonical.Unity.Greeter.Broadcast.service.in
 delete mode 100644 data/com.canonical.Unity.Greeter.Broadcast.xml
 create mode 100644 data/org.ayatana.Desktop.Greeter.Broadcast.conf
 create mode 100644 data/org.ayatana.Desktop.Greeter.Broadcast.gschema.xml
 create mode 100644 data/org.ayatana.Desktop.Greeter.Broadcast.service.in
 create mode 100644 data/org.ayatana.Desktop.Greeter.Broadcast.xml
 delete mode 100644 data/unity-greeter-session-broadcast-session.conf

(limited to 'data')

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index d00c9ef..33bae7f 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -5,7 +5,7 @@
 
 install(
 FILES
-com.canonical.Unity.Greeter.Broadcast.xml
+org.ayatana.Desktop.Greeter.Broadcast.xml
 DESTINATION ${DBUSIFACEDIR}
 )
 
@@ -15,7 +15,7 @@ DESTINATION ${DBUSIFACEDIR}
 
 install(
 FILES
-com.canonical.Unity.Greeter.Broadcast.conf
+org.ayatana.Desktop.Greeter.Broadcast.conf
 DESTINATION ${DBUSSYSCONFDIR}/dbus-1/system.d
 )
 
@@ -24,11 +24,11 @@ DESTINATION ${DBUSSYSCONFDIR}/dbus-1/system.d
 ###########################
 
 set(BROADCAST_SERVICE
-"${CMAKE_CURRENT_BINARY_DIR}/com.canonical.Unity.Greeter.Broadcast.service"
+"${CMAKE_CURRENT_BINARY_DIR}/org.ayatana.Desktop.Greeter.Broadcast.service"
 )
 
-set(pkglibexecdir "${CMAKE_INSTALL_FULL_LIBEXECDIR}/unity-greeter-session-broadcast")
-configure_file("com.canonical.Unity.Greeter.Broadcast.service.in"
+set(pkglibexecdir "${CMAKE_INSTALL_FULL_LIBEXECDIR}/ayatana-greeter-session-broadcast")
+configure_file("org.ayatana.Desktop.Greeter.Broadcast.service.in"
   "${BROADCAST_SERVICE}"
   @ONLY
 )
@@ -44,7 +44,7 @@ DESTINATION ${DBUSSERVICEDIR}
 ###########################
 
 set(SESSION_UPSTART
-"${CMAKE_CURRENT_SOURCE_DIR}/unity-greeter-session-broadcast-session.conf"
+"${CMAKE_CURRENT_SOURCE_DIR}/ayatana-greeter-session-broadcast-session.conf"
 )
 
 install(
@@ -57,4 +57,4 @@ DESTINATION "/usr/share/upstart/sessions"
 # GSettings
 ###########################
 
-add_schema ("com.canonical.Unity.Greeter.Broadcast.gschema.xml")
+add_schema ("org.ayatana.Desktop.Greeter.Broadcast.gschema.xml")
diff --git a/data/ayatana-greeter-session-broadcast-session.conf b/data/ayatana-greeter-session-broadcast-session.conf
new file mode 100644
index 0000000..db4257c
--- /dev/null
+++ b/data/ayatana-greeter-session-broadcast-session.conf
@@ -0,0 +1,31 @@
+description "Desktop Greeter Session Broadcast Session Component"
+author "Ted Gould <ted@canonical.com>"
+
+task
+
+#TODO: Check GSettings Key
+start on dbus BUS=system SIGNAL="StartUrl" INTERFACE="org.ayatana.Desktop.Greeter.Broadcast" OBJPATH="/org/ayatana/Desktop/Greeter/Broadcast"
+
+pre-start script
+	if [ -z $ARG0 ] ; then
+		stop
+		exit 1
+	fi
+	if [ $ARG0 != $USER ] ; then
+		stop
+		exit 1
+	fi
+
+	OWNER=`gdbus call --system --dest org.freedesktop.DBus --object-path / --method org.freedesktop.DBus.GetNameOwner org.ayatana.Desktop.Greeter.Broadcast | cut -d "'" -f 2`
+
+	if [ -z $OWNER ] ; then
+		stop
+		exit 1
+	fi
+	if [ $OWNER != $SENDER ] ; then
+		stop
+		exit 1
+	fi
+end script
+
+exec url-dispatcher ${ARG1}
diff --git a/data/com.canonical.Unity.Greeter.Broadcast.conf b/data/com.canonical.Unity.Greeter.Broadcast.conf
deleted file mode 100644
index 8a8cfe6..0000000
--- a/data/com.canonical.Unity.Greeter.Broadcast.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- ../system.conf have denied everything, so we just punch some holes -->
-
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-
-  <policy user="root">
-    <allow own="com.canonical.Unity.Greeter.Broadcast"/>
-    <allow send_destination="com.canonical.Unity.Greeter.Broadcast"/>
-  </policy>
-
-  <policy user="lightdm">
-    <allow send_destination="com.canonical.Unity.Greeter.Broadcast"/>
-  </policy>
-
-  <policy context="default">
-    <allow send_destination="com.canonical.Unity.Greeter.Broadcast"
-           send_interface="org.freedesktop.DBus.Introspectable"/>
-  </policy>
-
-</busconfig>
diff --git a/data/com.canonical.Unity.Greeter.Broadcast.gschema.xml b/data/com.canonical.Unity.Greeter.Broadcast.gschema.xml
deleted file mode 100644
index f9fbf22..0000000
--- a/data/com.canonical.Unity.Greeter.Broadcast.gschema.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<schemalist>
-	<schema id="com.canonical.Unity.Greeter.Broadcast" path="/com/canonical/Unity/Greeter/Broadcast/" gettext-domain="unity-greeter-session-broadcast">
-		<key name="allow-start-url" type="b">
-			<summary>Allow the Greeter to start URLs in this session</summary>
-			<description>
-				The key controls whether the service in the session will listen
-				for and react to the request from the greeter to start an url
-				from the greeter.
-			</description>
-			<default>true</default>
-		</key>
-	</schema>
-</schemalist>
diff --git a/data/com.canonical.Unity.Greeter.Broadcast.service.in b/data/com.canonical.Unity.Greeter.Broadcast.service.in
deleted file mode 100644
index 9cfe989..0000000
--- a/data/com.canonical.Unity.Greeter.Broadcast.service.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=com.canonical.Unity.Greeter.Broadcast
-Exec=@pkglibexecdir@/unity-greeter-session-broadcast-service
-User=root
diff --git a/data/com.canonical.Unity.Greeter.Broadcast.xml b/data/com.canonical.Unity.Greeter.Broadcast.xml
deleted file mode 100644
index 5a4276a..0000000
--- a/data/com.canonical.Unity.Greeter.Broadcast.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<node>
-	<interface name="com.canonical.Unity.Greeter.Broadcast">
-		<!-- From the Greeter -->
-		<method name="RequestUrlStart">
-			<arg type="s" name="username" direction="in" />
-			<arg type="s" name="url" direction="in" />
-		</method>
-
-		<method name="RequestHomeShown">
-			<arg type="s" name="username" direction="in" />
-		</method>
-
-		<method name="RequestSoundPlayPause">
-			<arg type="s" name="username" direction="in" />
-		</method>
-
-		<method name="RequestSoundNext">
-			<arg type="s" name="username" direction="in" />
-		</method>
-
-		<method name="RequestSoundPrev">
-			<arg type="s" name="username" direction="in" />
-		</method>
-
-		<!-- To the Session -->
-		<signal name="StartUrl">
-			<arg type="s" name="username" direction="out" />
-			<arg type="s" name="url" direction="out" />
-		</signal>
-
-		<signal name="ShowHome">
-			<arg type="s" name="username" direction="out" />
-		</signal>
-
-		<signal name="SoundPlayPause">
-			<arg type="s" name="username" direction="out" />
-		</signal>
-
-		<signal name="SoundNext">
-			<arg type="s" name="username" direction="out" />
-		</signal>
-
-		<signal name="SoundPrev">
-			<arg type="s" name="username" direction="out" />
-		</signal>
-
-		<!-- Other -->
-	</interface>
-</node>
diff --git a/data/org.ayatana.Desktop.Greeter.Broadcast.conf b/data/org.ayatana.Desktop.Greeter.Broadcast.conf
new file mode 100644
index 0000000..3e42f6b
--- /dev/null
+++ b/data/org.ayatana.Desktop.Greeter.Broadcast.conf
@@ -0,0 +1,21 @@
+<!-- ../system.conf have denied everything, so we just punch some holes -->
+
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+  <policy user="root">
+    <allow own="org.ayatana.Desktop.Greeter.Broadcast"/>
+    <allow send_destination="org.ayatana.Desktop.Greeter.Broadcast"/>
+  </policy>
+
+  <policy user="lightdm">
+    <allow send_destination="org.ayatana.Desktop.Greeter.Broadcast"/>
+  </policy>
+
+  <policy context="default">
+    <allow send_destination="org.ayatana.Desktop.Greeter.Broadcast"
+           send_interface="org.freedesktop.DBus.Introspectable"/>
+  </policy>
+
+</busconfig>
diff --git a/data/org.ayatana.Desktop.Greeter.Broadcast.gschema.xml b/data/org.ayatana.Desktop.Greeter.Broadcast.gschema.xml
new file mode 100644
index 0000000..2ea105d
--- /dev/null
+++ b/data/org.ayatana.Desktop.Greeter.Broadcast.gschema.xml
@@ -0,0 +1,13 @@
+<schemalist>
+	<schema id="org.ayatana.Desktop.Greeter.Broadcast" path="/org/ayatana/Desktop/Greeter/Broadcast/" gettext-domain="ayatana-greeter-session-broadcast">
+		<key name="allow-start-url" type="b">
+			<summary>Allow the Greeter to start URLs in this session</summary>
+			<description>
+				The key controls whether the service in the session will listen
+				for and react to the request from the greeter to start an url
+				from the greeter.
+			</description>
+			<default>true</default>
+		</key>
+	</schema>
+</schemalist>
diff --git a/data/org.ayatana.Desktop.Greeter.Broadcast.service.in b/data/org.ayatana.Desktop.Greeter.Broadcast.service.in
new file mode 100644
index 0000000..9ba7a60
--- /dev/null
+++ b/data/org.ayatana.Desktop.Greeter.Broadcast.service.in
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.ayatana.Desktop.Greeter.Broadcast
+Exec=@pkglibexecdir@/ayatana-greeter-session-broadcast-service
+User=root
diff --git a/data/org.ayatana.Desktop.Greeter.Broadcast.xml b/data/org.ayatana.Desktop.Greeter.Broadcast.xml
new file mode 100644
index 0000000..af9393a
--- /dev/null
+++ b/data/org.ayatana.Desktop.Greeter.Broadcast.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<node>
+	<interface name="org.ayatana.Desktop.Greeter.Broadcast">
+		<!-- From the Greeter -->
+		<method name="RequestUrlStart">
+			<arg type="s" name="username" direction="in" />
+			<arg type="s" name="url" direction="in" />
+		</method>
+
+		<method name="RequestHomeShown">
+			<arg type="s" name="username" direction="in" />
+		</method>
+
+		<method name="RequestSoundPlayPause">
+			<arg type="s" name="username" direction="in" />
+		</method>
+
+		<method name="RequestSoundNext">
+			<arg type="s" name="username" direction="in" />
+		</method>
+
+		<method name="RequestSoundPrev">
+			<arg type="s" name="username" direction="in" />
+		</method>
+
+		<!-- To the Session -->
+		<signal name="StartUrl">
+			<arg type="s" name="username" direction="out" />
+			<arg type="s" name="url" direction="out" />
+		</signal>
+
+		<signal name="ShowHome">
+			<arg type="s" name="username" direction="out" />
+		</signal>
+
+		<signal name="SoundPlayPause">
+			<arg type="s" name="username" direction="out" />
+		</signal>
+
+		<signal name="SoundNext">
+			<arg type="s" name="username" direction="out" />
+		</signal>
+
+		<signal name="SoundPrev">
+			<arg type="s" name="username" direction="out" />
+		</signal>
+
+		<!-- Other -->
+	</interface>
+</node>
diff --git a/data/unity-greeter-session-broadcast-session.conf b/data/unity-greeter-session-broadcast-session.conf
deleted file mode 100644
index 7f45187..0000000
--- a/data/unity-greeter-session-broadcast-session.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-description "Unity Greeter Session Broadcast Session Component"
-author "Ted Gould <ted@canonical.com>"
-
-task
-
-#TODO: Check GSettings Key
-start on dbus BUS=system SIGNAL="StartUrl" INTERFACE="com.canonical.Unity.Greeter.Broadcast" OBJPATH="/com/canonical/Unity/Greeter/Broadcast"
-
-pre-start script
-	if [ -z $ARG0 ] ; then
-		stop
-		exit 1
-	fi
-	if [ $ARG0 != $USER ] ; then
-		stop
-		exit 1
-	fi
-
-	OWNER=`gdbus call --system --dest org.freedesktop.DBus --object-path / --method org.freedesktop.DBus.GetNameOwner com.canonical.Unity.Greeter.Broadcast | cut -d "'" -f 2`
-
-	if [ -z $OWNER ] ; then
-		stop
-		exit 1
-	fi
-	if [ $OWNER != $SENDER ] ; then
-		stop
-		exit 1
-	fi
-end script
-
-exec url-dispatcher ${ARG1}
-- 
cgit v1.2.3