Hello community, here is the log from the commit of package nautilus checked in at Mon Oct 27 17:03:23 CET 2008. -------- --- GNOME/nautilus/nautilus.changes 2008-09-25 23:57:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/nautilus/nautilus.changes 2008-10-21 21:42:15.000000000 +0200 @@ -1,0 +2,24 @@ +Tue Oct 21 14:15:25 CDT 2008 - maw@suse.de + +- Update to version 2.24.1: + + Fix saving of spatial window geometry on close + + Remove trailing spaces on filenames when copying to FAT file + systems + + Allow emblems that don't start with "emblem-" + + On unmount close tabs that show the unmounted location + + Fixed redraw issues with labels on zoom + + Don't toggle sidebar splitter when dragging it + + Fix bookmark issue that sometimes led to locations not loading + + Don't show the "cancel" dialog after a timeout when displaying a dialog + + Fix crashes and leaks +- Respin nautilus-bnc366100-bgo338933-ignore-foreign-desktop-files.diff. + +------------------------------------------------------------------- +Tue Oct 21 11:26:00 CDT 2008 - federico@novell.com + +- Updated nautilus-sysadmin-desktop-items.diff to fix + https://bugzilla.novell.com/show_bug.cgi?id=436750 - the built-in + desktop links like Home, Trash, and volumes were not being shown at + all. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- nautilus-2.24.0.tar.bz2 New: ---- nautilus-2.24.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nautilus.spec ++++++ --- /var/tmp/diff_new_pack.T30350/_old 2008-10-27 17:02:57.000000000 +0100 +++ /var/tmp/diff_new_pack.T30350/_new 2008-10-27 17:02:57.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package nautilus (Version 2.24.0) +# spec file for package nautilus (Version 2.24.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -40,7 +40,7 @@ BuildRequires: update-desktop-files License: GPL v2 or later Group: Productivity/File utilities -Version: 2.24.0 +Version: 2.24.1 Release: 1 Summary: The GNOME 2.x Desktop File Manager Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.20/%{name}-%{version}.tar.bz2 @@ -211,6 +211,24 @@ %{_datadir}/gtk-doc/html/libnautilus-extension %changelog +* Tue Oct 21 2008 maw@suse.de +- Update to version 2.24.1: + + Fix saving of spatial window geometry on close + + Remove trailing spaces on filenames when copying to FAT file + systems + + Allow emblems that don't start with "emblem-" + + On unmount close tabs that show the unmounted location + + Fixed redraw issues with labels on zoom + + Don't toggle sidebar splitter when dragging it + + Fix bookmark issue that sometimes led to locations not loading + + Don't show the "cancel" dialog after a timeout when displaying a dialog + + Fix crashes and leaks +- Respin nautilus-bnc366100-bgo338933-ignore-foreign-desktop-files.diff. +* Tue Oct 21 2008 federico@novell.com +- Updated nautilus-sysadmin-desktop-items.diff to fix + https://bugzilla.novell.com/show_bug.cgi?id=436750 - the built-in + desktop links like Home, Trash, and volumes were not being shown at + all. * Thu Sep 25 2008 federico@novell.com - Removed nautilus-bnc368446-network-in-places.patch to fix https://bugzilla.novell.com/show_bug.cgi?id=428968 - the Places ++++++ nautilus-2.24.0.tar.bz2 -> nautilus-2.24.1.tar.bz2 ++++++ ++++ 43559 lines of diff (skipped) ++++++ nautilus-bnc366100-bgo338933-ignore-foreign-desktop-files.diff ++++++ --- /var/tmp/diff_new_pack.T30350/_old 2008-10-27 17:03:05.000000000 +0100 +++ /var/tmp/diff_new_pack.T30350/_new 2008-10-27 17:03:05.000000000 +0100 @@ -24,10 +24,10 @@ (nautilus_file_should_show): Don't show foreign links in the desktop directory. -Index: nautilus-2.23.4/libnautilus-private/nautilus-directory-async.c +Index: nautilus-2.24.1/libnautilus-private/nautilus-directory-async.c =================================================================== ---- nautilus-2.23.4.orig/libnautilus-private/nautilus-directory-async.c -+++ nautilus-2.23.4/libnautilus-private/nautilus-directory-async.c +--- nautilus-2.24.1.orig/libnautilus-private/nautilus-directory-async.c ++++ nautilus-2.24.1/libnautilus-private/nautilus-directory-async.c @@ -199,7 +199,8 @@ static void link_info_done const char *uri, const char *name, @@ -67,13 +67,13 @@ } @@ -3622,6 +3625,7 @@ link_info_got_data (NautilusDirectory *d { - char *uri, *name, *icon; + char *link_uri, *uri, *name, *icon; gboolean is_launcher; + gboolean is_foreign; nautilus_directory_ref (directory); -@@ -3629,17 +3633,18 @@ link_info_got_data (NautilusDirectory *d +@@ -3629,19 +3633,20 @@ link_info_got_data (NautilusDirectory *d name = NULL; icon = NULL; is_launcher = FALSE; @@ -81,9 +81,11 @@ /* Handle the case where we read the Nautilus link. */ if (result) { - nautilus_link_get_link_info_given_file_contents (file_contents, bytes_read, + link_uri = nautilus_file_get_uri (file); + nautilus_link_get_link_info_given_file_contents (file_contents, bytes_read, link_uri, - &uri, &name, &icon, &is_launcher); + &uri, &name, &icon, &is_launcher, &is_foreign); + g_free (link_uri); } else { /* FIXME bugzilla.gnome.org 42433: We should report this error to the user. */ } @@ -94,7 +96,7 @@ nautilus_file_changed (file); nautilus_file_unref (file); -@@ -3727,7 +3732,7 @@ link_info_start (NautilusDirectory *dire +@@ -3729,7 +3734,7 @@ link_info_start (NautilusDirectory *dire /* If it's not a link we are done. If it is, we need to read it. */ if (!nautilus_style_link) { @@ -103,11 +105,11 @@ } else if (should_read_link_info_sync (file)) { result = g_file_load_contents (location, NULL, &file_contents, &file_size, NULL, NULL); link_info_got_data (directory, file, result, file_size, file_contents); -Index: nautilus-2.23.4/libnautilus-private/nautilus-file-private.h +Index: nautilus-2.24.1/libnautilus-private/nautilus-file-private.h =================================================================== ---- nautilus-2.23.4.orig/libnautilus-private/nautilus-file-private.h -+++ nautilus-2.23.4/libnautilus-private/nautilus-file-private.h -@@ -191,6 +191,7 @@ struct NautilusFileDetails +--- nautilus-2.24.1.orig/libnautilus-private/nautilus-file-private.h ++++ nautilus-2.24.1/libnautilus-private/nautilus-file-private.h +@@ -198,6 +198,7 @@ struct NautilusFileDetails eel_boolean_bit has_open_window : 1; eel_boolean_bit is_launcher : 1; @@ -115,11 +117,11 @@ eel_boolean_bit is_symlink : 1; eel_boolean_bit is_mountpoint : 1; eel_boolean_bit is_hidden : 1; -Index: nautilus-2.23.4/libnautilus-private/nautilus-file.c +Index: nautilus-2.24.1/libnautilus-private/nautilus-file.c =================================================================== ---- nautilus-2.23.4.orig/libnautilus-private/nautilus-file.c -+++ nautilus-2.23.4/libnautilus-private/nautilus-file.c -@@ -323,6 +323,7 @@ nautilus_file_clear_info (NautilusFile * +--- nautilus-2.24.1.orig/libnautilus-private/nautilus-file.c ++++ nautilus-2.24.1/libnautilus-private/nautilus-file.c +@@ -332,6 +332,7 @@ nautilus_file_clear_info (NautilusFile * file->details->thumbnailing_failed = FALSE; file->details->is_launcher = FALSE; @@ -127,7 +129,7 @@ file->details->is_symlink = FALSE; file->details->is_hidden = FALSE; file->details->is_backup = FALSE; -@@ -2731,7 +2732,10 @@ nautilus_file_should_show (NautilusFile +@@ -2791,7 +2792,10 @@ nautilus_file_should_show (NautilusFile if (nautilus_file_is_in_trash (file)) { return TRUE; } else { @@ -139,7 +141,7 @@ (show_backup || !nautilus_file_is_backup_file (file)); } } -@@ -3080,6 +3084,12 @@ nautilus_file_is_launcher (NautilusFile +@@ -3196,6 +3200,12 @@ nautilus_file_is_launcher (NautilusFile } gboolean @@ -152,11 +154,11 @@ nautilus_file_has_activation_uri (NautilusFile *file) { return file->details->activation_location != NULL; -Index: nautilus-2.23.4/libnautilus-private/nautilus-file.h +Index: nautilus-2.24.1/libnautilus-private/nautilus-file.h =================================================================== ---- nautilus-2.23.4.orig/libnautilus-private/nautilus-file.h -+++ nautilus-2.23.4/libnautilus-private/nautilus-file.h -@@ -380,6 +380,7 @@ GList *nautilus_file_li +--- nautilus-2.24.1.orig/libnautilus-private/nautilus-file.h ++++ nautilus-2.24.1/libnautilus-private/nautilus-file.h +@@ -397,6 +397,7 @@ GList *nautilus_file_li * Getting this can require reading the contents of the file. */ gboolean nautilus_file_is_launcher (NautilusFile *file); @@ -164,34 +166,35 @@ gboolean nautilus_file_has_activation_uri (NautilusFile *file); char * nautilus_file_get_activation_uri (NautilusFile *file); GFile * nautilus_file_get_activation_location (NautilusFile *file); -Index: nautilus-2.23.4/libnautilus-private/nautilus-link.c +Index: nautilus-2.24.1/libnautilus-private/nautilus-link.c =================================================================== ---- nautilus-2.23.4.orig/libnautilus-private/nautilus-link.c -+++ nautilus-2.23.4/libnautilus-private/nautilus-link.c -@@ -406,16 +406,36 @@ nautilus_link_local_get_link_uri (const +--- nautilus-2.24.1.orig/libnautilus-private/nautilus-link.c ++++ nautilus-2.24.1/libnautilus-private/nautilus-link.c +@@ -430,6 +430,23 @@ nautilus_link_local_get_link_uri (const return retval; } +static gboolean +string_array_contains (char **array, -+ const char *str) ++ const char *str) +{ -+ char **p; -+ -+ if (!array) -+ return FALSE; -+ -+ for (p = array; *p; p++) -+ if (g_ascii_strcasecmp (*p, str) == 0) { -+ return TRUE; -+ } -+ -+ return FALSE; ++ char **p; ++ ++ if (!array) ++ return FALSE; ++ ++ for (p = array; *p; p++) ++ if (g_ascii_strcasecmp (*p, str) == 0) { ++ return TRUE; ++ } ++ ++ return FALSE; +} + void nautilus_link_get_link_info_given_file_contents (const char *file_contents, int link_file_size, +@@ -437,10 +454,13 @@ nautilus_link_get_link_info_given_file_c char **uri, char **name, char **icon, @@ -206,7 +209,7 @@ if (!is_link_data (file_contents, link_file_size)) { return; -@@ -437,7 +457,20 @@ nautilus_link_get_link_info_given_file_c +@@ -464,7 +484,20 @@ nautilus_link_get_link_info_given_file_c gnome_desktop_item_get_string (desktop_file, "Exec") != NULL) { *is_launcher = TRUE; } @@ -228,11 +231,11 @@ gnome_desktop_item_unref (desktop_file); } -Index: nautilus-2.23.4/libnautilus-private/nautilus-link.h +Index: nautilus-2.24.1/libnautilus-private/nautilus-link.h =================================================================== ---- nautilus-2.23.4.orig/libnautilus-private/nautilus-link.h -+++ nautilus-2.23.4/libnautilus-private/nautilus-link.h -@@ -46,7 +46,8 @@ void nautilus_link_get_link_ +--- nautilus-2.24.1.orig/libnautilus-private/nautilus-link.h ++++ nautilus-2.24.1/libnautilus-private/nautilus-link.h +@@ -47,7 +47,8 @@ void nautilus_link_get_link_ char **uri, char **name, char **icon, ++++++ nautilus-sysadmin-desktop-items.diff ++++++ ++++ 658 lines (skipped) ++++ between GNOME/nautilus/nautilus-sysadmin-desktop-items.diff ++++ and /mounts/work_src_done/STABLE/nautilus/nautilus-sysadmin-desktop-items.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org