rpms/gnome-desktop/devel spanned-background.patch, NONE, 1.1 gnome-desktop.spec, 1.237, 1.238
Matthias Clasen
mclasen at fedoraproject.org
Mon Feb 22 18:36:14 UTC 2010
Author: mclasen
Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6598
Modified Files:
gnome-desktop.spec
Added Files:
spanned-background.patch
Log Message:
support spanned backgrounds again
spanned-background.patch:
gnome-bg.c | 13 +++++++++++--
libgnomeui/gnome-bg.h | 3 ++-
2 files changed, 13 insertions(+), 3 deletions(-)
--- NEW FILE spanned-background.patch ---
--- gnome-desktop-2.29.90/libgnome-desktop/gnome-bg.c 2010-02-18 15:41:43.851703409 -0500
+++ gnome-desktop-2.29.90.spanned/libgnome-desktop/gnome-bg.c 2010-02-18 14:42:53.895955816 -0500
@@ -228,6 +228,7 @@
{ GNOME_BG_PLACEMENT_SCALED, "scaled" },
{ GNOME_BG_PLACEMENT_ZOOMED, "zoom" },
{ GNOME_BG_PLACEMENT_TILED, "wallpaper" },
+ { GNOME_BG_PLACEMENT_SPANNED, "spanned" },
{ 0, NULL }
};
@@ -740,12 +741,17 @@
GdkPixbuf *new;
#if 0
- g_print ("original_width: %d %d\n",
+ g_print ("get scaled %d %d, original_width: %d %d\n",
+ width, height,
gdk_pixbuf_get_width (pixbuf),
gdk_pixbuf_get_height (pixbuf));
#endif
switch (placement) {
+ case GNOME_BG_PLACEMENT_SPANNED:
+ new = pixbuf_scale_to_fit (pixbuf, width, height);
+ /* new = g_object_ref (pixbuf); */
+ break;
case GNOME_BG_PLACEMENT_ZOOMED:
new = pixbuf_scale_to_min (pixbuf, width, height);
break;
@@ -800,6 +806,9 @@
case GNOME_BG_PLACEMENT_SCALED:
pixbuf_blend (scaled, dest, 0, 0, w, h, x + area->x, y + area->y, 1.0);
break;
+ case GNOME_BG_PLACEMENT_SPANNED:
+ pixbuf_blend (scaled, dest, 0, 0, w, h, x, y, 1.0);
+ break;
default:
g_assert_not_reached ();
break;
@@ -878,7 +887,7 @@
if (!bg)
return;
- if (is_root) {
+ if (is_root && (bg->placement != GNOME_BG_PLACEMENT_SPANNED)) {
draw_color_each_monitor (bg, dest, screen);
draw_each_monitor (bg, dest, screen);
} else {
--- gnome-desktop-2.29.90/libgnome-desktop/libgnomeui/gnome-bg.h 2009-12-17 06:27:18.000000000 -0500
+++ gnome-desktop-2.29.90.spanned/libgnome-desktop/libgnomeui/gnome-bg.h 2010-02-18 13:52:17.476702082 -0500
@@ -59,7 +59,8 @@
GNOME_BG_PLACEMENT_ZOOMED,
GNOME_BG_PLACEMENT_CENTERED,
GNOME_BG_PLACEMENT_SCALED,
- GNOME_BG_PLACEMENT_FILL_SCREEN
+ GNOME_BG_PLACEMENT_FILL_SCREEN,
+ GNOME_BG_PLACEMENT_SPANNED
} GnomeBGPlacement;
GType gnome_bg_get_type (void);
Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -p -r1.237 -r1.238
--- gnome-desktop.spec 16 Feb 2010 19:06:21 -0000 1.237
+++ gnome-desktop.spec 22 Feb 2010 18:36:14 -0000 1.238
@@ -12,7 +12,7 @@
Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
Name: gnome-desktop
Version: 2.29.90
-Release: 2%{?dist}
+Release: 3%{?dist}
URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-desktop/2.29/%{name}-%{version}.tar.bz2
Patch1: concatenate-edid-descriptors.patch
@@ -24,6 +24,8 @@ Patch5: slideshow.patch
Patch6: gnome-desktop-crash.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=606457
Patch7: randr-version.patch
+# upstream fix
+Patch8: spanned-background.patch
License: GPLv2+ and LGPLv2+
@@ -88,6 +90,7 @@ libgnomedesktop.
%patch5 -p1 -b .slideshow
%patch6 -p1 -b .crash
%patch7 -p1 -b .randr-version
+%patch8 -p1 -b .spanned-background
%build
@@ -136,6 +139,9 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_datadir}/gtk-doc/html/gnome-desktop/
%changelog
+* Mon Feb 22 2010 Matthias Clasen <mclasen at redhat.comj> - 2.29.90-3
+- Support spanning backgrounds again
+
* Tue Feb 16 2010 Matthias Clasen <mclasen at redhat.comj> - 2.29.90-2
- Copy patches from F-12
More information about the scm-commits
mailing list