rpms/eel2/devel eel-2.23.92-fade.patch, 1.1, 1.2 eel2.spec, 1.100, 1.101

[Ray Strode]

Author: rstrode

Update of /cvs/pkgs/rpms/eel2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4094

Modified Files:
	eel-2.23.92-fade.patch eel2.spec 
Log Message:
- Don't fade desktop from themed gray color at startup


eel-2.23.92-fade.patch:

Index: eel-2.23.92-fade.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eel2/devel/eel-2.23.92-fade.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eel-2.23.92-fade.patch	19 Sep 2008 03:34:24 -0000	1.1
+++ eel-2.23.92-fade.patch	22 Sep 2008 14:35:26 -0000	1.2
@@ -1,14 +1,17 @@
---- a/eel/eel-background.c
-+++ b/eel/eel-background.c
-@@ -43,6 +43,7 @@
+diff -up eel-2.23.92/eel/eel-background.c.fade eel-2.23.92/eel/eel-background.c
+--- eel-2.23.92/eel/eel-background.c.fade	2008-09-08 17:26:14.000000000 -0400
++++ eel-2.23.92/eel/eel-background.c	2008-09-22 10:27:36.000000000 -0400
+@@ -43,6 +43,9 @@
  #include <stdio.h>
  #define GNOME_DESKTOP_USE_UNSTABLE_API
  #include <libgnomeui/gnome-bg.h>
 +#include <gdk/gdkx.h>
++
++#include <cairo-xlib.h>
  
  static void       eel_background_class_init                (gpointer       klass);
  static void       eel_background_init                      (gpointer       object,
-@@ -78,6 +79,7 @@ struct EelBackgroundDetails {
+@@ -78,6 +81,7 @@ struct EelBackgroundDetails {
  	/* Realized data: */
  	gboolean background_changes_with_size;
  	GdkPixmap *background_pixmap;
@@ -16,7 +19,7 @@
  	int background_entire_width;
  	int background_entire_height;
  	GdkColor default_color;
-@@ -182,6 +184,11 @@ eel_background_finalize (GObject *object)
+@@ -182,6 +186,11 @@ eel_background_finalize (GObject *object
  	background = EEL_BACKGROUND (object);
  
  	g_free (background->details->color);
@@ -28,7 +31,7 @@
  	eel_background_remove_current_image (background);
  
  	if (background->details->background_pixmap != NULL) {
-@@ -610,6 +619,25 @@ eel_background_reset (EelBackground *background)
+@@ -610,6 +619,25 @@ eel_background_reset (EelBackground *bac
  	g_signal_emit (GTK_OBJECT (background), signals[RESET], 0);
  }
  
@@ -54,7 +57,7 @@
  static void
  eel_background_set_up_widget (EelBackground *background, GtkWidget *widget)
  {
-@@ -644,14 +672,15 @@ eel_background_set_up_widget (EelBackground *background, GtkWidget *widget)
+@@ -644,14 +672,15 @@ eel_background_set_up_widget (EelBackgro
  	} else {
  		window = widget->window;
  	}
@@ -77,7 +80,7 @@
  
  	background->details->background_changes_with_size =
  		gnome_bg_changes_with_size (background->details->bg);
-@@ -679,6 +708,18 @@ eel_background_set_up_widget (EelBackground *background, GtkWidget *widget)
+@@ -679,6 +708,18 @@ eel_background_set_up_widget (EelBackgro
  static void
  eel_widget_background_changed (GtkWidget *widget, EelBackground *background)
  {
@@ -96,7 +99,7 @@
  	eel_background_unrealize (background);
  	eel_background_set_up_widget (background, widget);
  
-@@ -741,11 +782,22 @@ static void
+@@ -741,11 +782,55 @@ static void
  widget_realize_cb (GtkWidget *widget, gpointer data)
  {
  	EelBackground *background;
@@ -115,7 +118,40 @@
 +	gdk_drawable_get_size (widget->window, &width, &height);
 +	background->details->fade = gnome_bg_crossfade_new (width, height);
 +
-+	gnome_bg_crossfade_set_start_pixmap (background->details->fade, NULL);
++	if (background->details->is_desktop) {
++		GdkWindow *root_window;
++		GdkScreen *screen;
++		GdkPixmap *pixmap;
++		cairo_surface_t *surface;
++		int x, y;
++		cairo_pattern_t *pattern;
++		cairo_t *cr;
++
++		screen = gtk_widget_get_screen (widget);
++
++		root_window = gdk_screen_get_root_window (screen);
++		gdk_window_get_position (widget->window, &x, &y);
++
++		pixmap = gdk_pixmap_new (widget->window, width, height, -1);
++
++		cr = gdk_cairo_create (pixmap);
++
++		surface = cairo_xlib_surface_create (GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (widget)),
++						     GDK_WINDOW_XWINDOW (root_window),
++						     GDK_VISUAL_XVISUAL (gdk_drawable_get_visual (pixmap)),
++						     gdk_screen_get_width (screen),
++						     gdk_screen_get_height (screen));
++		cairo_set_source_surface (cr, surface, x, y);
++		cairo_paint (cr);
++
++		cairo_surface_destroy (surface);
++		cairo_destroy (cr);
++
++		gnome_bg_crossfade_set_start_pixmap (background->details->fade, pixmap);
++		g_object_unref (pixmap);
++	} else {
++		gnome_bg_crossfade_set_start_pixmap (background->details->fade, NULL);
++	}
 +
  	eel_background_set_up_widget (background, widget);
  }


Index: eel2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eel2/devel/eel2.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- eel2.spec	22 Sep 2008 00:26:28 -0000	1.100
+++ eel2.spec	22 Sep 2008 14:35:26 -0000	1.101
@@ -17,7 +17,7 @@
 Name:        eel2
 Summary:     Eazel Extensions Library
 Version:     2.24.0
-Release:     1%{?dist}
+Release:     2%{?dist}
 License:     LGPLv2+
 Group:       System Environment/Libraries
 Source:      http://download.gnome.org/sources/eel/2.24/eel-%{version}.tar.bz2
@@ -113,6 +113,9 @@
 %{_includedir}/eel-2
 
 %changelog
+* Mon Sep 22 2008 Ray Strode <rstrode at redhat.com> - 2.24.0-2
+- Don't fade desktop from themed gray color at startup
+
 * Sun Sep 21 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
 - Update to 2.24.0