[oe-commits] Otavio Salvador : xfdesktop: fix segfault when removable icons are disabled

[GIT User account]

Module: openembedded.git
Branch: shared/xorg-7.4-update
Commit: e196c018e07075938b65813026e0119cebbdc139
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=e196c018e07075938b65813026e0119cebbdc139

Author: Otavio Salvador <otavio at ossystems.com.br>
Date:   Mon Nov  3 16:22:54 2008 -0200

xfdesktop: fix segfault when removable icons are disabled

---

 ...egfault-when-removable-icons-are-disabled.patch |   16 ++++++++++++++++
 packages/xfce/xfdesktop_4.4.2.bb                   |    5 +++--
 2 files changed, 19 insertions(+), 2 deletions(-)

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 0000000..af5bc4c
--- /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 2e6a936..3129feb 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"