Merge lp:~georgesofianosgr/switchboard-plug-pantheon-shell/fix_duplicate_wallpapers into lp:~elementary-apps/switchboard-plug-pantheon-shell/trunk

[George Sofianos]

Check if wallpaper is already located in local background
directory before cloning it

[Zisu Andrei (matzipan)]

Code looks good. Haven't built and run.

review: Approve (code)

[MarkoD (markodolar)]

It compiles and works. Set wallpaper contract and selecting wallpaper in switchboard plug does not copy file anymore when selecting from ~/.local/share/backgrounds.

review: Approve (compile and functional)

=== modified file 'set-wallpaper-contract/set-wallpaper.vala'
--- set-wallpaper-contract/set-wallpaper.vala	2015-11-15 21:42:16 +0000
+++ set-wallpaper-contract/set-wallpaper.vala	2016-11-03 22:41:59 +0000
@@ -163,7 +163,7 @@
 
                 string path = file.get_path ();
                 File append_file = file;
-                if (!path.has_prefix (SYSTEM_BACKGROUNDS_PATH)) {
+                if (!path.has_prefix (SYSTEM_BACKGROUNDS_PATH) && !path.has_prefix (get_local_bg_location ())) {
                     var local_file = copy_for_library (file);
                     if (local_file != null) {
                         append_file = local_file;

=== modified file 'src/Wallpaper.vala'
--- src/Wallpaper.vala	2015-11-17 19:24:58 +0000
+++ src/Wallpaper.vala	2016-11-03 22:41:59 +0000
@@ -206,7 +206,7 @@
             string uri = file.get_uri ();
             string path = file.get_path ();
 
-            if (!path.has_prefix (SYSTEM_BACKGROUNDS_PATH)) {
+            if (!path.has_prefix (SYSTEM_BACKGROUNDS_PATH) && !path.has_prefix (get_local_bg_location ())) {
                 var localfile = copy_for_library (file);
                 if (localfile != null) {
                     uri = localfile.get_uri ();