tomboy r1743 - in trunk: . Tomboy

[sharm svn gnome org]

Author: sharm
Date: Mon Jan  7 14:59:52 2008
New Revision: 1743
URL: http://svn.gnome.org/viewvc/tomboy?rev=1743&view=rev

Log:
* Tomboy/Tomboy.cs: If dbus is disabled, execute command line options
  *after* initializing the ActionManager and ApplicationAddins. 
  Opening the search UI before this is done causes Tomboy to hit null
  reference exceptions while acessing the ActionManager, and crash.

Modified:
   trunk/ChangeLog
   trunk/Tomboy/Tomboy.cs

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	(original)
+++ trunk/ChangeLog	Mon Jan  7 14:59:52 2008
@@ -1,5 +1,12 @@
 2008-01-07  Sandy Armstrong <sanfordarmstrong gmail com> 
 
+	* Tomboy/Tomboy.cs: If dbus is disabled, execute command line options
+	  *after* initializing the ActionManager and ApplicationAddins.  Opening
+	  the search UI before this is done causes Tomboy to hit null reference
+	  exceptions while acessing the ActionManager, and crash.
+
+2008-01-07  Sandy Armstrong <sanfordarmstrong gmail com> 
+
 	* Tomboy/Utils.cs: Commenting out use of Gtk.Button.ImagePosition, which is
 	  new to GTK+ 2.10.  We were just setting it to the default value, anyway.
 

Modified: trunk/Tomboy/Tomboy.cs
==============================================================================
--- trunk/Tomboy/Tomboy.cs	(original)
+++ trunk/Tomboy/Tomboy.cs	Mon Jan  7 14:59:52 2008
@@ -50,12 +50,6 @@
 			RegisterRemoteControl (manager);
 
 			SetupGlobalActions ();
-
-			#if !ENABLE_DBUS
-			if (cmd_line.NeedsExecute) {
-				cmd_line.Execute ();
-			}
-			#endif
 			ActionManager am = Tomboy.ActionManager;
 
 			ApplicationAddin [] addins =
@@ -64,6 +58,12 @@
 				addin.Initialize ();
 			}
 
+			#if !ENABLE_DBUS
+			if (cmd_line.NeedsExecute) {
+				cmd_line.Execute ();
+			}
+			#endif
+
 			if (cmd_line.UsePanelApplet) {
 				tray_icon_showing = true;
 				is_panel_applet = true;