Ubuntu
tomboy package

Merge lp:~etulfetulf/ubuntu/natty/tomboy/tomboy-fix-664963 into lp:ubuntu/natty/tomboy

  1. Natty (11.04)
  2. tomboy-fix-664963
  3. Merge into natty
Proposed by Greg A
Status: Merged
Merge reported by: Sebastien Bacher
Merged at revision: not available
Proposed branch: lp:~etulfetulf/ubuntu/natty/tomboy/tomboy-fix-664963
Merge into: lp:ubuntu/natty/tomboy
Diff against target: 37 lines (+9/-2)
2 files modified
debian/changelog (+6/-0)
debian/patches/04_app_indicator.patch (+3/-2)
To merge this branch: bzr merge lp:~etulfetulf/ubuntu/natty/tomboy/tomboy-fix-664963
Reviewer Review Type Date Requested Status
Rodrigo Moya (community) Approve
Robert Roth (community) Approve
Ubuntu branches Pending
Review via email: mp+57074@code.launchpad.net

Description of the change

Fixes LP: #664963 which is caused by a problem in the Ubuntu patch. This patch to the patch simply changes two lines as suggested by Sandy Armstrong (Tomboy developer).

To post a comment you must log in.
Revision history for this message
Robert Roth (evfool) wrote :

Looks fine, and the upstream developer of Tomboy has also suggested the same solution.

review: Approve
Revision history for this message
Rodrigo Moya (rodrigo-moya) wrote :

Looks good

review: Approve
Revision history for this message
Sebastien Bacher (seb128) wrote :

thank you for your work, setting it merged manually since the merge request was against the wrong vcs

Revision history for this message
Greg A (etulfetulf) wrote :

For future reference, what would have been the correct vcs?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-04-06 12:46:11 +0000
3+++ debian/changelog 2011-04-10 14:37:29 +0000
4@@ -1,3 +1,9 @@
5+tomboy (1.6.0-0ubuntu2) natty; urgency=low
6+
7+ * Don't show templates in the indicator (LP: #664963)
8+
9+ -- Greg Auger <gregory.auger@googlemail.com> Sun, 10 Apr 2011 09:53:30 +0100
10+
11 tomboy (1.6.0-0ubuntu1) natty; urgency=low
12
13 [ Rodrigo Moya ]
14
15=== modified file 'debian/patches/04_app_indicator.patch'
16--- debian/patches/04_app_indicator.patch 2010-12-03 08:57:00 +0000
17+++ debian/patches/04_app_indicator.patch 2011-04-10 14:37:29 +0000
18@@ -84,7 +84,7 @@
19 === added file 'Tomboy/TomboyIndicatorTray.cs'
20 --- old/Tomboy/TomboyIndicatorTray.cs 1970-01-01 00:00:00 +0000
21 +++ new/Tomboy/TomboyIndicatorTray.cs 2010-12-03 14:20:19 +0000
22-@@ -0,0 +1,178 @@
23+@@ -0,0 +1,179 @@
24 +//
25 +// Copyright (C) 2009 GNOME Do
26 +//
27@@ -218,8 +218,9 @@
28 + yield return new Gtk.SeparatorMenuItem ();
29 +
30 + if (manager != null && manager.Notes != null) {
31++ Tag template_tag = TagManager.GetOrCreateSystemTag (TagManager.TemplateNoteSystemTag);
32 + var menuItems = manager.Notes
33-+ .Where (n => !n.IsSpecial)
34++ .Where (n => !n.IsSpecial && !n.ContainsTag(template_tag))
35 + .OrderByDescending (n => n.ChangeDate)
36 + .Take (10)
37 + .Select (n => CreateNoteMenuItem(n))

Subscribers

People subscribed via source and target branches

to all changes: