diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-02 12:00:40 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-02 12:00:40 +0200 |
| commit | c2ef76f233a03e87ba6f2a39ca06d6c8411525bd (patch) | |
| tree | 443d415b43358dbcc1043b51f3299d3b07ee3c73 /extra/xfdesktop/add-backgrounds-xfce-to-search-path.patch | |
| parent | 3bcb803af0dd81dc1d1e3352d8dee1d731d33abb (diff) | |
| parent | defe74c9cba07c321ad2869d8f6872e64a167324 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/open-vm-tools/PKGBUILD
community-testing/open-vm-tools/vmware-guestd
extra/exo/PKGBUILD
extra/gnome-python-desktop/PKGBUILD
extra/imagemagick/PKGBUILD
extra/libindi/PKGBUILD
extra/libxfce4util/PKGBUILD
extra/terminal/PKGBUILD
extra/xfburn/PKGBUILD
extra/xfce4-appfinder/PKGBUILD
extra/xfce4-dev-tools/PKGBUILD
extra/xfce4-mailwatch-plugin/PKGBUILD
extra/xfce4-notifyd/PKGBUILD
extra/xfce4-panel/PKGBUILD
extra/xfce4-screenshooter/PKGBUILD
extra/xfce4-settings/PKGBUILD
extra/xfce4-smartbookmark-plugin/PKGBUILD
extra/xfce4-weather-plugin/PKGBUILD
testing/cairo/PKGBUILD
testing/lvm2/PKGBUILD
testing/openmpi/PKGBUILD
testing/udev/PKGBUILD
Diffstat (limited to 'extra/xfdesktop/add-backgrounds-xfce-to-search-path.patch')
| -rw-r--r-- | extra/xfdesktop/add-backgrounds-xfce-to-search-path.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/extra/xfdesktop/add-backgrounds-xfce-to-search-path.patch b/extra/xfdesktop/add-backgrounds-xfce-to-search-path.patch new file mode 100644 index 000000000..c48aeac33 --- /dev/null +++ b/extra/xfdesktop/add-backgrounds-xfce-to-search-path.patch @@ -0,0 +1,36 @@ +@@ -, +, @@ + settings app. (Bug #8799) +--- + settings/main.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) +--- a/settings/main.c ++++ a/settings/main.c +@@ -688,6 +688,7 @@ 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/ */ + backdrop_dirs = xfce_resource_lookup_all(XFCE_RESOURCE_DATA, + "xfce4/backdrops/"); + for(i = 0; backdrop_dirs[i]; ++i) { +@@ -696,6 +697,19 @@ 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); +-- |