From 5a85088269f25ce2e2b30923676e26d4154ac0fd Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 23 Aug 2012 15:07:58 -0500
Subject: Writing a script so that we can quit if Firefox is closed

---
 firefox-uccsconfigure.sh | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100755 firefox-uccsconfigure.sh

diff --git a/firefox-uccsconfigure.sh b/firefox-uccsconfigure.sh
new file mode 100755
index 0000000..e093c44
--- /dev/null
+++ b/firefox-uccsconfigure.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+firefox -no-remote https://uccs.landscape.canonical.com/
+gnome-session-quit
-- 
cgit v1.2.3


From d478815a604d1668f5c52a9632536b63b2abc973 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 23 Aug 2012 15:11:03 -0500
Subject: Changing the desktop fiel to call our little script

---
 .bzrignore                       |  1 +
 Makefile.am                      |  3 ++-
 firefox-uccsconfigure.desktop    | 14 --------------
 firefox-uccsconfigure.desktop.in | 15 +++++++++++++++
 4 files changed, 18 insertions(+), 15 deletions(-)
 delete mode 100644 firefox-uccsconfigure.desktop
 create mode 100644 firefox-uccsconfigure.desktop.in

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..cae4778 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,7 +48,8 @@ autostart_filedir = $(pkgdatadir)
 autostart_file_DATA = \
 	firefox-uccsconfigure.desktop
 
-EXTRA_DIST += firefox-uccsconfigure.desktop
+EXTRA_DIST += firefox-uccsconfigure.desktop.in
+CLEANFILES += firefox-uccsconfigure.desktop
 
 ###############################
 # Dist check stuff
diff --git a/firefox-uccsconfigure.desktop b/firefox-uccsconfigure.desktop
deleted file mode 100644
index 35ad303..0000000
--- a/firefox-uccsconfigure.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-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/ 
-Terminal=false
-X-MultipleArgs=false
-Type=Application
-Icon=firefox
-Categories=GNOME;GTK;Network;WebBrowser;
-StartupWMClass=Firefox
-StartupNotify=true
-X-GNOME-Autostart-Phase=Application
diff --git a/firefox-uccsconfigure.desktop.in b/firefox-uccsconfigure.desktop.in
new file mode 100644
index 0000000..7223b01
--- /dev/null
+++ b/firefox-uccsconfigure.desktop.in
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Version=1.0
+Name=Configure UCCS
+Comment=Configure UCCS using the web
+Keywords=Internet;WWW;Browser;Web;Explorer
+Exec=@pkgdatadir@/firefox-uccsconfigure.sh
+TryExec=@pkgdatadir@/firefox-uccsconfigure.sh
+Terminal=false
+X-MultipleArgs=false
+Type=Application
+Icon=firefox
+Categories=GNOME;GTK;Network;WebBrowser;
+StartupWMClass=Firefox
+StartupNotify=true
+X-GNOME-Autostart-Phase=Application
-- 
cgit v1.2.3


From 370338d5f066007c1b16bcfe80561c2b16f09455 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 23 Aug 2012 15:16:17 -0500
Subject: No dialog, just logout

---
 firefox-uccsconfigure.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/firefox-uccsconfigure.sh b/firefox-uccsconfigure.sh
index e093c44..a632cb1 100755
--- a/firefox-uccsconfigure.sh
+++ b/firefox-uccsconfigure.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 firefox -no-remote https://uccs.landscape.canonical.com/
-gnome-session-quit
+gnome-session-quit --logout --no-prompt
-- 
cgit v1.2.3


From 1ec06df4d2f3cfc29be380926b8a80944e727b48 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 27 Aug 2012 11:17:12 -0500
Subject: Adding the firefox script to the dist

---
 Makefile.am | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index cae4778..a40362d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,6 +51,16 @@ autostart_file_DATA = \
 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
 ###############################
-- 
cgit v1.2.3