rpms/gnome-session/devel gnome-session-2.18.0-dont-use-iris-with-cm.patch, NONE, 1.1 gnome-session.spec, 1.119, 1.120

[Ray Strode (rstrode)]

Author: rstrode

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

Modified Files:
	gnome-session.spec 
Added Files:
	gnome-session-2.18.0-dont-use-iris-with-cm.patch 
Log Message:
- Don't show iris animation when using compiz (bug 237842)


gnome-session-2.18.0-dont-use-iris-with-cm.patch:

--- NEW FILE gnome-session-2.18.0-dont-use-iris-with-cm.patch ---
--- gnome-session-2.18.0/gnome-session/logout.c.dont-use-iris-with-cm	2007-03-12 14:48:31.000000000 -0400
+++ gnome-session-2.18.0/gnome-session/logout.c	2007-05-15 09:54:32.000000000 -0400
@@ -333,7 +333,7 @@
   gboolean halt_active = FALSE;
   gboolean reboot_active = FALSE;
   GdmLogoutAction logout_action = GDM_LOGOUT_ACTION_NONE;
-  gboolean a11y_enabled;
+  gboolean iris_effect_enabled;
   GError *error = NULL;
   GdkScreen *screen;
   int monitor;
@@ -356,10 +356,10 @@
 
   gtk_widget_show (invisible);
 
-  a11y_enabled = GTK_IS_ACCESSIBLE (gtk_widget_get_accessible (invisible));
+  iris_effect_enabled = !GTK_IS_ACCESSIBLE (gtk_widget_get_accessible (invisible)) && !gtk_widget_is_composited (invisible);
 
-  /* Only create a managed window if a11y is enabled */
-  if (!a11y_enabled)
+  /* Only create a managed window if a11y/compositing manager is enabled */
+  if (!iris_effect_enabled)
     {
       while (1)
 	{
@@ -485,7 +485,7 @@
   /* Grabbing the Xserver when accessibility is enabled will cause
    * a hang. See #93103 for details.
    */
-  if (!a11y_enabled)
+  if (iris_effect_enabled)
     {
       XGrabServer (GDK_DISPLAY ());
       gsm_foreach_screen (fadeout_screen);
@@ -493,7 +493,7 @@
 
   gtk_widget_show_all (box);
 
-  if (!a11y_enabled)
+  if (!iris_effect_enabled)
     {
       /* Move the grabs to our message box */
       gdk_pointer_grab (box->window, TRUE, 0,
@@ -526,7 +526,7 @@
   gtk_widget_destroy (box);
   gtk_widget_destroy (invisible);
 
-  if (!a11y_enabled)
+  if (iris_effect_enabled)
     {
       hide_fadeout_windows ();
       XUngrabServer (GDK_DISPLAY ());


Index: gnome-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- gnome-session.spec	6 May 2007 22:21:08 -0000	1.119
+++ gnome-session.spec	15 May 2007 13:57:06 -0000	1.120
@@ -12,7 +12,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.18.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://www.gnome.org
 Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-session/2.18/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -64,6 +64,8 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=411506
 Patch21: gnome-session-2.17.91-use-gdm-at-hints-3.patch
 
+Patch22: gnome-session-2.18.0-dont-use-iris-with-cm.patch
+
 BuildRequires: esound-devel >= %{esound_version}
 BuildRequires: /usr/bin/esd
 BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -111,6 +113,7 @@
 %patch13 -p1 -b .window-manager
 %patch20 -p1 -b .timeout
 %patch21 -p0 -b .use-gdm-hints
+%patch22 -p1 -b .dont-use-iris-with-cm
 
 %build
 
@@ -202,6 +205,9 @@
 %{_datadir}/icons/hicolor/scalable/apps/session-properties.svg
 
 %changelog
+* Tue May 15 2007 Ray Strode <rstrode at redhat.com> - 2.18.0-7
+- Don't show iris animation when using compiz (bug 237842)
+
 * Sun May  6 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-6
 - Don't own /usr/share/applications