From 201e48e1b010ebf180034abb8d61cafaba8a08a0 Mon Sep 17 00:00:00 2001
From: William Hua <william.hua@canonical.com>
Date: Thu, 22 Aug 2013 15:12:38 +0800
Subject: Proper shutdown on SIGTERM.

---
 lib/main.vala             | 32 ++++++++++++++++++++++++++------
 po/indicator-keyboard.pot |  8 ++++----
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/lib/main.vala b/lib/main.vala
index d601f6f9..073b0588 100644
--- a/lib/main.vala
+++ b/lib/main.vala
@@ -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;
@@ -76,6 +77,22 @@ public class Indicator.Keyboard.Service : Object {
 		return (!) ibus;
 	}
 
+	[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,
@@ -84,9 +101,6 @@ public class Indicator.Keyboard.Service : Object {
 		              handle_bus_acquired,
 		              null,
 		              handle_name_lost);
-
-		loop = new MainLoop ();
-		((!) loop).run ();
 	}
 
 	[DBus (visible = false)]
@@ -428,13 +442,19 @@ public class Indicator.Keyboard.Service : Object {
 
 	[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;
 	}
 }
diff --git a/po/indicator-keyboard.pot b/po/indicator-keyboard.pot
index b657f08e..3cbc4c2e 100644
--- a/po/indicator-keyboard.pot
+++ b/po/indicator-keyboard.pot
@@ -8,7 +8,7 @@ msgid ""
 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 <LL@li.org>\n"
@@ -17,14 +17,14 @@ msgstr ""
 "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 ""
-- 
cgit v1.2.3