Hello community, here is the log from the commit of package nautilus checked in at Thu May 22 03:48:45 CEST 2008. -------- --- GNOME/nautilus/nautilus.changes 2008-05-01 10:36:39.000000000 +0200 +++ nautilus/nautilus.changes 2008-05-22 00:45:58.119883000 +0200 @@ -1,0 +2,10 @@ +Thu May 22 00:50:50 CEST 2008 - hpj@suse.de + +- Add nautilus-bnc393226-dont-move-to-burn.patch (bnc#393226). + +------------------------------------------------------------------- +Tue May 20 04:33:12 CEST 2008 - hpj@suse.de + +- Add nautilus-bnc376669-always-update-thumbnail.patch (bnc#376669). + +------------------------------------------------------------------- New: ---- nautilus-bnc376669-always-update-thumbnail.patch nautilus-bnc393226-dont-move-to-burn.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nautilus.spec ++++++ --- /var/tmp/diff_new_pack.v16329/_old 2008-05-22 03:43:59.000000000 +0200 +++ /var/tmp/diff_new_pack.v16329/_new 2008-05-22 03:43:59.000000000 +0200 @@ -16,7 +16,7 @@ License: GPL v2 or later Group: Productivity/File utilities Version: 2.22.2 -Release: 14 +Release: 25 Summary: The GNOME 2.x Desktop File Manager Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.20/%{name}-%{version}.tar.bz2 Url: http://www.gnome.org @@ -52,6 +52,10 @@ Patch21: nautilus-bnc368446-network-in-places.patch # PATCH-FIX-UPSTREAM nautilus-bnc-376070-null-exifdata-crash.patch bnc376070 hpj@novell.com Patch22: nautilus-bnc376070-null-exifdata-crash.patch +# PATCH-FIX-OPENSUSE nautilus-bnc376669-always-update-thumbnail.patch bnc376669 hpj@novell.com +Patch23: nautilus-bnc376669-always-update-thumbnail.patch +# PATCH-FIX-UPSTREAM nautilus-bnc393226-dont-move-to-burn.patch bgo531750 bnc393226 hpj@novell.com +Patch24: nautilus-bnc393226-dont-move-to-burn.patch Requires: gnome-icon-theme Requires: %{name}-lang = %{version} Requires: gvfs @@ -102,6 +106,8 @@ %patch20 -p1 %patch21 %patch22 -p1 +%patch23 -p1 +%patch24 -p2 gnome-patch-translation-update %build @@ -185,6 +191,10 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Thu May 22 2008 hpj@suse.de +- Add nautilus-bnc393226-dont-move-to-burn.patch (bnc#393226). +* Tue May 20 2008 hpj@suse.de +- Add nautilus-bnc376669-always-update-thumbnail.patch (bnc#376669). * Thu May 01 2008 hpj@suse.de - Removed previously disabled patches that were made obsolete by upstream changes: ++++++ nautilus-bnc376669-always-update-thumbnail.patch ++++++ diff -upr nautilus-2.22.2-pre/libnautilus-private/nautilus-directory-async.c nautilus-2.22.2-post/libnautilus-private/nautilus-directory-async.c --- nautilus-2.22.2-pre/libnautilus-private/nautilus-directory-async.c 2008-05-19 17:50:02.000000000 -0500 +++ nautilus-2.22.2-post/libnautilus-private/nautilus-directory-async.c 2008-05-19 20:12:31.000000000 -0500 @@ -3921,13 +3921,7 @@ thumbnail_start (NautilusDirectory *dire state->file = file; state->cancellable = g_cancellable_new (); - if (file->details->thumbnail_size > 128) { - state->tried_original = TRUE; - state->trying_original = TRUE; - location = nautilus_file_get_location (file); - } else { - location = g_file_new_for_path (file->details->thumbnail_path); - } + location = g_file_new_for_path (file->details->thumbnail_path); directory->details->thumbnail_state = state; ++++++ nautilus-bnc393226-dont-move-to-burn.patch ++++++ --- branches/gnome-2-22/libnautilus-private/nautilus-file-operations.c 2008/05/13 12:49:14 14159 +++ branches/gnome-2-22/libnautilus-private/nautilus-file-operations.c 2008/05/13 12:50:09 14160 @@ -4779,15 +4779,44 @@ gpointer done_callback_data) { GList *locations; + GList *p; GFile *dest, *src_dir; GtkWindow *parent_window; - + gboolean target_is_mapping; + gboolean have_nonmapping_source; + char *file_scheme; + dest = NULL; + target_is_mapping = FALSE; + have_nonmapping_source = FALSE; + if (target_dir) { dest = g_file_new_for_uri (target_dir); + file_scheme = g_file_get_uri_scheme (dest); + if (strcmp (file_scheme, "burn") == 0) { + target_is_mapping = TRUE; + } + g_free (file_scheme); } locations = location_list_from_uri_list (item_uris); - + + for (p = location_list_from_uri_list (item_uris); p != NULL; p = p->next) { + file_scheme = g_file_get_uri_scheme ((GFile *)p->data); + + if (strcmp (file_scheme, "burn") != 0) { + have_nonmapping_source = TRUE; + } + + g_free (file_scheme); + } + + if (target_is_mapping && have_nonmapping_source && copy_action == GDK_ACTION_MOVE) { + /* never move to "burn:///", but fall back to copy. + * This is a workaround, because otherwise the source files would be removed. + */ + copy_action = GDK_ACTION_COPY; + } + parent_window = NULL; if (parent_view) { parent_window = (GtkWindow *)gtk_widget_get_ancestor (parent_view, GTK_TYPE_WINDOW); --- branches/gnome-2-22/src/file-manager/fm-properties-window.c 2008/05/13 12:49:14 14159 +++ branches/gnome-2-22/src/file-manager/fm-properties-window.c 2008/05/13 12:50:09 14160 @@ -5416,6 +5416,9 @@ g_list_free (window->details->permission_buttons); window->details->permission_buttons = NULL; + g_list_free (window->details->permission_combos); + window->details->permission_combos = NULL; + if (window->details->initial_permissions) { g_hash_table_destroy (window->details->initial_permissions); window->details->initial_permissions = NULL; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org