File tomboy-always-handle-args-177298.patch of Package tomboy

Overview Repositories Revisions Requests Users Attributes Meta

File tomboy-always-handle-args-177298.patch of Package tomboy (Revision ab530b3ee39d7ffa3f9fe4ac4aec5873)

Currently displaying revision ab530b3ee39d7ffa3f9fe4ac4aec5873 , Show latest

Index: Tomboy/Applet.cs
================================================================================
--- Tomboy/Applet.cs
+++ Tomboy/Applet.cs
@@ -42,6 +42,8 @@
 			tray = new TomboyTray (manager);
 			keybinder = new TomboyGConfXKeybinder (manager, tray);
 
+			TomboyCommandLine.ProcessArgs (manager);
+
 			Add (tray);
 			ShowAll ();
 
@@ -136,6 +138,8 @@
 			this.Raw = egg_tray_icon_new (Catalog.GetString ("Tomboy Notes"));
 			this.manager = manager;
 
+			TomboyCommandLine.ProcessArgs (manager);
+
 			tray = new TomboyTray (manager);
 			tray.ButtonPressEvent += ButtonPress;
 
--- Tomboy/Tomboy.cs
+++ Tomboy/Tomboy.cs
@@ -17,12 +17,13 @@
 			// Initialize GETTEXT
 			Catalog.Init ("tomboy", Defines.GNOME_LOCALE_DIR);
 
-			TomboyCommandLine cmd_line = new TomboyCommandLine (args);
+			TomboyCommandLine.Parse (args);
 
-			if (cmd_line.NeedsExecute) {
-				// Execute args at an existing tomboy instance...
-				cmd_line.Execute ();
-				return;
+			// Check to see if we can run commands on existing
+			// tomboy instance
+			if (TomboyCommandLine.NeedsExecute) {
+				if (TomboyCommandLine.Execute ())
+					return;
 			}
 
 			program = new Gnome.Program ("Tomboy", 
@@ -39,7 +40,7 @@
 			// Register the manager to handle remote requests.
 			RegisterRemoteControl (manager);
 
-			if (cmd_line.UsePanelApplet) {
+			if (TomboyCommandLine.UsePanelApplet) {
 				RegisterPanelAppletFactory ();
 			} else {
 				RegisterSessionManagerRestart (args, note_path);
@@ -170,25 +171,20 @@
 
 	public class TomboyCommandLine
 	{
-		bool new_note;
-		bool panel_applet;
-		string new_note_name;
-		string open_note_uri;
-		string open_note_name;
-		string highlight_search;
+		static bool new_note;
+		static bool panel_applet;
+		static string new_note_name;
+		static string open_note_uri;
+		static string open_note_name;
+		static string highlight_search;
 		string note_path;
 
-		public TomboyCommandLine (string [] args)
-		{
-			Parse (args);
-		}
-
-		public bool UsePanelApplet
+		public static bool UsePanelApplet
 		{
 			get { return panel_applet; }
 		}
 
-		public bool NeedsExecute
+		public static bool NeedsExecute
 		{
 			get { 
 				return new_note || open_note_name != null || open_note_uri != null;
@@ -245,13 +241,13 @@
 			Console.WriteLine (Catalog.GetString ("Version {0}"), Defines.VERSION);
 		}
 
-		public void Parse (string [] args)
+		public static void Parse (string [] args)
 		{
 			for (int idx = 0; idx < args.Length; idx++) {
 				bool quit = false;
 
 				switch (args [idx]) {
-#if ENABLE_DBUS
+
 				case "--new-note":
 					// Get optional name for new note...
 					if (idx + 1 < args.Length && args [idx + 1][0] != '-') {
@@ -293,21 +289,6 @@
 					++idx;
 					highlight_search = args [idx];
 					break;
-#else
-				case "--new-note":
-				case "--open-note":
-				case "--start-here":
-				case "--highlight-search":
-					string unknown_opt = 
-						Catalog.GetString (
-							"Tomboy: unsupported option '{0}'\n" +
-							"Try 'tomboy --help' for more " +
-							"information.\n" +
-							"D-BUS remote control disabled.");
-					Console.WriteLine (unknown_opt, args [idx]);
-					quit = true;
-					break;
-#endif // ENABLE_DBUS
 
 				case "--panel-applet":
 					panel_applet = true;
@@ -353,12 +334,19 @@
 			}
 		}
 
-		public void Execute ()
+		public static bool Execute ()
 		{
 #if ENABLE_DBUS
 			DBus.Connection connection = DBus.Bus.GetSessionBus ();
-			DBus.Service service = new DBus.Service (connection, 
-								 RemoteControlProxy.Namespace);
+			DBus.Service service;
+			
+			try {
+				service = DBus.Service.Get (connection, 
+							    RemoteControlProxy.Namespace);
+			} catch {
+				// There's no running instance
+				return false;
+			}
 
 			RemoteControlProxy remote = (RemoteControlProxy) 
 				service.GetObject (typeof (RemoteControlProxy),
@@ -391,7 +379,42 @@
 				else
 					remote.DisplayNote (open_note_uri);
 			}
+
+			// Reset these so they're not opened again when
+			// instantiating the applet.
+			open_note_name = null;
+			open_note_uri = null;
+			highlight_search = null;
+
+			return true;
+#else
+			return false;
 #endif // ENABLE_DBUS
 		}
+
+		public static void ProcessArgs (NoteManager manager)
+		{
+			Note initial_note = null;
+
+			if (open_note_name != null) {
+				initial_note = manager.Find (open_note_name);
+
+				if (initial_note == null)
+					initial_note = manager.Create (open_note_name);
+			} else if (open_note_uri != null) {
+				initial_note = manager.FindByUri (open_note_uri);
+			}
+
+			if (initial_note != null) {
+				if (highlight_search != null) {
+					NoteFindDialog find = NoteFindDialog.GetInstance (initial_note);
+					find.SearchText = highlight_search;
+					find.FindNextButton.Click ();
+				}
+
+				initial_note.Window.Present ();
+			}
+			
+		}
 	}
 }

Places

File tomboy-always-handle-args-177298.patch of Package tomboy (Revision ab530b3ee39d7ffa3f9fe4ac4aec5873)

Places