Hello community, here is the log from the commit of package nautilus checked in at Tue May 23 01:20:51 CEST 2006. -------- --- GNOME/nautilus/nautilus.changes 2006-05-17 19:29:25.000000000 +0200 +++ nautilus/nautilus.changes 2006-05-23 00:17:42.000000000 +0200 @@ -1,0 +2,14 @@ +Tue May 23 00:17:28 CEST 2006 - federico@novell.com + +- Updated nautilus-158158-ignore-foreign-desktop-files.diff to fix + https://bugzilla.novell.com/show_bug.cgi?id=177777. All .desktop + files were being filtered erroneously if they didn't have + OnlyShowIn/NotShowIn keys. + +------------------------------------------------------------------- +Mon May 22 22:34:54 CEST 2006 - joeshaw@suse.de + +- Only patch in the nautilus-search.desktop file on SL, not SLE, + since the new main menu has search built-in. (bnc #177551) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nautilus.spec ++++++ --- /var/tmp/diff_new_pack.0cdbTd/_old 2006-05-23 01:19:45.000000000 +0200 +++ /var/tmp/diff_new_pack.0cdbTd/_new 2006-05-23 01:19:45.000000000 +0200 @@ -18,7 +18,7 @@ Group: Productivity/File utilities Autoreqprov: on Version: 2.12.2 -Release: 69 +Release: 70 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 @@ -86,7 +86,9 @@ %patch13 -p0 %patch20 -p1 %patch23 -p1 +%if ! %sles_version %patch24 +%endif %patch25 -p1 %patch27 -p1 %patch28 -p1 @@ -193,6 +195,14 @@ %{prefix}/%_lib/pkgconfig/*.pc %changelog -n nautilus +* Tue May 23 2006 - federico@novell.com +- Updated nautilus-158158-ignore-foreign-desktop-files.diff to fix + https://bugzilla.novell.com/show_bug.cgi?id=177777. All .desktop + files were being filtered erroneously if they didn't have + OnlyShowIn/NotShowIn keys. +* Mon May 22 2006 - joeshaw@suse.de +- Only patch in the nautilus-search.desktop file on SL, not SLE, + since the new main menu has search built-in. (bnc #177551) * Wed May 17 2006 - sbrabec@suse.cz - nautilus-search-bar.c added to POTFILES.in. * Wed May 17 2006 - sbrabec@suse.cz ++++++ nautilus-158158-ignore-foreign-desktop-files.diff ++++++ --- /var/tmp/diff_new_pack.0cdbTd/_old 2006-05-23 01:19:45.000000000 +0200 +++ /var/tmp/diff_new_pack.0cdbTd/_new 2006-05-23 01:19:45.000000000 +0200 @@ -1,3 +1,11 @@ +2006-05-22 Federico Mena Quintero <federico@novell.com> + + * libnautilus-private/nautilus-directory-async.c + (is_foreign_desktop_file): Argh, check that the OnlyShowIn / + NotShowIn strings exist before testing their contents. Fixes + https://bugzilla.novell.com/show_bug.cgi?id=177777; this was + filtering all .desktop files! + 2006-05-16 Federico Mena Quintero <federico@novell.com> * libnautilus-private/nautilus-directory-async.c @@ -75,13 +83,13 @@ + char **not_show_in; + + only_show_in = gnome_desktop_item_get_strings (ditem, GNOME_DESKTOP_ITEM_ONLY_SHOW_IN); -+ if (!string_array_contains (only_show_in, "GNOME")) { ++ if (only_show_in && !string_array_contains (only_show_in, "GNOME")) { + retval = TRUE; + } + g_strfreev (only_show_in); + + not_show_in = gnome_desktop_item_get_strings (ditem, "NotShowIn"); -+ if (string_array_contains (not_show_in, "GNOME")) { ++ if (not_show_in && string_array_contains (not_show_in, "GNOME")) { + retval = TRUE; + } + g_strfreev (not_show_in); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root＠suse.de