diff options
| author | Michael Terry <michael.terry@canonical.com> | 2014-03-24 14:57:36 +0000 |
|---|---|---|
| committer | CI bot <ps-jenkins@lists.canonical.com> | 2014-03-24 14:57:36 +0000 |
| commit | 8cb0407fa3b9951dd0e11bed900d9d07f2f7850b (patch) | |
| tree | 59ec5c36f6e05d4685b22b6afbc544e990ee0dff /data | |
| parent | 4999139dbd3c18121c4cd4047acc184a752de903 (diff) | |
| parent | d04b5637fa83495d6ab2640cba7c6efd996e10f9 (diff) | |
| download | ayatana-greeter-session-broadcast-8cb0407fa3b9951dd0e11bed900d9d07f2f7850b.tar.gz ayatana-greeter-session-broadcast-8cb0407fa3b9951dd0e11bed900d9d07f2f7850b.tar.bz2 ayatana-greeter-session-broadcast-8cb0407fa3b9951dd0e11bed900d9d07f2f7850b.zip | |
Switch to handling URLs instead of AppIDs.
Diffstat (limited to 'data')
| -rw-r--r-- | data/com.canonical.Unity.Greeter.Broadcast.gschema.xml | 6 | ||||
| -rw-r--r-- | data/com.canonical.Unity.Greeter.Broadcast.xml | 8 | ||||
| -rw-r--r-- | data/unity-greeter-session-broadcast-session.conf | 6 |
3 files changed, 9 insertions, 11 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 @@ <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 af08286..5a4276a 100644 --- a/data/com.canonical.Unity.Greeter.Broadcast.xml +++ b/data/com.canonical.Unity.Greeter.Broadcast.xml @@ -2,9 +2,9 @@ <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="appId" direction="in" /> + <arg type="s" name="url" direction="in" /> </method> <method name="RequestHomeShown"> @@ -24,9 +24,9 @@ </method> <!-- To the Session --> - <signal name="StartApplication"> + <signal name="StartUrl"> <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..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 @@ -30,4 +28,4 @@ pre-start script fi end script -exec initctl emit application-start APP_ID=${ARG1} +exec url-dispatcher ${ARG1} |