Hello community, here is the log from the commit of package control-center2 checked in at Fri Jun 2 10:23:25 CEST 2006. -------- --- GNOME/control-center2/control-center2.changes 2006-05-29 22:15:27.000000000 +0200 +++ control-center2/control-center2.changes 2006-06-02 07:20:49.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jun 2 07:20:06 CEST 2006 - hpj@suse.de + +- Updated the search patch to fall back to gnome-search-tool if + Beagle can't be found. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ control-center2.spec ++++++ --- /var/tmp/diff_new_pack.7yNwL2/_old 2006-06-02 10:20:44.000000000 +0200 +++ /var/tmp/diff_new_pack.7yNwL2/_new 2006-06-02 10:20:44.000000000 +0200 @@ -21,7 +21,7 @@ Obsoletes: fontilus themus acme Provides: fontilus themus acme Version: 2.12.2 -Release: 65 +Release: 67 Summary: The GNOME Control Center for the GNOME 2.x Desktop Source: %{_name}-%{version}.tar.bz2 Source1: control-center-art.tar.bz2 @@ -240,6 +240,9 @@ %{prefix}/share/idl/*.idl %changelog -n control-center2 +* Fri Jun 02 2006 - hpj@suse.de +- Updated the search patch to fall back to gnome-search-tool if + Beagle can't be found. * Mon May 29 2006 - hpj@suse.de - Add patch to invoke Beagle on "search" keybinding. Fixes Novell bug #132801. ++++++ control-center-2.12.2-beagle-search-hotkey.patch ++++++ --- /var/tmp/diff_new_pack.7yNwL2/_old 2006-06-02 10:20:44.000000000 +0200 +++ /var/tmp/diff_new_pack.7yNwL2/_new 2006-06-02 10:20:44.000000000 +0200 @@ -1,12 +1,34 @@ diff -Nurp control-center-2.12.2-pre/gnome-settings-daemon/gnome-settings-multimedia-keys.c control-center-2.12.2-post/gnome-settings-daemon/gnome-settings-multimedia-keys.c --- control-center-2.12.2-pre/gnome-settings-daemon/gnome-settings-multimedia-keys.c 2005-07-25 06:55:59.000000000 -0500 -+++ control-center-2.12.2-post/gnome-settings-daemon/gnome-settings-multimedia-keys.c 2006-05-26 16:19:36.000000000 -0500 -@@ -822,7 +822,7 @@ do_action (Acme *acme, int type) ++++ control-center-2.12.2-post/gnome-settings-daemon/gnome-settings-multimedia-keys.c 2006-06-01 21:25:45.000000000 -0500 +@@ -45,6 +45,10 @@ + #include "actions/acme.h" + #include "actions/acme-volume.h" + ++/* Potential search shortcut helpers */ ++#define SEARCH_EXECUTABLE_BEAGLE "beagle-search" ++#define SEARCH_EXECUTABLE_GNOME_SEARCH_TOOL "gnome-search-tool" ++ + #define DIALOG_TIMEOUT 1000 /* dialog timeout in ms */ + #define VOLUME_STEP 6 /* percents for one volume button press */ + +@@ -822,7 +826,18 @@ do_action (Acme *acme, int type) execute ("nautilus", FALSE); break; case SEARCH_KEY: - execute ("gnome-search-tool", FALSE); -+ execute ("beagle-search", FALSE); ++ { ++ gchar *path; ++ ++ path = g_find_program_in_path (SEARCH_EXECUTABLE_BEAGLE); ++ ++ if (path != NULL) { ++ execute (path, FALSE); ++ g_free (path); ++ } else { ++ execute (SEARCH_EXECUTABLE_GNOME_SEARCH_TOOL, FALSE); ++ } ++ } break; case EMAIL_KEY: do_mail_action (acme); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org