beagle r4649 - trunk/beagle/search/Beagle.Search

[dbera svn gnome org]

Author: dbera
Date: Tue Apr  1 19:06:11 2008
New Revision: 4649
URL: http://svn.gnome.org/viewvc/beagle?rev=4649&view=rev

Log:
* SearchWindow.cs: Set RetVal = true in the DeleteEvent handler so that the window is not "closed" (just hidden). This fixes the grey window on f12 that some people are seeing.
* Search.cs: Make XKeybinder an instance variable so that it does not slip from beneath us. It should have a lifetime same as the application. Otherwise you would see crashes as in (debian #473285, gentoo #201093-comment-48).


Modified:
   trunk/beagle/search/Beagle.Search/Search.cs
   trunk/beagle/search/Beagle.Search/SearchWindow.cs

Modified: trunk/beagle/search/Beagle.Search/Search.cs
==============================================================================
--- trunk/beagle/search/Beagle.Search/Search.cs	(original)
+++ trunk/beagle/search/Beagle.Search/Search.cs	Tue Apr  1 19:06:11 2008
@@ -28,6 +28,7 @@
 
 		private SearchWindow icon_window = null;
 		private TrayIcon tray = null;
+		private XKeybinder keybinder = null;
 
 		public Search (bool icon_enabled, bool docs_enabled)
 		{
@@ -53,7 +54,7 @@
 
 				if (!String.IsNullOrEmpty (binding)) {
 					tip_text += String.Format (" ({0})", binding);
-					XKeybinder keybinder = new XKeybinder ();
+					keybinder = new XKeybinder ();
 					keybinder.Bind (binding, OnTrayActivated);
 				}
 

Modified: trunk/beagle/search/Beagle.Search/SearchWindow.cs
==============================================================================
--- trunk/beagle/search/Beagle.Search/SearchWindow.cs	(original)
+++ trunk/beagle/search/Beagle.Search/SearchWindow.cs	Tue Apr  1 19:06:11 2008
@@ -303,6 +303,7 @@
 		{
 			// FIXME: Destroy window
 			Hide ();
+			args.RetVal = true;
 		}
 
 		private void OnScopeChanged (ScopeType toggled, bool active)