[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 d407c7ca298cd3c974ab0d1a198730a92754906e
Author: Iain Lane <laney at debian.org>
Date:   Mon Feb 6 14:16:17 2012 +0000

    Drop git_logout_delay: upstreamed

diff --git a/debian/patches/git_logout_delay.patch b/debian/patches/git_logout_delay.patch
deleted file mode 100644
index 1ba90a8..0000000
--- a/debian/patches/git_logout_delay.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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 4b8e680..3b0bdec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,4 +8,3 @@
 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