Merge lp:~embik/switchboard-plug-pantheon-shell/set-wallpaper-in-accountsservice into lp:~elementary-apps/switchboard-plug-pantheon-shell/trunk

[Marvin Beckers]

set wallpaper now via accountsservice to make it available for pantheon-greeter

This branch sets the user background image / wallpaper correctly via accountsservice to make information about them available to the greeter.

[Raphael Isemann (teemperor)]

Could you re-add the source code comments from my source[1]? Otherwise only the small indentation error in diff-line 40 needs to be fixed.

Functionality is there.

[1] http://bazaar.launchpad.net/~teemperor/switchboard-plug-pantheon-shell/fix-wallpaper-accountsservices/revision/262

review: Needs Fixing (code-style, functionality)

[lp:~embik/switchboard-plug-pantheon-shell/set-wallpaper-in-accountsservice]

314. By Marvin Beckers on 2015-02-11

added comments on implemented accountsservice functionality

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-12-25 18:00:56 +0000
+++ src/CMakeLists.txt	2015-02-11 15:02:32 +0000
@@ -24,6 +24,7 @@
     gnome-desktop-3.0
     switchboard-2.0
     granite
+    posix
     plank
 OPTIONS
     --thread

=== modified file 'src/Wallpaper.vala'
--- src/Wallpaper.vala	2014-11-16 12:33:17 +0000
+++ src/Wallpaper.vala	2015-02-11 15:02:32 +0000
@@ -61,6 +61,11 @@
     NAME
 }
 
+[DBus (name = "org.freedesktop.Accounts.User")]
+interface AccountsServiceUser : Object {
+    public abstract void set_background_file (string filename) throws IOError;
+}
+
 class Wallpaper : EventBox {
 
     class WallpaperContainer : Gtk.FlowBoxChild {
@@ -82,6 +87,9 @@
 
     GLib.Settings settings;
 
+    //Instance of the AccountsServices-Interface for this user
+    AccountsServiceUser accountsservice = null;
+
     Gtk.FlowBox wallpaper_view;
     ComboBoxText combo;
     ComboBoxText folder_combo;
@@ -103,6 +111,17 @@
 
         settings = new GLib.Settings ("org.gnome.desktop.background");
 
+        //DBus connection needed in update_wallpaper for
+        //passing the wallpaper-information to accountsservice.
+         try {
+            string uid = "%d".printf ((int) Posix.getuid ());
+            accountsservice = Bus.get_proxy_sync (BusType.SYSTEM,
+                    "org.freedesktop.Accounts",
+                    "/org/freedesktop/Accounts/User" + uid);
+        } catch (Error e) {
+            warning (e.message);
+        }
+
         var vbox = new Box (Orientation.VERTICAL, 4);
 
         wallpaper_view = new Gtk.FlowBox ();
@@ -183,10 +202,27 @@
         current_wallpaper_path = settings.get_string ("picture-uri");
     }
 
+    void update_accountsservice () {
+        /*
+         * We pass the path to accountsservices that the login-screen can
+         * see what background we selected. This is right now just a patched-in functionality of
+         * accountsservice, so we expect that it is maybe not there
+         * and do nothing if we encounter a unpatched accountsservices-backend.
+        */
+        try {
+            var file = File.new_for_uri (current_wallpaper_path);
+
+            accountsservice.set_background_file (file.get_path ());
+        } catch (Error e) {
+            warning (e.message);
+        }
+    }
+
     void update_wallpaper (Gtk.FlowBox box, Gtk.FlowBoxChild child) {
         var selected = (WallpaperContainer) wallpaper_view.get_selected_children ().data;
         current_wallpaper_path = selected.uri;
         settings.set_string ("picture-uri", current_wallpaper_path);
+        update_accountsservice ();
     }
 
     void update_color () {