diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2008-11-03 16:22:54 -0200 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2008-11-05 09:14:23 -0200 |
| commit | e196c018e07075938b65813026e0119cebbdc139 (patch) | |
| tree | 7065e1b9965cb2618488384ce39c9ab1074bb293 | |
| parent | be356ca2083a751632c2ade2da2cdcf7c4d794fe (diff) | |
xfdesktop: fix segfault when removable icons are disabled
| -rw-r--r-- | packages/xfce/xfdesktop/fix-segfault-when-removable-icons-are-disabled.patch | 16 | ||||
| -rw-r--r-- | 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 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" |