r20357 - in /desktop/unstable/gnome-session/debian: changelog patches/12_desktop_crash.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Mon Jun 15 10:00:51 2009
New Revision: 20357

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20357
Log:
12_desktop_crash.patch: new patch from Petr Gajdůšek. Use 
g_ptr_array_free to free a GPtrArray, not g_strfreev.
Closes: #532702.

Added:
    desktop/unstable/gnome-session/debian/patches/12_desktop_crash.patch
Modified:
    desktop/unstable/gnome-session/debian/changelog
    desktop/unstable/gnome-session/debian/patches/series

Modified: desktop/unstable/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/changelog?rev=20357&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/changelog (original)
+++ desktop/unstable/gnome-session/debian/changelog Mon Jun 15 10:00:51 2009
@@ -1,3 +1,11 @@
+gnome-session (2.26.1-7) unstable; urgency=low
+
+  * 12_desktop_crash.patch: new patch from Petr Gajdůšek. Use 
+    g_ptr_array_free to free a GPtrArray, not g_strfreev.
+    Closes: #532702.
+
+ -- Josselin Mouette <joss at debian.org>  Mon, 15 Jun 2009 12:00:24 +0200
+
 gnome-session (2.26.1-6) unstable; urgency=low
 
   * 01_gnome-wm.patch:

Added: desktop/unstable/gnome-session/debian/patches/12_desktop_crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/12_desktop_crash.patch?rev=20357&op=file
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/12_desktop_crash.patch (added)
+++ desktop/unstable/gnome-session/debian/patches/12_desktop_crash.patch Mon Jun 15 10:00:51 2009
@@ -1,0 +1,18 @@
+Debian #532702
+GNOME #547443
+
+Index: gnome-session-2.26.1/egg/eggdesktopfile.c
+===================================================================
+--- gnome-session-2.26.1.orig/egg/eggdesktopfile.c	2009-06-15 11:56:32.083547946 +0200
++++ gnome-session-2.26.1/egg/eggdesktopfile.c	2009-06-15 11:56:46.789539745 +0200
+@@ -1274,8 +1274,8 @@ egg_desktop_file_launchv (EggDesktopFile
+  out:
+   if (env)
+     {
+-      g_strfreev ((char **)env->pdata);
+-      g_ptr_array_free (env, FALSE);
++      g_ptr_array_foreach (env, (GFunc)g_free, NULL);
++      g_ptr_array_free (env, TRUE);
+     }
+   free_document_list (translated_documents);
+ 

Modified: desktop/unstable/gnome-session/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/series?rev=20357&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/series (original)
+++ desktop/unstable/gnome-session/debian/patches/series Mon Jun 15 10:00:51 2009
@@ -1,4 +1,5 @@
 01_gnome-wm.patch
 10_session_save.patch
 11_dbus_exit.patch
+12_desktop_crash.patch
 90_relibtoolize.patch