Hello community, here is the log from the commit of package nautilus checked in at Wed Nov 1 01:39:27 CET 2006. -------- --- GNOME/nautilus/nautilus.changes 2006-10-14 17:59:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/nautilus/nautilus.changes 2006-10-31 20:22:34.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Oct 31 20:21:44 CET 2006 - joeshaw@suse.de + +- Add a patch to ensure that the search entry bar is displayed + when navigating to the x-nautilus-search:/// URI. (bnc #212649) + +------------------------------------------------------------------- New: ---- nautilus-212649-search-bar-visibility.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nautilus.spec ++++++ --- /var/tmp/diff_new_pack.IBnLR5/_old 2006-11-01 01:39:00.000000000 +0100 +++ /var/tmp/diff_new_pack.IBnLR5/_new 2006-11-01 01:39:00.000000000 +0100 @@ -14,11 +14,11 @@ BuildRequires: cdparanoia eel-devel gnome-common gnome-patch-translation intltool libbeagle-devel libexif libgnomeui-devel libidl librsvg-devel mDNSResponder-devel perl-XML-Parser update-desktop-files %define prefix /opt/gnome %define sysconfdir /etc%{prefix} -License: GPL +License: GNU General Public License (GPL) - all versions Group: Productivity/File utilities Autoreqprov: on Version: 2.16.1 -Release: 4 +Release: 14 Summary: The GNOME 2.x Desktop File Manager Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.11/%{name}-%{version}.tar.bz2 URL: http://www.gnome.org @@ -41,6 +41,7 @@ Patch46: nautilus-142860-vfs-drive-for-extensions.diff Patch49: nautilus-172870-support-drives-and-volumes.diff Patch50: nautilus-174766-fix-lazy-positioning.diff +Patch51: nautilus-212649-search-bar-visibility.patch PreReq: filesystem gconf2 shared-mime-info Requires: gnome2-user-docs Provides: nautilus2 @@ -89,6 +90,7 @@ %patch46 -p1 #%patch49 -p1 %patch50 -p1 +%patch51 # FIXME: this code updates translation for upstreamed patches. cd po intltool-update --pot @@ -173,6 +175,9 @@ %{prefix}/%_lib/pkgconfig/*.pc %changelog -n nautilus +* Tue Oct 31 2006 - joeshaw@suse.de +- Add a patch to ensure that the search entry bar is displayed + when navigating to the x-nautilus-search:/// URI. (bnc #212649) * Sat Oct 14 2006 - danw@suse.de - Remove dead patches * Tue Oct 03 2006 - jhargadon@suse.de ++++++ nautilus-212649-search-bar-visibility.patch ++++++ This patch fixes a problem in which the search bar is not visible and it's not obvious how to search when you navigate directly to the x-nautilus-search:/// URI. This also fixes a problem in which focus is stolen away from the search bar when the window is first displayed. This is filed upstream at http://bugzilla.gnome.org/368424 Index: src/nautilus-navigation-window.c =================================================================== RCS file: /cvs/gnome/nautilus/src/nautilus-navigation-window.c,v retrieving revision 1.450 diff -u -p -u -r1.450 nautilus-navigation-window.c --- src/nautilus-navigation-window.c 2 Oct 2006 10:53:58 -0000 1.450 +++ src/nautilus-navigation-window.c 31 Oct 2006 17:53:23 -0000 @@ -1128,8 +1128,7 @@ real_set_search_mode (NautilusWindow *wi query_editor = nautilus_query_editor_new (TRUE, nautilus_search_directory_is_indexed (search_directory)); } else { - nautilus_navigation_window_show_location_bar_temporarily (nav_window); - nautilus_navigation_window_set_bar_mode (nav_window, NAUTILUS_BAR_SEARCH); + nautilus_navigation_window_show_search (nav_window); nav_window->details->temporary_search_bar = FALSE; query_editor = nautilus_query_editor_new_with_bar (FALSE, @@ -1145,7 +1144,7 @@ real_set_search_mode (NautilusWindow *wi nautilus_query_editor_set_query (NAUTILUS_QUERY_EDITOR (query_editor), query); g_object_unref (query); - }else { + } else { nautilus_query_editor_set_default_query (NAUTILUS_QUERY_EDITOR (query_editor)); } @@ -1466,16 +1465,18 @@ nautilus_navigation_window_show (GtkWidg nautilus_navigation_window_hide_toolbar (window); } - if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_LOCATION_BAR)) { - nautilus_navigation_window_show_location_bar (window, FALSE); - } else { - nautilus_navigation_window_hide_location_bar (window, FALSE); - } - - if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_ALWAYS_USE_LOCATION_ENTRY)) { - nautilus_navigation_window_set_bar_mode (window, NAUTILUS_BAR_NAVIGATION); - } else { - nautilus_navigation_window_set_bar_mode (window, NAUTILUS_BAR_PATH); + if (! nautilus_navigation_window_search_bar_showing (window)) { + if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_LOCATION_BAR)) { + nautilus_navigation_window_show_location_bar (window, FALSE); + } else { + nautilus_navigation_window_hide_location_bar (window, FALSE); + } + + if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_ALWAYS_USE_LOCATION_ENTRY)) { + nautilus_navigation_window_set_bar_mode (window, NAUTILUS_BAR_NAVIGATION); + } else { + nautilus_navigation_window_set_bar_mode (window, NAUTILUS_BAR_PATH); + } } if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_SIDEBAR)) { @@ -1491,6 +1492,11 @@ nautilus_navigation_window_show (GtkWidg } GTK_WIDGET_CLASS (parent_class)->show (widget); + + /* Lame hack to ensure that the icon view doesn't steal the focus away */ + if (nautilus_navigation_window_search_bar_showing (window)) { + nautilus_search_bar_grab_focus (NAUTILUS_SEARCH_BAR (window->search_bar)); + } } static void ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org