Merge lp:~vikoadi/switchboard-plug-pantheon-shell/use-background-uri into lp:~elementary-apps/switchboard-plug-pantheon-shell/trunk

[Viko Adi Rahmawan]

org.gnome.desktop.background picture-uri only support uri, so we give them uri

for AccountService to work org.gnome.desktop.background picture-uri must contains an URI and not a path, so i change how it handle file. Instead of refering to it filename, now it refer to its URI.

[Danielle Foré (danrabbit)]

Code looks solid and it does what it says. Can't confirm it fixes the issue for some weird reason, but I can confirm that it doesn't break anything and populating the key with what it's supposed to contain can only be a good thing.

review: Approve

=== modified file 'src/Wallpaper.vala'
--- src/Wallpaper.vala	2014-08-13 22:21:43 +0000
+++ src/Wallpaper.vala	2014-11-16 12:39:36 +0000
@@ -64,15 +64,15 @@
 class Wallpaper : EventBox {
 
     class WallpaperContainer : Gtk.FlowBoxChild {
-        public string filename { get; construct; }
+        public string uri { get; construct; }
 
         Gtk.Image image;
 
-        public WallpaperContainer (string filename) {
-            Object (filename: filename);
+        public WallpaperContainer (string uri) {
+            Object (uri: uri);
 
             try {
-                image = new Gtk.Image.from_pixbuf (new Gdk.Pixbuf.from_file_at_scale (filename, 150, 100, false));
+                image = new Gtk.Image.from_pixbuf (new Gdk.Pixbuf.from_file_at_scale (GLib.Filename.from_uri (uri), 150, 100, false));
                 add (image);
             } catch (Error e) {
                 warning ("Failed to load wallpaper thumbnail: %s", e.message);
@@ -185,7 +185,7 @@
 
     void update_wallpaper (Gtk.FlowBox box, Gtk.FlowBoxChild child) {
         var selected = (WallpaperContainer) wallpaper_view.get_selected_children ().data;
-        current_wallpaper_path = selected.filename;
+        current_wallpaper_path = selected.uri;
         settings.set_string ("picture-uri", current_wallpaper_path);
     }
 
@@ -283,21 +283,21 @@
                     }
 
                     var file = File.new_for_uri (basefolder + "/" + info.get_name ());
-                    string filename = file.get_path ();
+                    string uri = file.get_uri ();
 
                     // Skip the default_wallpaper as seen in the description of the
                     // default_link variable
-                    if (filename == default_link) {
+                    if (uri == default_link) {
                         continue;
                     }
 
                     try {
-                        var wallpaper = new WallpaperContainer (filename);
+                        var wallpaper = new WallpaperContainer (uri);
                         wallpaper_view.add (wallpaper);
                         wallpaper.show_all ();
 
                         // Select the wallpaper if it is the current wallpaper
-                        if (current_wallpaper_path.has_suffix (filename)) {
+                        if (current_wallpaper_path.has_suffix (uri)) {
                             this.wallpaper_view.select_child (wallpaper);
                         }
 
@@ -355,10 +355,10 @@
                 warning ("Copying wallpaper to local directory failed: %s", e.message);
             }
 
-            string filename = dest.get_path ();
+            string uri = dest.get_uri ();
 
             // Add the wallpaper name and thumbnail to the IconView
-            var wallpaper = new WallpaperContainer (filename);
+            var wallpaper = new WallpaperContainer (uri);
             wallpaper_view.add (wallpaper);
             wallpaper.show_all ();