r10498 - in /desktop/unstable/metacity/debian: changelog control patches/02_fix_crash_on_session_saving.patch

[slomo at users.alioth.debian.org]

Author: slomo
Date: Thu Apr 26 14:09:14 2007
New Revision: 10498

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10498
Log:
* New patch 02_fix_crash_on_session_saving.patch, taken from Ubuntu.
  Fix a crash that would occur when the current session is saved and would
  corrupt ~/.gnome2/session. Gnome bug #433253

Added:
    desktop/unstable/metacity/debian/patches/02_fix_crash_on_session_saving.patch
Modified:
    desktop/unstable/metacity/debian/changelog
    desktop/unstable/metacity/debian/control

Modified: desktop/unstable/metacity/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/changelog?rev=10498&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/changelog (original)
+++ desktop/unstable/metacity/debian/changelog Thu Apr 26 14:09:14 2007
@@ -1,3 +1,11 @@
+metacity (1:2.18.2-3) unstable; urgency=low
+
+  * New patch 02_fix_crash_on_session_saving.patch, taken from Ubuntu.
+    Fix a crash that would occur when the current session is saved and would
+    corrupt ~/.gnome2/session. Gnome bug #433253
+
+ -- Sebastian Dröge <slomo at debian.org>  Thu, 26 Apr 2007 15:44:10 +0200
+
 metacity (1:2.18.2-2) unstable; urgency=low
 
   * Add -z defs to LDFLAGS; cleanups.

Modified: desktop/unstable/metacity/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/control?rev=10498&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/control (original)
+++ desktop/unstable/metacity/debian/control Thu Apr 26 14:09:14 2007
@@ -2,7 +2,7 @@
 Section: x11
 Priority: optional
 Maintainer: Marco Cabizza <marco87 at gmail.com>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 5),
                gettext,

Added: desktop/unstable/metacity/debian/patches/02_fix_crash_on_session_saving.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/patches/02_fix_crash_on_session_saving.patch?rev=10498&op=file
==============================================================================
--- desktop/unstable/metacity/debian/patches/02_fix_crash_on_session_saving.patch (added)
+++ desktop/unstable/metacity/debian/patches/02_fix_crash_on_session_saving.patch Thu Apr 26 14:09:14 2007
@@ -1,0 +1,22 @@
+diff -Nur metacity-2.18.2/src/session.c metacity-2.18.2.new/src/session.c
+--- metacity-2.18.2/src/session.c	2007-04-08 20:46:17.000000000 +0200
++++ metacity-2.18.2.new/src/session.c	2007-04-26 00:18:24.000000000 +0200
+@@ -1824,8 +1824,6 @@
+ 
+       display_iter = display_iter->next;
+     }
+-  /* don't need to free displays */
+-  displays = NULL;
+ 
+   if (lame == NULL)
+     {
+@@ -1839,6 +1837,9 @@
+   timestamp = meta_display_get_current_time_roundtrip (displays->data);  
+   sprintf (timestampbuf, "%u", timestamp);
+ 
++  /* don't need to free displays */
++  displays = NULL;
++
+   len = g_slist_length (lame);
+   len *= 2; /* titles and also classes */
+   len += 2; /* --timestamp flag and actual timestamp */