← Back to branch summary

~ubuntu-branches/ubuntu/precise/tomboy/precise-proposed

« back to all changes in this revision

Viewing changes to debian/patches/git_logout_delay.patch

  • Committer: Package Import Robot
  • Author(s): Iain Lane
  • Date: 2012-02-06 14:18:43 UTC
  • mfrom: (4.3.14 experimental)
  • Revision ID: package-import@ubuntu.com-20120206141843-l1co9xd4xvyzdscc
Tags: 1.9.5-1ubuntu1
* [42fc674] Update gbp.conf for Ubuntu branch
* [d407c7c] Drop git_logout_delay: upstreamed
* Merge with experimental, remaining changes:
  + Use dh-translations
  + Ubuntu patches:
    - Add Launchpad integration
    - Add app indicator support
    - Use Ubuntu One as default sync server
    - Add initial note about Ubuntu One
     - Set save button sensitive when needed
  + autoreconf for some of the above changes
  + Run dh_autoreconf with --as-needed to enable support in ltmain.sh

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/git_logout_delay.patch
1
 
From 84797b9a9df3c84b329fbed946478f0171f5163c Mon Sep 17 00:00:00 2001
2
 
From: Jared Jennings <jjennings@src.gnome.org>
3
 
Date: Mon, 16 Jan 2012 16:51:04 +0000
4
 
Subject: Sam Lin has provided a patch to address slow Logouts
5
 
 
6
 
Sam added Stop signal callback in Tomboy and it solved the issue.
7
 
bgo #650029
8
 
---
9
 
diff --git a/Tomboy/GnomeApplication.cs b/Tomboy/GnomeApplication.cs
10
 
index b076003..b2ef6f0 100644
11
 
--- a/Tomboy/GnomeApplication.cs
12
 
+++ b/Tomboy/GnomeApplication.cs
13
 
@@ -67,6 +67,7 @@ namespace Tomboy
14
 
                                                                                             session_client_id);
15
 
                                client.QueryEndSession += OnQueryEndSession;
16
 
                                client.EndSession += OnEndSession;
17
 
+                               client.Stop += OnStop;
18
 
                        } catch (Exception e) {
19
 
                                Logger.Debug ("Failed to register with session manager: {0}", e.Message);
20
 
                        }
21
 
@@ -142,6 +143,10 @@ namespace Tomboy
22
 
                                System.Environment.Exit (0);
23
 
                }
24
 
 
25
 
+               private void OnStop () {
26
 
+                       Exit(0);
27
 
+               }
28
 
+
29
 
                private void OnQueryEndSession (uint flags)
30
 
                {
31
 
                        Logger.Info ("Received end session query");
32
 
@@ -175,6 +180,7 @@ namespace Tomboy
33
 
                        } catch (Exception e) {
34
 
                                Logger.Debug ("Failed to respond to session manager: {0}", e.Message);
35
 
                        }
36
 
+                       Exit (0);
37
 
                }
38
 
                
39
 
                public void OpenUrl (string url, Gdk.Screen screen)
40
 
--
41
 
cgit v0.9.0.2
42