rpms/gnome-panel/devel gnome-panel-2.25.3-search.patch,1.2,1.3

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18183

Modified Files:
	gnome-panel-2.25.3-search.patch 
Log Message:
- Fix search patch again


gnome-panel-2.25.3-search.patch:

Index: gnome-panel-2.25.3-search.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel-2.25.3-search.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-panel-2.25.3-search.patch	18 Dec 2008 18:39:25 -0000	1.2
+++ gnome-panel-2.25.3-search.patch	18 Dec 2008 19:04:10 -0000	1.3
@@ -81,32 +81,23 @@
 ===================================================================
 --- gnome-panel/panel-action-button.c	(revision 11419)
 +++ gnome-panel/panel-action-button.c	(working copy)
-@@ -218,11 +218,28 @@
- panel_action_search (GtkWidget *widget)
- {
+@@ -220,9 +220,19 @@
  	GdkScreen *screen;
-+	const gchar *prog;
  
  	screen = gtk_widget_get_screen (widget);
 -	panel_launch_desktop_file_with_fallback ("gnome-search-tool.desktop",
 -						 "gnome-search-tool",
 -						 screen, NULL);
 +	if (panel_has_desktop_file ("gnome-beagle-search.desktop")) {
-+		prog = "beagle-search";
 +		panel_launch_desktop_file ("gnome-beagle-search.desktop",
-+					   "beagle-search",
 +					   screen,
 +					   NULL);
 +	} else if (panel_has_desktop_file ("fedora-tracker-search-tool.desktop")) {
-+		prog = "tracker-search-tool";
 +		panel_launch_desktop_file ("fedora-tracker-search-tool.desktop",
-+					   "tracker-search-tool",
 +					   screen,
 +					   NULL);
 +	} else {
-+		prog = "gnome-search-tool";
 +		panel_launch_desktop_file ("gnome-search-tool.desktop",
-+					   "gnome-search-tool",
 +					   screen,
 +					   NULL);
 +	}