diff options
| author | Owen Taylor <otaylor@fedoraproject.org> | 2010-01-03 16:32:56 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@fedoraproject.org> | 2010-01-03 16:32:56 +0000 |
| commit | 0445ab37636cda6fd856912cbc26a191ca2be62c (patch) | |
| tree | ad948d199761950038de29c0521787a2b7162864 | |
| parent | 27a699f32c0bef7f4b8300e536e2ee34b40622a4 (diff) | |
| download | metacity-0445ab37636cda6fd856912cbc26a191ca2be62c.tar.gz metacity-0445ab37636cda6fd856912cbc26a191ca2be62c.tar.xz metacity-0445ab37636cda6fd856912cbc26a191ca2be62c.zip | |
- Fix crash in _IceTransClose (rhbz 551994) The previous patch for rhbzmetacity-2_28_0-15_fc13
539905 didn't actually fix the problem; the ICE connection was still
being closed twice.
| -rw-r--r-- | metacity-2.28-IceCloseConnection.patch | 16 | ||||
| -rw-r--r-- | metacity.spec | 7 |
2 files changed, 15 insertions, 8 deletions
diff --git a/metacity-2.28-IceCloseConnection.patch b/metacity-2.28-IceCloseConnection.patch index dc996ea..e05fc18 100644 --- a/metacity-2.28-IceCloseConnection.patch +++ b/metacity-2.28-IceCloseConnection.patch @@ -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@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 get to meta_finalize(). 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 diff --git a/metacity.spec b/metacity.spec index db43019..57e4bd9 100644 --- a/metacity.spec +++ b/metacity.spec @@ -3,7 +3,7 @@ Summary: Unobtrusive window manager Name: metacity Version: 2.28.0 -Release: 14%{?dist} +Release: 15%{?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@redhat.com> - 2.28.0-15 +- 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@redhat.com> - 2.28.0-14 - Fix crash in in tooltip on_style_set() (rhbz 546509) - Fix Crash in SmcSetProperties() on exit (rhbz 539905, gnome 604867) |