Updating branch refs/heads/xfce-4.8 to 4e151e0095d415509519f8816cd752cc9de18161 (commit) from 290a6b4ea665a7678b176a18354f5abdeff8adbc (commit)
commit 4e151e0095d415509519f8816cd752cc9de18161 Author: Nick Schermer <n...@xfce.org> Date: Fri Aug 3 21:55:12 2012 +0200 Revert "Search new background location in list (bug #8799)." This reverts commit 290a6b4ea665a7678b176a18354f5abdeff8adbc. Sigh, wrong branch.. settings/main.c | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/settings/main.c b/settings/main.c index 86726db..9ae15cd 100644 --- a/settings/main.c +++ b/settings/main.c @@ -678,7 +678,6 @@ xfdesktop_settings_dialog_populate_image_list(AppearancePanel *panel) xfconf_channel_set_string(panel->channel, prop_image, image_file); xfconf_channel_set_string(panel->channel, prop_last, image_file); - /* Add all backdrops in xfce4/backdrops/ for backwards compatibility with 4.8 */ backdrop_dirs = xfce_resource_lookup_all(XFCE_RESOURCE_DATA, "xfce4/backdrops/"); for(i = 0; backdrop_dirs[i]; ++i) { @@ -687,18 +686,6 @@ xfdesktop_settings_dialog_populate_image_list(AppearancePanel *panel) if(tmp) image_file_iter = tmp; } - g_strfreev(backdrop_dirs); - - /* Add all backdrops in backgrounds/xfce/ */ - backdrop_dirs = xfce_resource_lookup_all(XFCE_RESOURCE_DATA, - "backgrounds/xfce/"); - for(i = 0; backdrop_dirs[i]; ++i) { - tmp = xfdesktop_image_list_add_dir(ls, backdrop_dirs[i], - image_file); - if(tmp) - image_file_iter = tmp; - } - g_strfreev(backdrop_dirs); if(!image_file_iter) image_file_iter = xfdesktop_settings_image_treeview_add(GTK_TREE_MODEL(ls), image_file); _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits