Merge lp://staging/~er-abhinav-upadhyay/ubuntu/natty/tomboy/patch-757635 into lp://staging/ubuntu/natty/tomboy
| Status: | Approved |
|---|---|
| Approved by: | Martin Pitt |
| Approved revision: | 77 |
| Proposed branch: | lp://staging/~er-abhinav-upadhyay/ubuntu/natty/tomboy/patch-757635 |
| Merge into: | lp://staging/ubuntu/natty/tomboy |
| Diff against target: |
83 lines (+57/-0) (has conflicts) 3 files modified
debian/changelog (+13/-0) debian/patches/31_prevent_inadvertent_deletion_of_notes.patch (+43/-0) debian/patches/series (+1/-0) Text conflict in debian/changelog |
| To merge this branch: | bzr merge lp://staging/~er-abhinav-upadhyay/ubuntu/natty/tomboy/patch-757635 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Martin Pitt | Approve | ||
| Stefan Bader (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
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.
Unmerged revisions
- 77. By Abhinav Upadhyay
-
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
-
Updated debian/changelog to reflect the renamed patch fiel
- 75. By Abhinav Upadhyay
-
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
-
Updated dch
- 73. By Abhinav Upadhyay
-
Added meta information to the patch 21_prevent_
inadvertent_ deletion_ of_notes. patch - 72. By Abhinav Upadhyay
-
* 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)
Changes look good to me now.