From: Otavio Salvador <otavio@ossystems.com.br>
Date: Mon, 3 Nov 2008 18:22:54 +0000 (-0200)
Subject: xfdesktop: fix segfault when removable icons are disabled
X-Git-Tag: Release-2010-05/1~5479
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e196c018e07075938b65813026e0119cebbdc139;p=openembedded.git

xfdesktop: fix segfault when removable icons are disabled
---

diff --git a/packages/xfce/xfdesktop/fix-segfault-when-removable-icons-are-disabled.patch b/packages/xfce/xfdesktop/fix-segfault-when-removable-icons-are-disabled.patch
new file mode 100644
index 0000000000..af5bc4cd96
--- /dev/null
+++ b/packages/xfce/xfdesktop/fix-segfault-when-removable-icons-are-disabled.patch
@@ -0,0 +1,16 @@
+diff -Nur xfdesktop-4.4.2-BKP/src/xfdesktop-file-icon-manager.c xfdesktop-4.4.2/src/xfdesktop-file-icon-manager.c
+--- xfdesktop-4.4.2-BKP/src/xfdesktop-file-icon-manager.c	2008-11-03 16:19:46.000000000 -0200
++++ xfdesktop-4.4.2/src/xfdesktop-file-icon-manager.c	2008-11-03 16:20:45.000000000 -0200
+@@ -2046,8 +2046,10 @@
+     
+     g_hash_table_foreach(fmanager->priv->icons,
+                          file_icon_hash_write_icons, rcfile);
+-    g_hash_table_foreach(fmanager->priv->removable_icons,
+-                         file_icon_hash_write_icons, rcfile);
++    if(fmanager->priv->show_removable_media) {
++        g_hash_table_foreach(fmanager->priv->removable_icons,
++                             file_icon_hash_write_icons, rcfile);
++    }
+     g_hash_table_foreach(fmanager->priv->special_icons,
+                          file_icon_hash_write_icons, rcfile);
+     
diff --git a/packages/xfce/xfdesktop_4.4.2.bb b/packages/xfce/xfdesktop_4.4.2.bb
index 2e6a9365f3..3129feba23 100644
--- a/packages/xfce/xfdesktop_4.4.2.bb
+++ b/packages/xfce/xfdesktop_4.4.2.bb
@@ -5,11 +5,12 @@
 DESCRIPTION="xfce4 Desktop Background Manager"
 SECTION = "x11/base"
 DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs libxml2 xfce4-panel thunar"
-PR = "r1"
+PR = "r2"
 
 inherit xfce
 
-SRC_URI += " file://relocation-and-memleak.patch;patch=1 "
+SRC_URI += " file://relocation-and-memleak.patch;patch=1 \
+             file://fix-segfault-when-removable-icons-are-disabled.patch;patch=1"
 
 PACKAGES += "xfdesktop-backdrops ${PN}-mcs-plugins"