Merge lp:~er-abhinav-upadhyay/ubuntu/natty/tomboy/patch-757635 into lp:ubuntu/natty/tomboy

[Abhinav Upadhyay]

I have also send this patch upstream but it may take sometime for them to review and merge it. Meanwhile I propose to include this patch as part of debian/patches (Given it fixes the problem without causing any other problems).

I tested it on my system, the problem seemed to have been resolved.

[lp:~er-abhinav-upadhyay/ubuntu/natty/tomboy/patch-757635]

75. By Abhinav Upadhyay on 2011-04-19

Renamed debian/patches/21_prevent_inadvertent_deletion_of_notes.patch to 31_prevent_inadvertent_deletion_of_notes.patch and made some formatting changes in the patch

76. By Abhinav Upadhyay on 2011-04-19

Updated debian/changelog to reflect the renamed patch fiel

[Stefan Bader (smb)]

Changes look good to me now.

review: Approve

[lp:~er-abhinav-upadhyay/ubuntu/natty/tomboy/patch-757635]

77. By Abhinav Upadhyay on 2011-04-20

Fixed a small problem of re-enabling the delete option when focus moves out of the search box by adding a FocusOut event handler.

[Martin Pitt (pitti)]

I can't directly merge this as it is using the wrong branch. I got the patch and applied it to the right branch (http://bazaar.launchpad.net/~ubuntu-desktop/tomboy/ubuntu). Thanks!

Closing manually.

review: Approve

Unmerged revisions

77. By Abhinav Upadhyay on 2011-04-20

Fixed a small problem of re-enabling the delete option when focus moves out of the search box by adding a FocusOut event handler.

76. By Abhinav Upadhyay on 2011-04-19

Updated debian/changelog to reflect the renamed patch fiel

75. By Abhinav Upadhyay on 2011-04-19

Renamed debian/patches/21_prevent_inadvertent_deletion_of_notes.patch to 31_prevent_inadvertent_deletion_of_notes.patch and made some formatting changes in the patch

74. By Abhinav Upadhyay on 2011-04-19

Updated dch

73. By Abhinav Upadhyay on 2011-04-19

Added meta information to the patch 21_prevent_inadvertent_deletion_of_notes.patch

72. By Abhinav Upadhyay on 2011-04-19

* debian/patches/21_prevent_inadvertent_deletion_of_notes.patch:
  - Tomboy/RecentChanges.cs: Added code for handling FocusInEvent of the search
    combo box, it disables the "Delete" option in the menu bar when the focus is
    is in the search box, which prevents deletion of notes on hitting the delete
    key. (LP: #757635)

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-10 09:53:30 +0000
+++ debian/changelog	2011-04-20 09:38:24 +0000
@@ -1,9 +1,22 @@
+<<<<<<< TREE
 tomboy (1.6.0-0ubuntu2) natty; urgency=low
 
   * Don't show templates in the indicator (LP: #664963) 
 
  -- Greg Auger <[e-mail]>  Sun, 10 Apr 2011 09:53:30 +0100
 
+=======
+tomboy (1.6.0-0ubuntu2) natty; urgency=low
+
+  * debian/patches/31_prevent_inadvertent_deletion_of_notes.patch:
+    - Tomboy/RecentChanges.cs: Added code for handling FocusInEvent of the search
+      combo box, it disables the "Delete" option in the menu bar when the focus is
+      is in the search box, which prevents deletion of notes on hitting the delete
+      key. (LP: #757635)
+
+ -- Abhinav Upadhyay <[e-mail]>  Tue, 19 Apr 2011 19:56:59 +0530
+
+>>>>>>> MERGE-SOURCE
 tomboy (1.6.0-0ubuntu1) natty; urgency=low
 
   [ Rodrigo Moya ]

=== added file 'debian/patches/31_prevent_inadvertent_deletion_of_notes.patch'
--- debian/patches/31_prevent_inadvertent_deletion_of_notes.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/31_prevent_inadvertent_deletion_of_notes.patch	2011-04-20 09:38:24 +0000
@@ -0,0 +1,43 @@
+Description: Prevents accidental deletion of notes in case user hits the
+             delete key when the focus is in the search box.
+Author: Abhinav Upadhyay <[e-mail]>
+Bug-Ubuntu: https://launchpad.net/bugs/757635
+Bug: https://bugzilla.gnome.org/647462
+Forwarded: yes 
+Index: new-bugfix-757635/Tomboy/RecentChanges.cs
+===================================================================
+--- new-bugfix-757635.orig/Tomboy/RecentChanges.cs	2011-04-20 14:56:23.273566997 +0530
++++ new-bugfix-757635/Tomboy/RecentChanges.cs	2011-04-20 14:59:30.585566999 +0530
+@@ -103,6 +103,8 @@
+ 			find_combo.Changed += OnEntryChanged;
+ 			find_combo.Entry.ActivatesDefault = false;
+ 			find_combo.Entry.Activated += OnEntryActivated;
++			find_combo.Entry.FocusInEvent += OnSearchBoxFocused;
++			find_combo.Entry.FocusOutEvent += OnSearchBoxFocusedOut;
+ 			if (previous_searches != null) {
+ 				foreach (string prev in previous_searches) {
+ 					find_combo.AppendText (prev);
+@@ -1174,7 +1176,22 @@
+ 			PerformSearch ();
+ 			AddToPreviousSearches (SearchText);
+ 		}
+-
++		
++		// called when the user moves the focus in the search combo box
++		void OnSearchBoxFocused (object sender, EventArgs args)
++		{
++			// disable the Delete Note option in the menu bar (bug #647462)
++			Tomboy.ActionManager ["DeleteNoteAction"].Sensitive = false;
++		}
++		
++		// called when the focus moves out of the search combo box.
++		void OnSearchBoxFocusedOut (object sender, EventArgs args)
++		{
++			// Enable the Delete Note option in the menu bar, which might have been
++			// disabled in case the focus was in the search combo box perviously.
++			Tomboy.ActionManager ["DeleteNoteAction"].Sensitive = true;
++		}
++		
+ 		void AddToPreviousSearches (string text)
+ 		{
+ 			// Update previous searches, by adding a new term to the

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-10-29 01:50:04 +0000
+++ debian/patches/series	2011-04-20 09:38:24 +0000
@@ -7,3 +7,4 @@
 11_lpi.patch
 20_remove_pcfile_requires
 30_fix_manpage_syntax
+31_prevent_inadvertent_deletion_of_notes.patch