rpms/gnome-desktop/F-9 gnome-bg-center-svg.patch, NONE, 1.1 gnome-desktop.spec, 1.142, 1.143

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gnome-desktop/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8236

Modified Files:
	gnome-desktop.spec 
Added Files:
	gnome-bg-center-svg.patch 
Log Message:
Correctly center zoomed wallpapers


gnome-bg-center-svg.patch:

--- NEW FILE gnome-bg-center-svg.patch ---
--- libgnome-desktop/gnome-bg.orig	Mon Apr  7 23:18:13 2008
+++ libgnome-desktop/gnome-bg.c	Sat Apr 26 16:19:11 2008
@@ -310,10 +310,6 @@ get_scaled_pixbuf (GnomeBGPlacement plac
 		new = pixbuf_scale_to_min (pixbuf, width, height);
 		break;
 		
-	case GNOME_BG_PLACEMENT_CENTERED:
-		new = g_object_ref (pixbuf);
-		break;
-		
 	case GNOME_BG_PLACEMENT_FILL_SCREEN:
 		new = gdk_pixbuf_scale_simple (pixbuf, width, height,
 					       GDK_INTERP_BILINEAR);
@@ -323,6 +319,7 @@ get_scaled_pixbuf (GnomeBGPlacement plac
 		new = pixbuf_scale_to_fit (pixbuf, width, height);
 		break;
 		
+	case GNOME_BG_PLACEMENT_CENTERED:
 	case GNOME_BG_PLACEMENT_TILED:
 	default:
 		new = g_object_ref (pixbuf);
@@ -1489,15 +1486,11 @@ pixbuf_blend (GdkPixbuf *src,
 	if (height < 0)
 		height = gdk_pixbuf_get_height (src);
 	
-	if (dest_x < 0) {
-		offset_x -= dest_x;
+	if (dest_x < 0)
 		dest_x = 0;
-	}
 	
-	if (dest_y < 0) {
-		offset_y -= dest_y;
+	if (dest_y < 0)
 		dest_y = 0;
-	}
 	
 	if (dest_x + width > dest_width) {
 		width = dest_width - dest_x;


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/F-9/gnome-desktop.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- gnome-desktop.spec	30 Apr 2008 22:17:05 -0000	1.142
+++ gnome-desktop.spec	7 May 2008 13:16:21 -0000	1.143
@@ -12,7 +12,7 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.22.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.22/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -25,6 +25,8 @@
 Patch5:   gnome-desktop-2.22.0-mistranslation.patch
 
 Patch7:   refcount-slideshow.patch
+# from upstream svn
+Patch8:   gnome-bg-center-svg.patch
 
 Requires: redhat-menus
 
@@ -80,6 +82,7 @@
 %patch4 -p1 -b .multires
 %patch5 -p1 -b .mistranslation
 %patch7 -p1 -b .refcount-slideshow
+%patch8 -p0 -b .center-svg
 
 %build
 autoreconf
@@ -126,6 +129,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Wed May  7 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.1-5
+- Correctly center zoomed wallpapers
+
 * Fri Apr 25 2008 Soren Sandmann <sandmann at redhat.com> - 2.22.1-4
 - Fix signed/unsigned mixup, bug 443903