OBS User unknown 2008-06-08 22:16:10 +00:00 committed by Git OBS Bridge
parent 56554ee67b
commit cb2c2a06c4
3 changed files with 10 additions and 22 deletions

View File

@ -1,18 +0,0 @@
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;

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Jun 8 22:00:26 CEST 2008 - hpj@suse.de
- Back out nautilus-bnc376669-always-update-thumbnail.patch
(bnc#376669). It was causing continuous re-thumbnailing.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 22 00:50:50 CEST 2008 - hpj@suse.de Thu May 22 00:50:50 CEST 2008 - hpj@suse.de

View File

@ -16,7 +16,7 @@ BuildRequires: cdparanoia eel-devel fdupes gnome-common gnome-desktop-devel gno
License: GPL v2 or later License: GPL v2 or later
Group: Productivity/File utilities Group: Productivity/File utilities
Version: 2.22.2 Version: 2.22.2
Release: 25 Release: 31
Summary: The GNOME 2.x Desktop File Manager Summary: The GNOME 2.x Desktop File Manager
Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.20/%{name}-%{version}.tar.bz2 Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.20/%{name}-%{version}.tar.bz2
Url: http://www.gnome.org Url: http://www.gnome.org
@ -52,8 +52,6 @@ Patch20: nautilus-bnc363122-lockdown-context-menus.diff
Patch21: nautilus-bnc368446-network-in-places.patch Patch21: nautilus-bnc368446-network-in-places.patch
# PATCH-FIX-UPSTREAM nautilus-bnc-376070-null-exifdata-crash.patch bnc376070 hpj@novell.com # PATCH-FIX-UPSTREAM nautilus-bnc-376070-null-exifdata-crash.patch bnc376070 hpj@novell.com
Patch22: nautilus-bnc376070-null-exifdata-crash.patch 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 # PATCH-FIX-UPSTREAM nautilus-bnc393226-dont-move-to-burn.patch bgo531750 bnc393226 hpj@novell.com
Patch24: nautilus-bnc393226-dont-move-to-burn.patch Patch24: nautilus-bnc393226-dont-move-to-burn.patch
Requires: gnome-icon-theme Requires: gnome-icon-theme
@ -106,7 +104,6 @@ gnome-patch-translation-prepare
%patch20 -p1 %patch20 -p1
%patch21 %patch21
%patch22 -p1 %patch22 -p1
%patch23 -p1
%patch24 -p2 %patch24 -p2
gnome-patch-translation-update gnome-patch-translation-update
@ -191,6 +188,9 @@ fi
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%changelog %changelog
* Mon Jun 09 2008 hpj@suse.de
- Back out nautilus-bnc376669-always-update-thumbnail.patch
(bnc#376669). It was causing continuous re-thumbnailing.
* Thu May 22 2008 hpj@suse.de * Thu May 22 2008 hpj@suse.de
- Add nautilus-bnc393226-dont-move-to-burn.patch (bnc#393226). - Add nautilus-bnc393226-dont-move-to-burn.patch (bnc#393226).
* Tue May 20 2008 hpj@suse.de * Tue May 20 2008 hpj@suse.de