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 +-
 debian/control                                    | 2 +-
 service/service.c                                 | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

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}
diff --git a/debian/control b/debian/control
index ed12280..1b2bada 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Vcs-Browser: https://code.launchpad.net/~indicator-applet-developers/unity-greet
 Package: unity-greeter-session-broadcast
 Architecture: any
 Depends: upstart (>= 1.10-0ubuntu2),
-         upstart-app-launch,
+         url-dispatcher-tools,
          ${misc:Depends},
          ${shlibs:Depends},
 Description: Service to allow the greeter to communicate to sessions
diff --git a/service/service.c b/service/service.c
index 425e8ac..7585326 100644
--- a/service/service.c
+++ b/service/service.c
@@ -23,12 +23,12 @@ static gboolean
 on_handle_request_application_start (ServiceIfaceComCanonicalUnityGreeterBroadcast *object,
                                      GDBusMethodInvocation *invocation,
                                      const gchar *arg_username,
-                                     const gchar *arg_appId)
+                                     const gchar *arg_url)
 {
     /* Simply pass the request on */
     service_iface_com_canonical_unity_greeter_broadcast_emit_start_application (object,
                                                                                 arg_username,
-                                                                                arg_appId);
+                                                                                arg_url);
     service_iface_com_canonical_unity_greeter_broadcast_complete_request_application_start (object,
                                                                                             invocation);
     return TRUE;
-- 
cgit v1.2.3