From b68be377f0fffeb562a04a7238fd2ddb8a57547b Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@fedoraproject.org>
Date: Jun 16 2009 12:47:54 +0000
Subject: - Fix crasher spotted by Michael Young (bug 499489)


---

diff --git a/gdm-2.26.1-multistack.patch b/gdm-2.26.1-multistack.patch
index dd7ac49..ae6f93e 100644
--- a/gdm-2.26.1-multistack.patch
+++ b/gdm-2.26.1-multistack.patch
@@ -3598,7 +3598,7 @@ index 4bb14f4..0f7e44e 100644
                                          GDM_SESSION_DBUS_ERROR_CANCEL,
                                          "Operation cancelled");
 -        conversation = session->priv->conversation;
-+        conversation = NULL;
++
          dbus_connection_send (conversation->worker_connection, reply, NULL);
          dbus_connection_flush (conversation->worker_connection);
  
diff --git a/gdm.spec b/gdm.spec
index a9397ee..c5d88f0 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.26.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -393,6 +393,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Wed Jun 03 2009 Ray Strode <rstrode@redhat.com> - 1:2.26.1-12
+- Fix crasher spotted by Michael Young (bug 499489)
+
 * Wed Jun 03 2009 Ray Strode <rstrode@redhat.com> - 1:2.26.1-11
 - Fix language parsing code (bug 502778)