Merge lp:~om26er/ubuntu/oneiric/tomboy/fix-880299 into lp:ubuntu/oneiric-proposed/tomboy

[Omer Akram]

SRU for bug 880299

[Stéphane Graber (stgraber)]

Uploaded to oneiric-proposed.

=== modified file 'debian/changelog'
--- debian/changelog	2011-10-14 09:38:21 +0000
+++ debian/changelog	2012-01-17 18:01:27 +0000
@@ -1,3 +1,11 @@
+tomboy (1.8.0-1ubuntu1.2) oneiric-proposed; urgency=low
+
+  * debian/patches/32_logout_delay.patch:
+    - Fix the issue where tomboy is delaying the session logout. 
+      (LP: #880299) 
+
+ -- Omer Akram <[e-mail]>  Tue, 17 Jan 2012 22:51:08 +0500
+
 tomboy (1.8.0-1ubuntu1.1) oneiric-proposed; urgency=low
 
   [ Iain Lane ]

=== added file 'debian/patches/32_logout_delay.patch'
--- debian/patches/32_logout_delay.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/32_logout_delay.patch	2012-01-17 18:01:27 +0000
@@ -0,0 +1,42 @@
+From 84797b9a9df3c84b329fbed946478f0171f5163c Mon Sep 17 00:00:00 2001
+From: Jared Jennings <[e-mail]>
+Date: Mon, 16 Jan 2012 16:51:04 +0000
+Subject: Sam Lin has provided a patch to address slow Logouts
+
+Sam added Stop signal callback in Tomboy and it solved the issue.
+bgo #650029
+---
+diff --git a/Tomboy/GnomeApplication.cs b/Tomboy/GnomeApplication.cs
+index b076003..b2ef6f0 100644
+--- a/Tomboy/GnomeApplication.cs
++++ b/Tomboy/GnomeApplication.cs
+@@ -67,6 +67,7 @@ namespace Tomboy
+ 				                                                             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 @@ namespace Tomboy
+ 				System.Environment.Exit (0);
+ 		}
+ 
++		private void OnStop () {
++			Exit(0);
++		}
++
+ 		private void OnQueryEndSession (uint flags)
+ 		{
+ 			Logger.Info ("Received end session query");
+@@ -175,6 +180,7 @@ namespace Tomboy
+ 			} catch (Exception e) {
+ 				Logger.Debug ("Failed to respond to session manager: {0}", e.Message);
+ 			}
++			Exit (0);
+ 		}
+ 		
+ 		public void OpenUrl (string url, Gdk.Screen screen)
+--
+cgit v0.9.0.2
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-10-14 09:38:21 +0000
+++ debian/patches/series	2012-01-17 18:01:27 +0000
@@ -8,3 +8,4 @@
 20_remove_pcfile_requires
 30_fix_manpage_syntax
 31_prevent_inadvertent_deletion_of_notes.patch
+32_logout_delay.patch