diff options
author | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-11-15 18:23:17 +0100 |
---|---|---|
committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-11-15 18:23:17 +0100 |
commit | a25da5c491ac2a3820be7aaa7fa507fe7ca8b354 (patch) | |
tree | d8162d4d8d6aaf5f129e203b6bc9d3ccead522f7 /packages/xfce/xfdesktop | |
parent | 9e167064390ce3bff7425be5c002ed3f1e7eb1d1 (diff) | |
parent | 828ced10e6eaf2048a8fd7ee7263807fab9d784d (diff) | |
download | openembedded-a25da5c491ac2a3820be7aaa7fa507fe7ca8b354.tar.gz |
Merge commit 'origin/org.openembedded.dev' into holger/openmoko-merges
Diffstat (limited to 'packages/xfce/xfdesktop')
-rw-r--r-- | packages/xfce/xfdesktop/fix-segfault-when-removable-icons-are-disabled.patch | 16 |
1 files changed, 16 insertions, 0 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 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); + |