[tomboy] Do not open search at startup when tray icon is not ready after 2 secs



commit c8351f0550c02686124931168a94c9c00557ca91
Author: Stefan Schweizer <steve schweizer gmail com>
Date:   Sun Aug 1 12:48:36 2010 +0200

    Do not open search at startup when tray icon is not ready after 2 secs
    
    https://bugzilla.gnome.org/show_bug.cgi?id=443655

 Tomboy/Tomboy.cs |   24 ------------------------
 1 files changed, 0 insertions(+), 24 deletions(-)
---
diff --git a/Tomboy/Tomboy.cs b/Tomboy/Tomboy.cs
index 500c091..037d772 100644
--- a/Tomboy/Tomboy.cs
+++ b/Tomboy/Tomboy.cs
@@ -194,33 +194,9 @@ namespace Tomboy
 			// Create the tray icon and run the main loop
 			tray_icon = new TomboyTrayIcon (manager);
 			tray = tray_icon.Tray;
-
-			// Give the TrayIcon 2 seconds to appear.  If it
-			// doesn't by then, open the SearchAllNotes window.
-			tray_icon_showing = tray_icon.IsEmbedded && tray_icon.Visible;
-			if (!tray_icon_showing)
-				GLib.Timeout.Add (2000, CheckTrayIconShowing);
-
 			StartMainLoop ();
 		}
 
-		static bool CheckTrayIconShowing ()
-		{
-			tray_icon_showing = tray_icon.IsEmbedded && tray_icon.Visible;
-			
-			// Check to make sure the tray icon is showing.  If it's not,
-			// it's likely that the Notification Area isn't available.  So
-			// instead, launch the Search All Notes window so the user can
-			// can still use Tomboy.
-#if !MAC
-			if (tray_icon_showing == false &&
-			    (bool) Preferences.Get (Preferences.ENABLE_TRAY_ICON))
-				ActionManager ["ShowSearchAllNotesAction"].Activate ();
-#endif
-			
-			return false; // prevent GLib.Timeout from calling this method again
-		}
-
 		static void RegisterRemoteControl (NoteManager manager)
 		{
 			try {



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]