Merge lp:~attente/indicator-keyboard/handle-sigterm into lp:indicator-keyboard

[William Hua]

Proper shutdown on SIGTERM.

Proper shutdown on SIGTERM.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:105
http://jenkins.qa.ubuntu.com/job/indicator-keyboard-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-saucy-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-saucy-armhf-ci/17

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-keyboard-ci/17/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

review: Approve

=== modified file 'lib/main.vala'
--- lib/main.vala	2013-08-12 01:33:27 +0000
+++ lib/main.vala	2013-08-22 07:27:00 +0000
@@ -19,6 +19,7 @@
 [DBus (name = "com.canonical.indicator.keyboard")]
 public class Indicator.Keyboard.Service : Object {
 
+	private static Service service;
 	private static IBus.Bus? ibus;
 
 	private bool force;
@@ -77,6 +78,22 @@
 	}
 
 	[DBus (visible = false)]
+	public void up () {
+		if (loop == null) {
+			loop = new MainLoop ();
+			((!) loop).run ();
+		}
+	}
+
+	[DBus (visible = false)]
+	public void down () {
+		if (loop != null) {
+			((!) loop).quit ();
+			loop = null;
+		}
+	}
+
+	[DBus (visible = false)]
 	private void acquire_bus_name () {
 		Bus.own_name (BusType.SESSION,
 		              "com.canonical.indicator.keyboard",
@@ -84,9 +101,6 @@
 		              handle_bus_acquired,
 		              null,
 		              handle_name_lost);
-
-		loop = new MainLoop ();
-		((!) loop).run ();
 	}
 
 	[DBus (visible = false)]
@@ -428,13 +442,19 @@
 
 	[DBus (visible = false)]
 	private void handle_name_lost (DBusConnection? connection, string name) {
-		((!) loop).quit ();
-		loop = null;
+		down ();
 	}
 
 	[DBus (visible = false)]
 	public static int main (string[] args) {
-		new Service (ref args);
+		Service.service = new Service (ref args);
+
+		Posix.signal (Posix.SIGTERM, (code) => {
+			Service.service.down ();
+		});
+
+		Service.service.up ();
+
 		return 0;
 	}
 }

=== modified file 'po/indicator-keyboard.pot'
--- po/indicator-keyboard.pot	2013-08-21 04:46:54 +0000
+++ po/indicator-keyboard.pot	2013-08-22 07:27:00 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-21 12:15+0800\n"
+"POT-Creation-Date: 2013-08-22 15:09+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,14 +17,14 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/main.c:1419 ../lib/main.vala:328
+#: ../lib/main.c:1449 ../lib/main.vala:342
 msgid "Character Map"
 msgstr ""
 
-#: ../lib/main.c:1421 ../lib/main.vala:329
+#: ../lib/main.c:1451 ../lib/main.vala:343
 msgid "Keyboard Layout Chart"
 msgstr ""
 
-#: ../lib/main.c:1423 ../lib/main.vala:330
+#: ../lib/main.c:1453 ../lib/main.vala:344
 msgid "Text Entry Settings..."
 msgstr ""