Merge branch 'org.openembedded.dev' of git@git.openembedded.net:/openembedded into...
[vuplus_openembedded] / packages / xfce / xfdesktop / fix-segfault-when-removable-icons-are-disabled.patch
1 diff -Nur xfdesktop-4.4.2-BKP/src/xfdesktop-file-icon-manager.c xfdesktop-4.4.2/src/xfdesktop-file-icon-manager.c
2 --- xfdesktop-4.4.2-BKP/src/xfdesktop-file-icon-manager.c       2008-11-03 16:19:46.000000000 -0200
3 +++ xfdesktop-4.4.2/src/xfdesktop-file-icon-manager.c   2008-11-03 16:20:45.000000000 -0200
4 @@ -2046,8 +2046,10 @@
5      
6      g_hash_table_foreach(fmanager->priv->icons,
7                           file_icon_hash_write_icons, rcfile);
8 -    g_hash_table_foreach(fmanager->priv->removable_icons,
9 -                         file_icon_hash_write_icons, rcfile);
10 +    if(fmanager->priv->show_removable_media) {
11 +        g_hash_table_foreach(fmanager->priv->removable_icons,
12 +                             file_icon_hash_write_icons, rcfile);
13 +    }
14      g_hash_table_foreach(fmanager->priv->special_icons,
15                           file_icon_hash_write_icons, rcfile);
16