r13621 - in /desktop/unstable/nautilus/debian: changelog patches/23_thumbnails_add-border.patch patches/series

[diegoe-guest at users.alioth.debian.org]

Author: diegoe-guest
Date: Tue Nov 27 09:26:35 2007
New Revision: 13621

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13621
Log:
* New patch, 23_thumbnails_add-border.patch, restore the
  thumbnail borders; (GNOME #478363).

Added:
    desktop/unstable/nautilus/debian/patches/23_thumbnails_add-border.patch
Modified:
    desktop/unstable/nautilus/debian/changelog
    desktop/unstable/nautilus/debian/patches/series

Modified: desktop/unstable/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/changelog?rev=13621&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/changelog (original)
+++ desktop/unstable/nautilus/debian/changelog Tue Nov 27 09:26:35 2007
@@ -1,3 +1,10 @@
+nautilus (2.20.0-3) UNRELEASED; urgency=low
+
+  * New patch, 23_thumbnails_add-border.patch, restore the
+    thumbnail borders; (GNOME #478363).
+
+ -- Diego Escalante Urrelo <dieguito at gmail.com>  Tue, 27 Nov 2007 03:31:28 +0000
+
 nautilus (2.20.0-2) unstable; urgency=high
 
   [ Loic Minier ]

Added: desktop/unstable/nautilus/debian/patches/23_thumbnails_add-border.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/23_thumbnails_add-border.patch?rev=13621&op=file
==============================================================================
--- desktop/unstable/nautilus/debian/patches/23_thumbnails_add-border.patch (added)
+++ desktop/unstable/nautilus/debian/patches/23_thumbnails_add-border.patch Tue Nov 27 09:26:35 2007
@@ -1,0 +1,31 @@
+# 23_thumbnails_add-border.patch:
+# Restore the missing thumbnail borders.
+#
+# Bug 478363 – Missing thumbnail frames
+# http://bugzilla.gnome.org/show_bug.cgi?id=478363
+Index: nautilus/libnautilus-private/nautilus-icon-factory.c
+===================================================================
+--- nautilus.orig/libnautilus-private/nautilus-icon-factory.c	(Revision 13137)
++++ nautilus/libnautilus-private/nautilus-icon-factory.c	(Arbeitskopie)
+@@ -384,9 +384,21 @@ async_thumbnail_load_func (NautilusThumb
+ 		goto out;
+ 	}
+ 
++	if (!gdk_pixbuf_get_has_alpha (pixbuf)) {
++		/* we don't own the pixbuf, but nautilus_thumbnail_frame_image() assumes so and unrefs it. */
++		g_object_ref (pixbuf);
++
++		nautilus_thumbnail_frame_image (&pixbuf);
++		/* at this point, we own a pixbuf, which is the framed version of the passed-in pixbuf. */
++	}
++
+ 	cached_icon = cache_icon_new (pixbuf, NULL, scale_x, scale_y);
+ 	cached_icon->mtime = statbuf.st_mtime;
+ 
++	if (!gdk_pixbuf_get_has_alpha (pixbuf)) {
++		g_object_unref (pixbuf);
++	}
++
+ 	if (cached_icon != NULL) {
+ 		key = g_new (CacheKey, 1);
+ 		key->name = g_strdup (path);

Modified: desktop/unstable/nautilus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/series?rev=13621&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/series (original)
+++ desktop/unstable/nautilus/debian/patches/series Tue Nov 27 09:26:35 2007
@@ -12,4 +12,5 @@
 15_tracker_check.patch
 20_upstream_nautilus-dnd-user-owned.patch -p0
 21_nautilus_xmp.patch
+23_thumbnails_add-border.patch
 99_ltmain_as-needed.patch