[Pkg-cli-apps-commits] [SCM] Tomboy - desktop note taking program using Wiki style links branch, ubuntu, updated. debian/1.9.5-1ubuntu1

[Iain Lane]

The following commit has been merged in the ubuntu branch:
commit 04f8d8eb183e17c715fc39eb9fea0502bb1e60aa
Author: Sebastien Bacher <seb128 at ubuntu.com>
Date:   Mon Jan 16 18:39:47 2012 +0100

    Imported Debian patch 1.8.0-1ubuntu1.2

diff --git a/debian/changelog b/debian/changelog
index bc4ba71..9c37033 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tomboy (1.8.0-1ubuntu1.2) precise; urgency=low
+
+  * debian/patches/git_logout_delay.patch: upstream fix, should fix the issue
+    where tomboy is delaying the session logout (lp: #880299)
+
+ -- Sebastien Bacher <seb128 at ubuntu.com>  Mon, 16 Jan 2012 18:39:47 +0100
+
 tomboy (1.8.0-1ubuntu1.1) oneiric-proposed; urgency=low
 
   [ Iain Lane ]
diff --git a/debian/patches/git_logout_delay.patch b/debian/patches/git_logout_delay.patch
new file mode 100644
index 0000000..1ba90a8
--- /dev/null
+++ b/debian/patches/git_logout_delay.patch
@@ -0,0 +1,42 @@
+From 84797b9a9df3c84b329fbed946478f0171f5163c Mon Sep 17 00:00:00 2001
+From: Jared Jennings <jjennings at src.gnome.org>
+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
+
diff --git a/debian/patches/series b/debian/patches/series
index 3b0bdec..4b8e680 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
 20_remove_pcfile_requires
 30_fix_manpage_syntax
 31_prevent_inadvertent_deletion_of_notes.patch
+git_logout_delay.patch

-- 
Tomboy - desktop note taking program using Wiki style links