|
 |
6519a3c |
From d77079e03fd39d99455ff4f6495cbc6a5cc53308 Mon Sep 17 00:00:00 2001
|
|
|
6519a3c |
From: Nick Schermer <nick@xfce.org>
|
|
|
6519a3c |
Date: Fri, 03 Aug 2012 19:50:37 +0000
|
|
|
6519a3c |
Subject: Search new background location in list (bug #8799).
|
|
|
6519a3c |
|
|
|
6519a3c |
(cherry picked from commit 2ab345ffebe0e2d31aed9281832d71a038b82117)
|
|
|
6519a3c |
---
|
|
|
6519a3c |
diff --git a/settings/main.c b/settings/main.c
|
|
|
6519a3c |
index 1ebad7c..f4ded70 100644
|
|
|
6519a3c |
--- a/settings/main.c
|
|
|
6519a3c |
+++ b/settings/main.c
|
|
|
6519a3c |
@@ -688,6 +688,7 @@ xfdesktop_settings_dialog_populate_image_list(AppearancePanel *panel)
|
|
|
6519a3c |
xfconf_channel_set_string(panel->channel, prop_image, image_file);
|
|
|
6519a3c |
xfconf_channel_set_string(panel->channel, prop_last, image_file);
|
|
|
6519a3c |
|
|
|
6519a3c |
+ /* Add all backdrops in xfce4/backdrops/ for backwards compatibility with 4.8 */
|
|
|
6519a3c |
backdrop_dirs = xfce_resource_lookup_all(XFCE_RESOURCE_DATA,
|
|
|
6519a3c |
"xfce4/backdrops/");
|
|
|
6519a3c |
for(i = 0; backdrop_dirs[i]; ++i) {
|
|
|
6519a3c |
@@ -696,6 +697,18 @@ xfdesktop_settings_dialog_populate_image_list(AppearancePanel *panel)
|
|
|
6519a3c |
if(tmp)
|
|
|
6519a3c |
image_file_iter = tmp;
|
|
|
6519a3c |
}
|
|
|
6519a3c |
+ g_strfreev(backdrop_dirs);
|
|
|
6519a3c |
+
|
|
|
6519a3c |
+ /* Add all backdrops in backgrounds/xfce/ */
|
|
|
6519a3c |
+ backdrop_dirs = xfce_resource_lookup_all(XFCE_RESOURCE_DATA,
|
|
|
6519a3c |
+ "backgrounds/xfce/");
|
|
|
6519a3c |
+ for(i = 0; backdrop_dirs[i]; ++i) {
|
|
|
6519a3c |
+ tmp = xfdesktop_image_list_add_dir(ls, backdrop_dirs[i],
|
|
|
6519a3c |
+ image_file);
|
|
|
6519a3c |
+ if(tmp)
|
|
|
6519a3c |
+ image_file_iter = tmp;
|
|
|
6519a3c |
+ }
|
|
|
6519a3c |
+ g_strfreev(backdrop_dirs);
|
|
|
6519a3c |
|
|
|
6519a3c |
if(!image_file_iter)
|
|
|
6519a3c |
image_file_iter = xfdesktop_settings_image_treeview_add(GTK_TREE_MODEL(ls), image_file);
|
|
|
6519a3c |
--
|
|
|
6519a3c |
cgit v0.9.0.3
|