Ubuntu
tomboy package

Merge lp:~rodrigo-moya/ubuntu/maverick/tomboy/1_3_2_release into lp:~ubuntu-desktop/tomboy/ubuntu

  1. Maverick (10.10)
  2. 1_3_2_release
  3. Merge into ubuntu
Proposed by Rodrigo Moya
Status: Merged
Merged at revision: 51
Proposed branch: lp:~rodrigo-moya/ubuntu/maverick/tomboy/1_3_2_release
Merge into: lp:~ubuntu-desktop/tomboy/ubuntu
Diff against target: 72 lines (+24/-14)
2 files modified
debian/changelog (+21/-0)
debian/patches/04_app_indicator.patch (+3/-14)
To merge this branch: bzr merge lp:~rodrigo-moya/ubuntu/maverick/tomboy/1_3_2_release
Reviewer Review Type Date Requested Status
Sebastien Bacher Pending
Ubuntu Development Team Pending
Review via email: mp+33795@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2010-08-18 11:29:38 +0000
+++ debian/changelog 2010-08-26 15:27:46 +0000
@@ -1,3 +1,24 @@
1tomboy (1.3.2-1ubuntu1) maverick; urgency=low
2
3 * New upstream release 1.3.2
4 + Support gtk# >= 2.12.10
5 + Escape note titles in rename dialog
6 + Allow empty username field
7 + Help improvements
8 + Improve Tomboy's presentation for Add/Remove programs
9 + Do not open search at startup when tray icon is not ready after 2 secs
10 + Require .Net framework 3.5
11 + Add the missing resource "tomboy-note-clipboard-html.xsl" and clean up
12 the msbuild file.
13 + Allow (major) upgrades, deny downgrades in Setup
14 + Enable proper popup behavior on Windows
15 + Export linked notes correctly on Windows
16 + Replace obsolete .Log() method calls with .Debug/.Info/.Warn/.Error
17 + Fail more gracefully if recent item tracking for the taskbar is disabled
18 + Updated translations
19
20 -- Rodrigo Moya <rodrigo.moya@canonical.com> Thu, 26 Aug 2010 15:05:29 +0200
21
1tomboy (1.3.1-1ubuntu5) maverick; urgency=low22tomboy (1.3.1-1ubuntu5) maverick; urgency=low
223
3 * debian/patches/06_use_ubuntu_sso.patch:24 * debian/patches/06_use_ubuntu_sso.patch:
425
=== modified file 'debian/patches/04_app_indicator.patch'
--- debian/patches/04_app_indicator.patch 2010-08-11 15:53:51 +0000
+++ debian/patches/04_app_indicator.patch 2010-08-26 15:27:46 +0000
@@ -77,7 +77,7 @@
77===================================================================77===================================================================
78--- tomboy-1.3.1.orig/Tomboy/Tomboy.cs 2010-06-28 20:20:19.000000000 +010078--- tomboy-1.3.1.orig/Tomboy/Tomboy.cs 2010-06-28 20:20:19.000000000 +0100
79+++ tomboy-1.3.1/Tomboy/Tomboy.cs 2010-07-06 13:04:13.598602462 +010079+++ tomboy-1.3.1/Tomboy/Tomboy.cs 2010-07-06 13:04:13.598602462 +0100
80@@ -189,17 +189,22 @@80@@ -189,10 +189,16 @@
81 #endif81 #endif
82 }82 }
83 83
@@ -87,28 +87,17 @@
87- // Create the tray icon and run the main loop87- // Create the tray icon and run the main loop
88- tray_icon = new TomboyTrayIcon (manager);88- tray_icon = new TomboyTrayIcon (manager);
89- tray = tray_icon.Tray;89- tray = tray_icon.Tray;
90-
91- // Give the TrayIcon 2 seconds to appear. If it
92- // doesn't by then, open the SearchAllNotes window.
93- tray_icon_showing = tray_icon.IsEmbedded && tray_icon.Visible;
94- if (!tray_icon_showing)
95- GLib.Timeout.Add (2000, CheckTrayIconShowing);
96+ if (TomboyIndicatorTray.IndicatorTrayPresent) {90+ if (TomboyIndicatorTray.IndicatorTrayPresent) {
97+ indicator = new TomboyIndicatorTray (manager);91+ indicator = new TomboyIndicatorTray (manager);
98+ } else {92+ } else {
99+ // Create the tray icon and run the main loop93+ // Create the tray icon and run the main loop
100+ tray_icon = new TomboyTrayIcon (manager);94+ tray_icon = new TomboyTrayIcon (manager);
101+ tray = tray_icon.Tray;95+ tray = tray_icon.Tray;
102+
103+ // Give the TrayIcon 2 seconds to appear. If it
104+ // doesn't by then, open the SearchAllNotes window.
105+ tray_icon_showing = tray_icon.IsEmbedded && tray_icon.Visible;
106+ if (!tray_icon_showing)
107+ GLib.Timeout.Add (2000, CheckTrayIconShowing);
108+ }96+ }
109 97+
110 StartMainLoop ();98 StartMainLoop ();
111 }99 }
100
112@@ -214,7 +219,8 @@101@@ -214,7 +219,8 @@
113 // can still use Tomboy.102 // can still use Tomboy.
114 #if !MAC103 #if !MAC

Subscribers

People subscribed via source and target branches

to all changes: