Author: kelnos
Date: 2009-03-02 07:12:11 +0000 (Mon, 02 Mar 2009)
New Revision: 29640
Modified:
xfce4-session/trunk/ChangeLog
xfce4-session/trunk/NEWS
xfce4-session/trunk/settings/xfae-model.c
Log:
* settings/xfae-model.c: Don't crash in xfae_item_free() when passed
a NULL pointer (bug 5020).
Modified: xfce4-session/trunk/ChangeLog
===================================================================
--- xfce4-session/trunk/ChangeLog 2009-03-01 22:47:35 UTC (rev 29639)
+++ xfce4-session/trunk/ChangeLog 2009-03-02 07:12:11 UTC (rev 29640)
@@ -1,3 +1,8 @@
+2009-03-01 Brian Tarricone <bj...@cornell.edu>
+
+ * settings/xfae-model.c: Don't crash in xfae_item_free() when passed
+ a NULL pointer (bug 5020).
+
2009-02-25 Stephan Arts <step...@xfce.org>
* == Released 4.6.0 ==
Modified: xfce4-session/trunk/NEWS
===================================================================
--- xfce4-session/trunk/NEWS 2009-03-01 22:47:35 UTC (rev 29639)
+++ xfce4-session/trunk/NEWS 2009-03-02 07:12:11 UTC (rev 29640)
@@ -1,3 +1,9 @@
+4.6.1
+=====
+
+- Fix crash in settings dialog when a .desktop file with a missing
+ Application key is opened (bug 5020).
+
4.6.0
=====
Modified: xfce4-session/trunk/settings/xfae-model.c
===================================================================
--- xfce4-session/trunk/settings/xfae-model.c 2009-03-01 22:47:35 UTC (rev
29639)
+++ xfce4-session/trunk/settings/xfae-model.c 2009-03-02 07:12:11 UTC (rev
29640)
@@ -505,6 +505,9 @@
static void
xfae_item_free (XfaeItem *item)
{
+ if (G_UNLIKELY (item == NULL))
+ return;
+
if (item->icon != NULL)
g_object_unref (G_OBJECT (item->icon));
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
