rpms/gnome-screensaver/devel gnome-screensaver-2.20.0-restore-gamma.patch, NONE, 1.1 gnome-screensaver.spec, 1.169, 1.170

[Ray Strode (rstrode)]

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-screensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4709

Modified Files:
	gnome-screensaver.spec 
Added Files:
	gnome-screensaver-2.20.0-restore-gamma.patch 
Log Message:
- fix up gamma handling, patch by John Bryant (should fix 290611)


gnome-screensaver-2.20.0-restore-gamma.patch:

--- NEW FILE gnome-screensaver-2.20.0-restore-gamma.patch ---
--- gnome-screensaver-2.20.0/src/gs-fade.c
+++ gnome-screensaver-2.20.0/src/gs-fade.c
@@ -296,6 +296,10 @@
         }
 # endif
 
+        if (fade->priv->gamma_info) {
+                return TRUE;
+        }
+
         info = g_new0 (xf86_gamma_info, fade->priv->num_screens);
         fade->priv->gamma_info = info;
 
@@ -402,8 +406,10 @@
         int      screen;
         gboolean res;
 
-        for (screen = 0; screen < fade->priv->num_screens; screen++) {
-                res = xf86_whack_gamma (screen, &fade->priv->gamma_info [screen], alpha);
+        if (fade->priv->gamma_info) {
+                for (screen = 0; screen < fade->priv->num_screens; screen++) {
+                        res = xf86_whack_gamma (screen, &fade->priv->gamma_info [screen], alpha);
+                }
         }
 
         return TRUE;
@@ -523,6 +529,8 @@
 
         g_return_if_fail (GS_IS_FADE (fade));
 
+        gamma_info_init (fade);
+
         if (fade->priv->timer_id > 0) {
                 gs_fade_stop (fade);
         }
@@ -641,6 +649,8 @@
         fade->priv->current_alpha = 1.0;
 
         gs_fade_set_alpha (fade, fade->priv->current_alpha);
+
+        gamma_info_free (fade);
 }
 
 static void
@@ -681,7 +691,7 @@
         display = gdk_display_get_default ();
         fade->priv->num_screens = gdk_display_get_n_screens (display);
 
-        gamma_info_init (fade);
+        fade->priv->gamma_info = NULL;
 }
 
 static void


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- gnome-screensaver.spec	28 Sep 2007 16:18:44 -0000	1.169
+++ gnome-screensaver.spec	5 Oct 2007 14:00:43 -0000	1.170
@@ -13,7 +13,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.20.0
-Release: 6%{?dist} 
+Release: 7%{?dist} 
 License: GPLv2+
 Group: Amusements/Graphics
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.20/%{name}-%{version}.tar.bz2
@@ -24,6 +24,7 @@
 # add support for gnome-keyring to the pam stack
 Patch4: gnome-keyring.patch
 Patch5: stupid-bullets.patch
+Patch6: gnome-screensaver-2.20.0-restore-gamma.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 URL: http://www.gnome.org
@@ -75,6 +76,7 @@
 %patch2 -p1 -b .securitytoken
 %patch4 -p1 -b .gnome-keyring
 %patch5 -p1 -b .stupid-bullets
+%patch6 -p1 -b .restore-gamma
 
 %build
 # grr, autoreconf seems to break with intltool 0.36.0, unless
@@ -140,6 +142,9 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Fri Oct 5 2007 Ray Strode <rstrode at redhat.com> - 2.20.0-7
+- fix up gamma handling, patch by John Bryant (should fix 290611)
+
 * Fri Sep 28 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-6
 - Use small bullets in the password entry