rpms/beagle/devel beagle-0.2.7-key.patch, NONE, 1.1 beagle.spec, 1.68, 1.69

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27646

Modified Files:
	beagle.spec 
Added Files:
	beagle-0.2.7-key.patch 
Log Message:
hide keybiding


beagle-0.2.7-key.patch:
 search/Search.cs     |    5 -----
 tools/Settings.cs    |    2 ++
 tools/settings.glade |    2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

--- NEW FILE beagle-0.2.7-key.patch ---
--- beagle-0.2.7/tools/settings.glade.key	2006-08-15 02:18:04.000000000 -0400
+++ beagle-0.2.7/tools/settings.glade	2006-08-15 02:27:48.000000000 -0400
@@ -253,7 +253,7 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkTable" id="table1">
+			    <widget class="GtkTable" id="key_binding_table">
 			      <property name="visible">True</property>
 			      <property name="n_rows">2</property>
 			      <property name="n_columns">2</property>
--- beagle-0.2.7/tools/Settings.cs.key	2006-08-15 02:28:54.000000000 -0400
+++ beagle-0.2.7/tools/Settings.cs	2006-04-07 12:16:02.000000000 -0400
@@ -53,6 +53,7 @@
 
 	[Widget] CheckButton autostart_toggle;
 
+	[Widget] Table key_binding_table;
 	[Widget] CheckButton press_ctrl_toggle;
  	[Widget] CheckButton press_alt_toggle;
 	[Widget] Entry show_search_window_entry;
@@ -109,6 +110,7 @@
 		glade.Autoconnect (this);
 
 		administration_frame.Visible = (Environment.UserName == "root");
+		key_binding_table.Visible = false;
 
 #if false
 		display_view = new DisplayView ();
--- beagle-0.2.7/search/Search.cs.key	2006-08-15 02:20:28.000000000 -0400
+++ beagle-0.2.7/search/Search.cs	2006-08-15 02:20:54.000000000 -0400
@@ -34,8 +34,6 @@
 		Search.SortType sort = SortType.Modified;
 		Search.TypeFilter filter = null;
 
-		XKeybinder keybinder = new XKeybinder ();
-
 		public static bool IconEnabled = false;
 
 		public static void Main (string [] args)
@@ -221,9 +219,6 @@
 				tray = new TrayIcon ();
 				tray.Clicked += OnTrayActivated;
 				tray.Search += OnTraySearch;
-
-				// Attach the hide/show keybinding
-				keybinder.Bind (Conf.Searching.ShowSearchWindowBinding.ToString (), OnTrayActivated);
 			} else {
 				ShowAll ();
 			}


Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- beagle.spec	11 Aug 2006 12:19:39 -0000	1.68
+++ beagle.spec	15 Aug 2006 06:41:40 -0000	1.69
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.2.7
-Release:       	8%{?dist}
+Release:       	9%{?dist}
 Summary:        The Beagle Search Infrastructure
 Group:          User Interface/Desktops
 License:        LGPL
@@ -38,7 +38,8 @@
 Patch4: beagle-0.2.7-beagle-index-username.patch
 Patch5: beagle-0.2.7-runuser.patch
 # fixed in upstream cvs
-Patch6:		beagle-0.2.7-socket-path.patch
+Patch6:	beagle-0.2.7-socket-path.patch
+Patch7: beagle-0.2.7-key.patch
 
 # Mono only available on these:
 ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc
@@ -95,6 +96,7 @@
 %patch4 -p1 -b .beagleidx
 %patch5 -p1 -b .runuser
 %patch6 -p1 -b .socket-path
+%patch7 -p1 -b .key
 
 %build
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
@@ -284,6 +286,10 @@
 %{_libdir}/python*/site-packages/beagle.so
 
 %changelog
+* Tue Aug 15 2006 Matthias Clasen <mclasen at redhat.com> - 0.2.7-9.fc6
+- Hide keybinding in beagle-settings, since the global
+  search keybinding works.  (#201424)
+
 * Fri Aug 11 2006 Alexander Larsson <alexl at redhat.com> - 0.2.7-8
 - Split out gui and evolution
 - Pre-require shadow-utils that fixes the group bug