rpms/gnome-panel/devel gnome-panel-2.15.91-use-beagle.patch, NONE, 1.1 gnome-panel.spec, 1.142, 1.143

[fedora-cvs-commits at redhat.com]

Author: alexl

Update of /cvs/dist/rpms/gnome-panel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23737

Modified Files:
	gnome-panel.spec 
Added Files:
	gnome-panel-2.15.91-use-beagle.patch 
Log Message:
* Fri Aug 15 2006 Alexander Larsson <alexl at redhat.com> - 2.15.91-2.fc6
- Also use beagle for search actions (#201424)



gnome-panel-2.15.91-use-beagle.patch:
 panel-action-button.c |   15 +++++++++++----
 panel-menu-items.c    |   12 +++++++++---
 2 files changed, 20 insertions(+), 7 deletions(-)

--- NEW FILE gnome-panel-2.15.91-use-beagle.patch ---
--- gnome-panel-2.15.91/gnome-panel/panel-menu-items.c.use-beagle	2006-08-15 14:43:43.000000000 +0200
+++ gnome-panel-2.15.91/gnome-panel/panel-menu-items.c	2006-08-15 14:43:43.000000000 +0200
@@ -615,9 +615,15 @@
 
 	add_menu_separator (places_menu);
 
-	panel_menu_items_append_from_desktop (places_menu,
-					      "gnome-search-tool.desktop",
-					      NULL);
+        if (panel_is_program_in_path ("beagle-search")) {
+              panel_menu_items_append_from_desktop (places_menu,
+                                                    "gnome-beagle-search.desktop",
+                                                    NULL);
+        } else {
+              panel_menu_items_append_from_desktop (places_menu,
+                                                    "gnome-search-tool.desktop",
+                                                    NULL);
+        }
 
 	panel_recent_append_documents_menu (places_menu,
 					    place_item->priv->recent_manager);
--- gnome-panel-2.15.91/gnome-panel/panel-action-button.c.use-beagle	2006-08-07 23:07:46.000000000 +0200
+++ gnome-panel-2.15.91/gnome-panel/panel-action-button.c	2006-08-15 14:46:11.000000000 +0200
@@ -191,10 +191,17 @@
 	GError    *error = NULL;
 
 	screen = gtk_widget_get_screen (widget);
-	panel_launch_desktop_file ("gnome-search-tool.desktop",
-				   "gnome-search-tool",
-				   screen,
-				   &error);
+        if (panel_is_program_in_path ("beagle-search")) {
+		panel_launch_desktop_file ("gnome-beagle-search.desktop",
+					   "beagle-search",
+					   screen,
+					   &error);
+	} else {
+		panel_launch_desktop_file ("gnome-search-tool.desktop",
+					   "gnome-search-tool",
+					   screen,
+					   &error);
+	}
 	if (error) {
 		char *primary;
 		primary = g_strdup_printf (_("Could not execute '%s'"),


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- gnome-panel.spec	13 Aug 2006 06:06:34 -0000	1.142
+++ gnome-panel.spec	15 Aug 2006 13:25:08 -0000	1.143
@@ -20,7 +20,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.15.91
-Release: 1%{?dist} 
+Release: 2%{?dist} 
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -73,7 +73,7 @@
 Patch2: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
 Patch5: gnome-panel-2.12.1-about-fedora.patch
 Patch6: gnome-panel-2.13.5-switch-user.patch
-Patch8: gnome-panel-2.13.90-use-beagle.patch
+Patch8: gnome-panel-2.15.91-use-beagle.patch
 Patch9: gnome-panel-2.13.91-ignore-unknown-options.patch
 Patch10: gnome-panel-2.14.1-remove-duplicate-entry.patch
 # support transparent background in the notification area
@@ -229,6 +229,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Fri Aug 15 2006 Alexander Larsson <alexl at redhat.com> - 2.15.91-2.fc6
+- Also use beagle for search actions (#201424)
+
 * Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-1.fc6
 - Update to 2.15.91