From 82ad921f307e67a6d8159edd76a7be17c4ca2195 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 4 Jun 2007 19:58:49 +0000 Subject: [PATCH] 2.19.3 --- .cvsignore | 2 +- ...session-2.18.0-dont-use-iris-with-cm.patch | 52 ------------------- gnome-session.spec | 12 ++--- sources | 2 +- 4 files changed, 8 insertions(+), 60 deletions(-) delete mode 100644 gnome-session-2.18.0-dont-use-iris-with-cm.patch diff --git a/.cvsignore b/.cvsignore index be4a33b..1d53bc3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gnome-session-2.19.2.tar.bz2 +gnome-session-2.19.3.tar.bz2 diff --git a/gnome-session-2.18.0-dont-use-iris-with-cm.patch b/gnome-session-2.18.0-dont-use-iris-with-cm.patch deleted file mode 100644 index 8d5ea1f..0000000 --- a/gnome-session-2.18.0-dont-use-iris-with-cm.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- 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 ()); diff --git a/gnome-session.spec b/gnome-session.spec index 3a986fa..267173f 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -11,8 +11,8 @@ Summary: GNOME session manager Name: gnome-session -Version: 2.19.2 -Release: 2%{?dist} +Version: 2.19.3 +Release: 1%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-session/2.19/%{name}-%{version}.tar.bz2 Source1: redhat-default-session @@ -57,9 +57,6 @@ Patch20: gnome-session-2.17.91-atspi-timeout.patch # http://bugzilla.gnome.org/show_bug.cgi?id=411506 #Patch21: gnome-session-2.17.91-use-gdm-at-hints-3.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=438615 -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} @@ -104,7 +101,6 @@ GNOME components and handles logout and saving the session. %patch13 -p1 -b .window-manager %patch20 -p1 -b .timeout #%patch21 -p0 -b .use-gdm-hints -%patch22 -p1 -b .dont-use-iris-with-cm %build @@ -194,6 +190,10 @@ fi %{_datadir}/icons/hicolor/scalable/apps/session-properties.svg %changelog +* Mon Jun 4 2007 Matthias Clasen - 2.19.3-1 +- Update to 2.19.3 +- Drop upstreamed patch + * Tue May 22 2007 - Bastien Nocera - 2.19.2-2 - Fix up logic in iris patch diff --git a/sources b/sources index cafcb3a..8b1b8d6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3841b1169f45ac9a3deb33f5af7bb5a5 gnome-session-2.19.2.tar.bz2 +20bdbfca2ef05b0ab93417ee617b0cb1 gnome-session-2.19.3.tar.bz2