rpms/eel2/devel eel-2.24.0-fade.patch, 1.3, 1.4 eel2.spec, 1.106, 1.107

[Ray Strode]

Author: rstrode

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

Modified Files:
	eel-2.24.0-fade.patch eel2.spec 
Log Message:
- One more crack at not fading because of screen size changes


eel-2.24.0-fade.patch:

Index: eel-2.24.0-fade.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eel2/devel/eel-2.24.0-fade.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eel-2.24.0-fade.patch	22 Oct 2008 19:45:55 -0000	1.3
+++ eel-2.24.0-fade.patch	22 Oct 2008 21:48:12 -0000	1.4
@@ -1,6 +1,6 @@
 diff -up eel-2.24.1/eel/eel-background.c.fade eel-2.24.1/eel/eel-background.c
 --- eel-2.24.1/eel/eel-background.c.fade	2008-10-06 13:20:45.000000000 -0400
-+++ eel-2.24.1/eel/eel-background.c	2008-10-22 15:44:09.000000000 -0400
++++ eel-2.24.1/eel/eel-background.c	2008-10-22 17:44:20.000000000 -0400
 @@ -43,6 +43,9 @@
  #include <stdio.h>
  #define GNOME_DESKTOP_USE_UNSTABLE_API
@@ -146,7 +146,7 @@
  	}
  	
  	if (pixmap) {
-@@ -677,8 +724,32 @@ eel_background_set_up_widget (EelBackgro
+@@ -677,8 +724,39 @@ eel_background_set_up_widget (EelBackgro
  }
  
  static void
@@ -161,16 +161,23 @@
  {
 +	if (GTK_WIDGET_REALIZED (widget)) {
 +		if (background->details->fade == NULL) {
-+			int width, height;
-+			gdk_drawable_get_size (widget->window, &width, &height);
-+			background->details->fade = gnome_bg_crossfade_new (width, height);
-+			g_signal_connect_swapped (background->details->fade,
-+						"finished",
-+						G_CALLBACK (free_fade),
-+						background);
++			int old_width, old_height, width, height;
++			/* If this was the result of a screen size change,
++			 * we don't want to crossfade
++			 */
++			gdk_drawable_get_size (widget->window, &old_width, &old_height);
++			drawable_get_adjusted_size (background, widget->window,
++						    &width, &height);
++			if (old_width == width && old_height == height) {
++				background->details->fade = gnome_bg_crossfade_new (width, height);
++				g_signal_connect_swapped (background->details->fade,
++							"finished",
++							G_CALLBACK (free_fade),
++							background);
++			}
 +		}
 +
-+		if (!gnome_bg_crossfade_is_started (background->details->fade)) {
++		if (background->details->fade != NULL && !gnome_bg_crossfade_is_started (background->details->fade)) {
 +			gnome_bg_crossfade_set_start_pixmap (background->details->fade,
 +							     background->details->background_pixmap);
 +		}
@@ -179,7 +186,7 @@
  	eel_background_unrealize (background);
  	eel_background_set_up_widget (background, widget);
  
-@@ -701,10 +772,13 @@ widget_style_set_cb (GtkWidget *widget, 
+@@ -701,10 +779,13 @@ widget_style_set_cb (GtkWidget *widget, 
  static void
  screen_size_changed (GdkScreen *screen, EelBackground *background)
  {
@@ -194,7 +201,7 @@
  static void
  widget_realized_setup (GtkWidget *widget, gpointer data)
  {
-@@ -715,6 +789,8 @@ widget_realized_setup (GtkWidget *widget
+@@ -715,6 +796,8 @@ widget_realized_setup (GtkWidget *widget
          if (background->details->is_desktop) {
  		GdkWindow *root_window;	
  		GdkScreen *screen;
@@ -203,7 +210,7 @@
  		
  		screen = gtk_widget_get_screen (widget);
  
-@@ -734,6 +810,18 @@ widget_realized_setup (GtkWidget *widget
+@@ -734,6 +817,18 @@ widget_realized_setup (GtkWidget *widget
  		} else {
  			background->details->use_common_pixmap = FALSE;
  		}


Index: eel2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eel2/devel/eel2.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- eel2.spec	22 Oct 2008 19:45:55 -0000	1.106
+++ eel2.spec	22 Oct 2008 21:48:12 -0000	1.107
@@ -18,7 +18,7 @@
 Name:        eel2
 Summary:     Eazel Extensions Library
 Version:     2.24.1
-Release:     2%{?dist}
+Release:     3%{?dist}
 License:     LGPLv2+
 Group:       System Environment/Libraries
 Source:      http://download.gnome.org/sources/eel/2.24/eel-%{version}.tar.bz2
@@ -115,6 +115,9 @@
 %{_includedir}/eel-2
 
 %changelog
+* Wed Oct 22 2008 Ray Strode <rstrode at redhat.com> - 2.24.1-3
+- One more crack at not fading because of screen size changes
+
 * Wed Oct 22 2008 Ray Strode <rstrode at redhat.com> - 2.24.1-2
 - Don't try to fade because of screen size changes.  It
   wouldn't look right if it did work, and it doesn't work