rpms/metacity/F-12 metacity-2.28-IceCloseConnection.patch, 1.1, 1.2 metacity.spec, 1.216, 1.217

[Owen Taylor]

Author: otaylor

Update of /cvs/extras/rpms/metacity/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30293

Modified Files:
	metacity-2.28-IceCloseConnection.patch metacity.spec 
Log Message:
* Sun Jan  3 2010 Owen Taylor <otaylor at redhat.com> - 2.28.0-14
- Fix crash in _IceTransClose (rhbz 551994)
  The previous patch for rhbz 539905 didn't actually fix the
  problem; the ICE connection was still being closed twice.


metacity-2.28-IceCloseConnection.patch:
 session.c |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

Index: metacity-2.28-IceCloseConnection.patch
===================================================================
RCS file: /cvs/extras/rpms/metacity/F-12/metacity-2.28-IceCloseConnection.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- metacity-2.28-IceCloseConnection.patch	17 Dec 2009 23:14:53 -0000	1.1
+++ metacity-2.28-IceCloseConnection.patch	3 Jan 2010 16:20:06 -0000	1.2
@@ -1,4 +1,4 @@
-From 3fd59d1e7e1a23202f58536fb7a995aa5951664b Mon Sep 17 00:00:00 2001
+From 13f6daee4752ae5b1fb61447deaca43161d5b0bc Mon Sep 17 00:00:00 2001
 From: Owen W. Taylor <otaylor at fishsoup.net>
 Date: Thu, 17 Dec 2009 16:20:18 -0500
 Subject: [PATCH] Don't call IceCloseConnection() behind libSM's back
@@ -10,11 +10,11 @@ exit out of the metacity main loop and g
 
 https://bugzilla.gnome.org/show_bug.cgi?id=604867
 ---
- src/core/session.c |    8 +++++++-
- 1 files changed, 7 insertions(+), 1 deletions(-)
+ src/core/session.c |   10 +++++++---
+ 1 files changed, 7 insertions(+), 3 deletions(-)
 
 diff --git a/src/core/session.c b/src/core/session.c
-index 96d8d71..0a12649 100644
+index 96d8d71..2ca15c9 100644
 --- a/src/core/session.c
 +++ b/src/core/session.c
 @@ -84,6 +84,7 @@ static char*       load_state         (const char *previous_save_file);
@@ -25,20 +25,22 @@ index 96d8d71..0a12649 100644
  
  /* This is called when data is available on an ICE connection.  */
  static gboolean
-@@ -106,7 +107,12 @@ process_ice_messages (GIOChannel *channel,
+@@ -106,9 +107,12 @@ process_ice_messages (GIOChannel *channel,
        IcePointer context = IceGetConnectionContext (connection);
  #endif
        
 -      /* We were disconnected */
+-      IceSetShutdownNegotiation (connection, False);
+-      IceCloseConnection (connection);
 +      /* We were disconnected; close our connection to the
 +       * session manager, this will result in the ICE connection
 +       * being cleaned up, since it is owned by libSM.
 +       */
 +      disconnect ();
 +      meta_quit (META_EXIT_SUCCESS);
-       IceSetShutdownNegotiation (connection, False);
-       IceCloseConnection (connection);
  
+       return FALSE;
+     }
 -- 
 1.6.5.2
 


Index: metacity.spec
===================================================================
RCS file: /cvs/extras/rpms/metacity/F-12/metacity.spec,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -p -r1.216 -r1.217
--- metacity.spec	17 Dec 2009 23:14:54 -0000	1.216
+++ metacity.spec	3 Jan 2010 16:20:06 -0000	1.217
@@ -3,7 +3,7 @@
 Summary: Unobtrusive window manager
 Name: metacity
 Version: 2.28.0
-Release: 13%{?dist}
+Release: 14%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.28/metacity-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=558723
@@ -244,6 +244,11 @@ fi
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Sun Jan  3 2010 Owen Taylor <otaylor at redhat.com> - 2.28.0-14
+- Fix crash in _IceTransClose (rhbz 551994)
+  The previous patch for rhbz 539905 didn't actually fix the
+  problem; the ICE connection was still being closed twice.
+
 * Thu Dec 17 2009 Owen Taylor <otaylor at redhat.com> - 2.28.0-13
 - Fix crash in in tooltip on_style_set() (rhbz 546509)
 - Fix Crash in SmcSetProperties() on exit (rhbz 539905, gnome 604867)