[tomboy/autosync: 8/8] Merge branch 'master' into autosync
- From: Sanford Armstrong <sharm src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [tomboy/autosync: 8/8] Merge branch 'master' into autosync
- Date: Mon, 25 Jan 2010 19:41:15 +0000 (UTC)
commit 4e597b1edc50140b9a00f7df076b785e97304f65
Merge: 5617ab0 09c2d51
Author: Sandy Armstrong <sanfordarmstrong gmail com>
Date: Mon Jan 25 11:39:43 2010 -0800
Merge branch 'master' into autosync
Tomboy.csproj | 16 +++-
Tomboy/JumpListManager.cs | 205 ++++++++++++++++++++++++++++++++++++++
Tomboy/Tomboy.cs | 34 +++++--
Tomboy/WindowsInterop.cs | 240 +++++++++++++++++++++++++++++++++++++++++++++
data/icons/new_note.ico | Bin 0 -> 1150 bytes
data/icons/note.ico | Bin 0 -> 1150 bytes
data/icons/search.ico | Bin 0 -> 894 bytes
po/bg.po | 240 +++++++++++++++++++++------------------------
8 files changed, 595 insertions(+), 140 deletions(-)
---
diff --cc Tomboy/Tomboy.cs
index eb2e482,876abc1..22bf61c
--- a/Tomboy/Tomboy.cs
+++ b/Tomboy/Tomboy.cs
@@@ -68,8 -68,8 +68,9 @@@ namespace Tombo
if (!cmd_line.NeedsExecute)
cmd_line = new TomboyCommandLine (new string [] {"--search"});
// Execute args at an existing tomboy instance...
+ Console.WriteLine ("Tomboy is already running. Exiting...");
cmd_line.Execute ();
+ Console.WriteLine ("Tomboy is already running. Exiting...");
return;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]