aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2012-08-28 07:42:52 +0000
committerTarmac <Unknown>2012-08-28 07:42:52 +0000
commit3a9918c02006140736b2e00caa1c965d26de83ca (patch)
tree89b0512876155801735283f0bb51e7ca4cf882e4
parent5b3a472412242d1fe7f55d8a4031937eb319b5f0 (diff)
parent1ec06df4d2f3cfc29be380926b8a80944e727b48 (diff)
downloadlightdm-remote-session-remoteconfigure-3a9918c02006140736b2e00caa1c965d26de83ca.tar.gz
lightdm-remote-session-remoteconfigure-3a9918c02006140736b2e00caa1c965d26de83ca.tar.bz2
lightdm-remote-session-remoteconfigure-3a9918c02006140736b2e00caa1c965d26de83ca.zip
If Firefox closes log out of the session.. Approved by Albert Astals Cid, jenkins.
-rw-r--r--.bzrignore1
-rw-r--r--Makefile.am13
-rw-r--r--firefox-uccsconfigure.desktop.in (renamed from firefox-uccsconfigure.desktop)3
-rwxr-xr-xfirefox-uccsconfigure.sh4
4 files changed, 19 insertions, 2 deletions
diff --git a/.bzrignore b/.bzrignore
index 117bf99..fb9dc36 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1,2 +1,3 @@
uccsconfigure.desktop
uccsconfigure-session
+firefox-uccsconfigure.desktop
diff --git a/Makefile.am b/Makefile.am
index 8a0d998..a40362d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,7 +48,18 @@ autostart_filedir = $(pkgdatadir)
autostart_file_DATA = \
firefox-uccsconfigure.desktop
-EXTRA_DIST += firefox-uccsconfigure.desktop
+EXTRA_DIST += firefox-uccsconfigure.desktop.in
+CLEANFILES += firefox-uccsconfigure.desktop
+
+###############################
+# Firefox Start Script
+###############################
+
+firefox_startdir = $(pkgdatadir)
+firefox_start_SCRIPTS = \
+ firefox-uccsconfigure.sh
+
+EXTRA_DIST += firefox-uccsconfigure.sh
###############################
# Dist check stuff
diff --git a/firefox-uccsconfigure.desktop b/firefox-uccsconfigure.desktop.in
index 35ad303..7223b01 100644
--- a/firefox-uccsconfigure.desktop
+++ b/firefox-uccsconfigure.desktop.in
@@ -3,7 +3,8 @@ Version=1.0
Name=Configure UCCS
Comment=Configure UCCS using the web
Keywords=Internet;WWW;Browser;Web;Explorer
-Exec=firefox http://uccs.landscape.canonical.com/
+Exec=@pkgdatadir@/firefox-uccsconfigure.sh
+TryExec=@pkgdatadir@/firefox-uccsconfigure.sh
Terminal=false
X-MultipleArgs=false
Type=Application
diff --git a/firefox-uccsconfigure.sh b/firefox-uccsconfigure.sh
new file mode 100755
index 0000000..a632cb1
--- /dev/null
+++ b/firefox-uccsconfigure.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+firefox -no-remote https://uccs.landscape.canonical.com/
+gnome-session-quit --logout --no-prompt