rpms/control-center/devel seal.patch,1.3,1.4

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4912

Modified Files:
	seal.patch 
Log Message:
more seal business


seal.patch:
 capplets/appearance/appearance-font.c |    2 +-
 capplets/common/theme-thumbnail.c     |    2 +-
 panels/display/scrollarea.c           |   30 +++++++++++++++++++-----------
 shell/cc-shell-category-view.c        |   11 +++++++----
 shell/gnome-control-center.c          |   13 +++++++++----
 5 files changed, 37 insertions(+), 21 deletions(-)

Index: seal.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/seal.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- seal.patch	30 Jun 2010 05:41:57 -0000	1.3
+++ seal.patch	30 Jun 2010 11:48:00 -0000	1.4
@@ -22,6 +22,53 @@ diff -up gnome-control-center-2.31.4/cap
    gdk_drawable_set_colormap (GDK_DRAWABLE (pixmap), gtk_widget_get_colormap (widget));
  
    window = gtk_widget_get_window (widget);
+diff -up gnome-control-center-2.31.4/panels/display/scrollarea.c.seal gnome-control-center-2.31.4/panels/display/scrollarea.c
+--- gnome-control-center-2.31.4/panels/display/scrollarea.c.seal	2010-06-30 06:53:13.368211546 -0400
++++ gnome-control-center-2.31.4/panels/display/scrollarea.c	2010-06-30 07:46:20.664214619 -0400
+@@ -500,24 +500,32 @@ setup_background_cr (GdkWindow *window,
+ 		     int        x_offset,
+ 		     int        y_offset)
+ {
+-    GdkWindowObject *private = (GdkWindowObject *)window;
+-    
+-    if (private->bg_pixmap == GDK_PARENT_RELATIVE_BG && private->parent)
++    GdkPixmap *pixmap;
++    GdkWindow *parent;
++    gint x, y;
++    GdkColor bg_color;
++
++    gdk_window_get_back_pixmap (window, &pixmap, NULL);
++    parent = gdk_window_get_effective_parent (window);
++    gdk_window_get_geometry (window, &x, &y, NULL, NULL, NULL);
++    gdk_window_get_background (window, &bg_color);
++
++    if (pixmap == GDK_PARENT_RELATIVE_BG && parent)
+     {
+-	x_offset += private->x;
+-	y_offset += private->y;
++	x_offset += x;
++	y_offset += y;
+ 	
+-	setup_background_cr (GDK_WINDOW (private->parent), cr, x_offset, y_offset);
++	setup_background_cr (parent, cr, x_offset, y_offset);
+     }
+-    else if (private->bg_pixmap &&
+-	     private->bg_pixmap != GDK_PARENT_RELATIVE_BG &&
+-	     private->bg_pixmap != GDK_NO_BG)
++    else if (pixmap &&
++	     pixmap != GDK_PARENT_RELATIVE_BG &&
++	     pixmap != GDK_NO_BG)
+     {
+-	gdk_cairo_set_source_pixmap (cr, private->bg_pixmap, -x_offset, -y_offset);
++	gdk_cairo_set_source_pixmap (cr, pixmap, -x_offset, -y_offset);
+     }
+     else
+     {
+-	gdk_cairo_set_source_color (cr, &private->bg_color);
++	gdk_cairo_set_source_color (cr, &bg_color);
+     }
+ }
+ 
 diff -up gnome-control-center-2.31.4/shell/cc-shell-category-view.c.seal gnome-control-center-2.31.4/shell/cc-shell-category-view.c
 --- gnome-control-center-2.31.4/shell/cc-shell-category-view.c.seal	2010-06-30 01:06:56.502211127 -0400
 +++ gnome-control-center-2.31.4/shell/cc-shell-category-view.c	2010-06-30 01:07:55.711221673 -0400