--- tomboy-1.8.0/Tomboy/GnomeApplication.cs	2011-07-05 09:10:30.000000000 +0800
+++ tomboy-1.8.0.new/Tomboy/GnomeApplication.cs	2012-01-08 09:06:59.664797755 +0800
@@ -67,6 +67,7 @@
 				                                                             session_client_id);
 				client.QueryEndSession += OnQueryEndSession;
 				client.EndSession += OnEndSession;
+				client.Stop += OnStop;
 			} catch (Exception e) {
 				Logger.Debug ("Failed to register with session manager: {0}", e.Message);
 			}
@@ -142,6 +143,10 @@
 				System.Environment.Exit (0);
 		}
 
+		private void OnStop () {
+			Exit(0);
+		}
+
 		private void OnQueryEndSession (uint flags)
 		{
 			Logger.Info ("Received end session query");
