diff options
author | Bastien Nocera <hadess@fedoraproject.org> | 2008-12-18 17:15:19 +0000 |
---|---|---|
committer | Bastien Nocera <hadess@fedoraproject.org> | 2008-12-18 17:15:19 +0000 |
commit | f6a2de691b22dd55b635feff9b08069be3822784 (patch) | |
tree | fa410d8d51108e53b64ba35e5c7a947cbb00c056 | |
parent | 2d5fc97ab1beeb6d1be9555974da2dbc6fa09311 (diff) | |
download | gnome-panel-f6a2de691b22dd55b635feff9b08069be3822784.tar.gz gnome-panel-f6a2de691b22dd55b635feff9b08069be3822784.tar.xz gnome-panel-f6a2de691b22dd55b635feff9b08069be3822784.zip |
- Update search patch
-rw-r--r-- | gnome-panel-2.25.3-search.patch (renamed from gnome-panel-2.16.1-search.patch) | 156 | ||||
-rw-r--r-- | gnome-panel.spec | 5 |
2 files changed, 83 insertions, 78 deletions
diff --git a/gnome-panel-2.16.1-search.patch b/gnome-panel-2.25.3-search.patch index e59ebd7..76b760d 100644 --- a/gnome-panel-2.16.1-search.patch +++ b/gnome-panel-2.25.3-search.patch @@ -1,46 +1,49 @@ ---- gnome-panel-2.16.1/gnome-panel/panel-action-button.c.use-beagle 2006-08-07 17:07:46.000000000 -0400 -+++ gnome-panel-2.16.1/gnome-panel/panel-action-button.c 2006-11-21 08:46:10.000000000 -0500 -@@ -189,16 +189,31 @@ - { - GdkScreen *screen; - GError *error = NULL; -+ const gchar *prog; +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 @@ + } - screen = gtk_widget_get_screen (widget); -- panel_launch_desktop_file ("gnome-search-tool.desktop", -- "gnome-search-tool", -- screen, -- &error); -+ if (panel_has_desktop_file ("gnome-beagle-search.desktop")) { -+ prog = "beagle-search"; -+ panel_launch_desktop_file ("gnome-beagle-search.desktop", -+ "beagle-search", -+ screen, -+ &error); -+ } 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, -+ &error); -+ } else { -+ prog = "gnome-search-tool"; -+ panel_launch_desktop_file ("gnome-search-tool.desktop", -+ "gnome-search-tool", -+ screen, -+ &error); + 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; + } - if (error) { - char *primary; -- primary = g_strdup_printf (_("Could not execute '%s'"), -- "gnome-search-tool"); -+ primary = g_strdup_printf (_("Could not execute '%s'"), prog); - panel_error_dialog (NULL, screen, - "cannot_exec_gnome-search-tool", TRUE, - primary, error->message); ---- gnome-panel-2.16.1/gnome-panel/panel-menu-items.c.use-beagle 2006-11-21 08:36:27.000000000 -0500 -+++ gnome-panel-2.16.1/gnome-panel/panel-menu-items.c 2006-11-21 08:43:40.000000000 -0500 -@@ -627,9 +627,20 @@ ++ ++ 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); @@ -60,43 +63,44 @@ + "gnome-search-tool.desktop", + NULL); + } -+ ++ panel_recent_append_documents_menu (places_menu, place_item->priv->recent_manager); ---- gnome-panel-2.16.1/gnome-panel/panel-util.h.use-beagle 2006-11-21 08:46:52.000000000 -0500 -+++ gnome-panel-2.16.1/gnome-panel/panel-util.h 2006-11-21 08:47:28.000000000 -0500 -@@ -16,6 +16,7 @@ - GList *file_list, - GdkScreen *screen, - GError **error); -+gboolean panel_has_desktop_file (const char *desktop_file); - void panel_launch_desktop_file (const char *desktop_file, - const char *fallback_exec, - GdkScreen *screen, ---- gnome-panel-2.16.1/gnome-panel/panel-util.c.use-beagle 2006-11-21 08:46:59.000000000 -0500 -+++ gnome-panel-2.16.1/gnome-panel/panel-util.c 2006-11-21 08:47:54.000000000 -0500 -@@ -96,6 +96,23 @@ - gnome_desktop_item_unref (ditem); - } -+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; +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); + } -+ -+ return FALSE; -+} -+ - void - panel_launch_desktop_file (const char *desktop_file, - const char *fallback_exec, + } + + /* Force Quit diff --git a/gnome-panel.spec b/gnome-panel.spec index 12db061..16b6aa5 100644 --- a/gnome-panel.spec +++ b/gnome-panel.spec @@ -93,7 +93,7 @@ BuildRequires: gettext-devel 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 @@ Panel Applets using the libpanel-applet library. %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 @@ fi %changelog * Thu Dec 18 2008 - Bastien Nocera <bnocera@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@redhat.com> - 2.25.3-2 - Update to 2.25.3 |