rpms/gnome-panel/devel gnome-panel-2.25.3-search.patch, NONE, 1.1 gnome-panel.spec, 1.336, 1.337 gnome-panel-2.16.1-search.patch, 1.2, NONE

[Bastien Nocera]

Author: hadess

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

Modified Files:
	gnome-panel.spec 
Added Files:
	gnome-panel-2.25.3-search.patch 
Removed Files:
	gnome-panel-2.16.1-search.patch 
Log Message:
- Update search patch


gnome-panel-2.25.3-search.patch:

--- NEW FILE gnome-panel-2.25.3-search.patch ---
Index: gnome-panel/libpanel-util/panel-launch.c
===================================================================
--- gnome-panel/libpanel-util/panel-launch.c	(revision 11419)
+++ gnome-panel/libpanel-util/panel-launch.c	(working copy)
@@ -201,6 +201,23 @@
 }
 
 gboolean
+panel_has_desktop_file (const char  *desktop_file)
+{
+	GnomeDesktopItem *ditem;
+
+	if (g_path_is_absolute (desktop_file))
+		ditem = gnome_desktop_item_new_from_file (desktop_file, 0, NULL);
+	else
+		ditem = gnome_desktop_item_new_from_basename (desktop_file, 0, NULL);
+	if (ditem != NULL) {
+		gnome_desktop_item_unref (ditem);
+		return TRUE;
+	}
+
+	return FALSE;	
+}
+
+gboolean
 panel_launch_desktop_file_with_fallback (const char  *desktop_file,
 					 const char  *fallback_exec,
 					 GdkScreen   *screen,
Index: gnome-panel/libpanel-util/panel-launch.h
===================================================================
--- gnome-panel/libpanel-util/panel-launch.h	(revision 11419)
+++ gnome-panel/libpanel-util/panel-launch.h	(working copy)
@@ -47,6 +47,8 @@
 				GdkScreen  *screen,
 				GError    **error);
 
+gboolean panel_has_desktop_file (const char *desktop_file);
+
 gboolean panel_launch_desktop_file (const char  *desktop_file,
 				    GdkScreen   *screen,
 				    GError     **error);
Index: gnome-panel/panel-menu-items.c
===================================================================
--- gnome-panel/panel-menu-items.c	(revision 11420)
+++ gnome-panel/panel-menu-items.c	(working copy)
@@ -1004,10 +1004,21 @@
 
 	add_menu_separator (places_menu);
 
-	panel_menu_items_append_from_desktop (places_menu,
-					      "gnome-search-tool.desktop",
-					      NULL);
+        if (panel_has_desktop_file ("gnome-beagle-search.desktop")) {
+              panel_menu_items_append_from_desktop (places_menu,
+                                                    "gnome-beagle-search.desktop",
+                                                    NULL);
+	} else if (panel_has_desktop_file ("fedora-tracker-search-tool.desktop")) {
+              panel_menu_items_append_from_desktop (places_menu,
+                                                    "fedora-tracker-search-tool.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);
 
Index: gnome-panel/panel-action-button.c
===================================================================
--- 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)
 {
 	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);
+	}
 }
 
 /* Force Quit


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -r1.336 -r1.337
--- gnome-panel.spec	18 Dec 2008 15:52:04 -0000	1.336
+++ gnome-panel.spec	18 Dec 2008 17:15:19 -0000	1.337
@@ -93,7 +93,7 @@
 Patch0: gnome-panel-2.23.4-vendor.patch
 Patch1: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
 Patch2: gnome-panel-2.17.91-about-fedora.patch
-Patch4: gnome-panel-2.16.1-search.patch
+Patch4: gnome-panel-2.25.3-search.patch
 # Drop this patch for now, it should have AT LEAST been moved
 # to an upstream bugzilla by now
 #Patch6: gnome-panel-2.16.0-compiz-support.patch
@@ -160,7 +160,7 @@
 %patch0 -p1 -b .vendor
 %patch1 -p1 -b .speak-to-us-ye-old-wise-fish
 %patch2 -p1 -b .about-fedora
-%patch4 -p1 -b .search
+%patch4 -p0 -b .search
 ##%patch6 -p0 -b .compiz-support
 %patch7 -p1 -b .about-this-computer
 %patch8 -p1 -b .launcher-desktop-files
@@ -375,6 +375,7 @@
 %changelog
 * Thu Dec 18 2008 - Bastien Nocera <bnocera at redhat.com> - 2.25.3-3
 - Remove the mixer from the default panel config as well
+- Update search patch
 
 * Wed Dec 17 2008 Matthias Clasen <mclasen at redhat.com> - 2.25.3-2
 - Update to 2.25.3


--- gnome-panel-2.16.1-search.patch DELETED ---