From fc939ab00cca71db88398900e1f80bc59aa9064d Mon Sep 17 00:00:00 2001
From: Michael Terry <michael.terry@canonical.com>
Date: Wed, 19 Mar 2014 16:43:13 -0400
Subject: Switch to using urls instead of appids

---
 data/com.canonical.Unity.Greeter.Broadcast.xml    | 4 ++--
 data/unity-greeter-session-broadcast-session.conf | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'data')

diff --git a/data/com.canonical.Unity.Greeter.Broadcast.xml b/data/com.canonical.Unity.Greeter.Broadcast.xml
index 5d29ca5..8bcaf7e 100644
--- a/data/com.canonical.Unity.Greeter.Broadcast.xml
+++ b/data/com.canonical.Unity.Greeter.Broadcast.xml
@@ -4,7 +4,7 @@
 		<!-- From the Greeter -->
 		<method name="RequestApplicationStart">
 			<arg type="s" name="username" direction="in" />
-			<arg type="s" name="appId" direction="in" />
+			<arg type="s" name="url" direction="in" />
 		</method>
 
 		<method name="RequestHomeShown">
@@ -14,7 +14,7 @@
 		<!-- To the Session -->
 		<signal name="StartApplication">
 			<arg type="s" name="username" direction="out" />
-			<arg type="s" name="appId" direction="out" />
+			<arg type="s" name="url" direction="out" />
 		</signal>
 
 		<signal name="ShowHome">
diff --git a/data/unity-greeter-session-broadcast-session.conf b/data/unity-greeter-session-broadcast-session.conf
index 675bbc2..cf66d2d 100644
--- a/data/unity-greeter-session-broadcast-session.conf
+++ b/data/unity-greeter-session-broadcast-session.conf
@@ -30,4 +30,4 @@ pre-start script
 	fi
 end script
 
-exec initctl emit application-start APP_ID=${ARG1}
+exec url-dispatcher ${ARG1}
-- 
cgit v1.2.3


From d04b5637fa83495d6ab2640cba7c6efd996e10f9 Mon Sep 17 00:00:00 2001
From: Michael Terry <michael.terry@canonical.com>
Date: Wed, 19 Mar 2014 17:06:10 -0400
Subject: Rename application to url

---
 data/com.canonical.Unity.Greeter.Broadcast.gschema.xml | 6 +++---
 data/com.canonical.Unity.Greeter.Broadcast.xml         | 4 ++--
 data/unity-greeter-session-broadcast-session.conf      | 4 +---
 3 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'data')

diff --git a/data/com.canonical.Unity.Greeter.Broadcast.gschema.xml b/data/com.canonical.Unity.Greeter.Broadcast.gschema.xml
index 4799d68..f9fbf22 100644
--- a/data/com.canonical.Unity.Greeter.Broadcast.gschema.xml
+++ b/data/com.canonical.Unity.Greeter.Broadcast.gschema.xml
@@ -1,10 +1,10 @@
 <schemalist>
 	<schema id="com.canonical.Unity.Greeter.Broadcast" path="/com/canonical/Unity/Greeter/Broadcast/" gettext-domain="unity-greeter-session-broadcast">
-		<key name="allow-start-application" type="b">
-			<summary>Allow the Greeter to start applications in this session</summary>
+		<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 application
+				for and react to the request from the greeter to start an url
 				from the greeter.
 			</description>
 			<default>true</default>
diff --git a/data/com.canonical.Unity.Greeter.Broadcast.xml b/data/com.canonical.Unity.Greeter.Broadcast.xml
index 8bcaf7e..020505e 100644
--- a/data/com.canonical.Unity.Greeter.Broadcast.xml
+++ b/data/com.canonical.Unity.Greeter.Broadcast.xml
@@ -2,7 +2,7 @@
 <node>
 	<interface name="com.canonical.Unity.Greeter.Broadcast">
 		<!-- From the Greeter -->
-		<method name="RequestApplicationStart">
+		<method name="RequestUrlStart">
 			<arg type="s" name="username" direction="in" />
 			<arg type="s" name="url" direction="in" />
 		</method>
@@ -12,7 +12,7 @@
 		</method>
 
 		<!-- To the Session -->
-		<signal name="StartApplication">
+		<signal name="StartUrl">
 			<arg type="s" name="username" direction="out" />
 			<arg type="s" name="url" direction="out" />
 		</signal>
diff --git a/data/unity-greeter-session-broadcast-session.conf b/data/unity-greeter-session-broadcast-session.conf
index cf66d2d..7f45187 100644
--- a/data/unity-greeter-session-broadcast-session.conf
+++ b/data/unity-greeter-session-broadcast-session.conf
@@ -3,10 +3,8 @@ author "Ted Gould <ted@canonical.com>"
 
 task
 
-emits application-start
-
 #TODO: Check GSettings Key
-start on dbus BUS=system SIGNAL="StartApplication" INTERFACE="com.canonical.Unity.Greeter.Broadcast" OBJPATH="/com/canonical/Unity/Greeter/Broadcast"
+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
-- 
cgit v1.2.3