From fc939ab00cca71db88398900e1f80bc59aa9064d Mon Sep 17 00:00:00 2001 From: Michael Terry 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 @@ - + @@ -14,7 +14,7 @@ - + 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 From d04b5637fa83495d6ab2640cba7c6efd996e10f9 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Wed, 19 Mar 2014 17:06:10 -0400 Subject: Rename application to url --- ...m.canonical.Unity.Greeter.Broadcast.gschema.xml | 6 +++--- data/com.canonical.Unity.Greeter.Broadcast.xml | 4 ++-- data/unity-greeter-session-broadcast-session.conf | 4 +--- service/service.c | 22 +++++++++++----------- test-call.sh | 2 +- 5 files changed, 18 insertions(+), 20 deletions(-) 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 @@ - - Allow the Greeter to start applications in this session + + Allow the Greeter to start URLs in this session 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. true 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 @@ - + @@ -12,7 +12,7 @@ - + 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 " 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 diff --git a/service/service.c b/service/service.c index 7585326..bec6d9c 100644 --- a/service/service.c +++ b/service/service.c @@ -20,17 +20,17 @@ #include "service-iface.h" static gboolean -on_handle_request_application_start (ServiceIfaceComCanonicalUnityGreeterBroadcast *object, - GDBusMethodInvocation *invocation, - const gchar *arg_username, - const gchar *arg_url) +on_handle_request_url_start (ServiceIfaceComCanonicalUnityGreeterBroadcast *object, + GDBusMethodInvocation *invocation, + const gchar *arg_username, + const gchar *arg_url) { /* Simply pass the request on */ - service_iface_com_canonical_unity_greeter_broadcast_emit_start_application (object, - arg_username, - arg_url); - service_iface_com_canonical_unity_greeter_broadcast_complete_request_application_start (object, - invocation); + service_iface_com_canonical_unity_greeter_broadcast_emit_start_url (object, + arg_username, + arg_url); + service_iface_com_canonical_unity_greeter_broadcast_complete_request_url_start (object, + invocation); return TRUE; } @@ -84,8 +84,8 @@ main (int argc, char * argv[]) interface = service_iface_com_canonical_unity_greeter_broadcast_skeleton_new (); g_signal_connect (interface, - "handle-request-application-start", - G_CALLBACK (on_handle_request_application_start), + "handle-request-url-start", + G_CALLBACK (on_handle_request_url_start), NULL); g_signal_connect (interface, "handle-request-home-shown", diff --git a/test-call.sh b/test-call.sh index bc1ffac..5ad9b9e 100755 --- a/test-call.sh +++ b/test-call.sh @@ -1,3 +1,3 @@ #!/bin/bash -gdbus call --system --dest com.canonical.Unity.Greeter.Broadcast --object-path /com/canonical/Unity/Greeter/Broadcast --method com.canonical.Unity.Greeter.Broadcast.RequestApplicationStart $1 $2 +gdbus call --system --dest com.canonical.Unity.Greeter.Broadcast --object-path /com/canonical/Unity/Greeter/Broadcast --method com.canonical.Unity.Greeter.Broadcast.RequestUrlStart $1 $2 -- cgit v1.2.3