Hello community, here is the log from the commit of package nautilus checked in at Wed Apr 19 00:54:52 CEST 2006. -------- --- GNOME/nautilus/nautilus.changes 2006-04-18 22:58:30.000000000 +0200 +++ STABLE/nautilus/nautilus.changes 2006-04-19 00:27:10.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Apr 19 00:26:50 CEST 2006 - federico@suse.de + +- Removed dot-hidden.dif. This fixes bug #158158 completely; that + patch is obsoleted by the updated + nautilus-158158-ignore-foreign-desktop-files.diff. + +------------------------------------------------------------------- Old: ---- dot-hidden.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nautilus.spec ++++++ --- /var/tmp/diff_new_pack.SZpG7e/_old 2006-04-19 00:54:36.000000000 +0200 +++ /var/tmp/diff_new_pack.SZpG7e/_new 2006-04-19 00:54:36.000000000 +0200 @@ -18,7 +18,7 @@ Group: Productivity/File utilities Autoreqprov: on Version: 2.12.2 -Release: 49 +Release: 50 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 @@ -28,7 +28,6 @@ Patch12: nautilus-hide-desktop-files.patch Patch13: nautilus-name-length.patch Patch20: nautilus-onlyshowin.patch -Patch22: dot-hidden.dif Patch23: nautilus-search-20060414.patch Patch24: nautilus-search-desktop.patch Patch25: nautilus-submount.patch @@ -81,7 +80,6 @@ %patch12 -p0 %patch13 -p0 %patch20 -p1 -%patch22 -p1 %patch23 -p1 %patch24 %patch25 -p1 @@ -185,6 +183,10 @@ %{prefix}/%_lib/pkgconfig/*.pc %changelog -n nautilus +* Wed Apr 19 2006 - federico@suse.de +- Removed dot-hidden.dif. This fixes bug #158158 completely; that + patch is obsoleted by the updated + nautilus-158158-ignore-foreign-desktop-files.diff. * Tue Apr 18 2006 - federico@novell.com - Added nautilus-158158-ignore-foreign-desktop-files.diff to fix https://bugzilla.novell.com/show_bug.cgi?id=158158. This makes ++++++ nautilus-158158-ignore-foreign-desktop-files.diff ++++++ --- /var/tmp/diff_new_pack.SZpG7e/_old 2006-04-19 00:54:36.000000000 +0200 +++ /var/tmp/diff_new_pack.SZpG7e/_new 2006-04-19 00:54:36.000000000 +0200 @@ -11,6 +11,10 @@ (directory_load_one): Use is_foreign_desktop_file(), and skip .desktop files which belong to other desktop environments. + * src/nautilus-application.c (remove_desktop_dot_hidden): + Unlink ~/Desktop/.hidden, which was a Suse hack. + (finish_startup): Call remove_desktop_dot_hidden(). + --- nautilus-2.12.2.orig/libnautilus-private/nautilus-directory-async.c 2006-04-05 17:17:10.000000000 -0500 +++ nautilus-2.12.2/libnautilus-private/nautilus-directory-async.c 2006-04-18 14:27:04.000000000 -0500 @@ -923,12 +923,55 @@ @@ -70,3 +74,61 @@ return; } +--- nautilus/src/nautilus-application.c.orig 2006-04-18 16:55:47.000000000 -0500 ++++ nautilus/src/nautilus-application.c 2006-04-18 17:06:47.000000000 -0500 +@@ -357,6 +357,45 @@ migrate_old_nautilus_files (void) + g_free (migrated_file); + } + ++/* Suse had a hack in Nautilus (dot-hidden.dif) that would create a ++ * ~/Desktop/hidden file with the following entries, in order to skip ++ * launchers created by KDE: ++ * ++ * myComputer.desktop ++ * Printer.desktop ++ * Network.desktop ++ * SuSE.desktop ++ * MozillaFirefox.desktop ++ * Office.desktop ++ * trash.desktop ++ * ++ * This was a hack around https://bugzilla.novell.com/show_bug.cgi?id=58875, but ++ * it creates problems: people like to drag a MozillaFirefox.desktop to their ++ * desktop, and it would be ignored due to that patch. ++ * ++ * So, now we unlink() the ~/Desktop/.hidden file under the rationale that that ++ * folder is under your complete control --- if you don't want to see a file in ++ * there, you can just delete it. ++ * ++ * The .desktop files for KDE launchers should have "OnlyShowIn=KDE" in them; ++ * now we support this properly. See ++ * https://bugzilla.novell.com/show_bug.cgi?id=158158 for this. ++ */ ++static void ++remove_desktop_dot_hidden (void) ++{ ++ char *desktop_dir; ++ char *dot_hidden; ++ ++ desktop_dir = nautilus_get_desktop_directory (); ++ dot_hidden = g_build_filename (desktop_dir, ".hidden", NULL); ++ ++ unlink (dot_hidden); ++ ++ g_free (desktop_dir); ++ g_free (dot_hidden); ++} ++ + static void + finish_startup (NautilusApplication *application) + { +@@ -371,6 +410,9 @@ finish_startup (NautilusApplication *app + /* Make the desktop work with old Nautilus. */ + migrate_old_nautilus_files (); + ++ /* Remove artifact from the old dot-hidden.dif patch in Suse */ ++ remove_desktop_dot_hidden (); ++ + /* Initialize the desktop link monitor singleton */ + nautilus_desktop_link_monitor_get (); + } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...