Merge lp:~donadigo/wingpanel-indicator-session/use-native-accounts-library into lp:~wingpanel-devs/wingpanel-indicator-session/trunk

[Adam Bieńkowski]

* Use native accounts-service library
* Close indicator on activating row (logging of, switching accounts)
* Show guest account proper state when logged in

This branch replaces the old DBus implementation with native accounts-service library. In result we don't need a User class, that's provided already by the library.

Other features include:
- Close indicator on activating row (logging of, switching accounts)
- Show guest account proper state when logged in

[lp:~donadigo/wingpanel-indicator-session/use-native-accounts-library]

94. By Adam Bieńkowski on 2016-08-07

Use enums

[Felipe Escoto (philip.scott)]

Code wise the indicator now looks better than ever! The only problem I have is with the current user being clickable.

review: Needs Fixing (code/ux)

[lp:~donadigo/wingpanel-indicator-session/use-native-accounts-library]

95. By Adam Bieńkowski on 2016-08-08

Prevent logged in users to be able to click themselves

96. By Adam Bieńkowski on 2016-08-08

Simpler draw function

[Felipe Escoto (philip.scott)]

review: Approve (code/ux)

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-02-18 19:58:35 +0000
+++ src/CMakeLists.txt	2016-08-08 16:32:36 +0000
@@ -17,7 +17,6 @@
   Widgets/UserBox.vala
   Widgets/UserListBox.vala
   Widgets/EndSessionDialog.vala
-  Services/User.vala
   Services/UserManager.vala
   Services/DbusInterfaces.vala
   ${CMAKE_CURRENT_BINARY_DIR}/config.vala

=== modified file 'src/Indicator.vala'
--- src/Indicator.vala	2016-07-12 16:33:07 +0000
+++ src/Indicator.vala	2016-08-08 16:32:36 +0000
@@ -67,11 +67,10 @@
                 users_separator = new Wingpanel.Widgets.Separator ();
                 manager = new Session.Services.UserManager (users_separator);
 
-                main_grid.add (manager.current_user);
                 main_grid.add (manager.user_grid);
 
                 if (manager.has_guest) {
-                    manager.user_grid.add_guest (manager.guest (false));
+                    manager.add_guest (false);
                 }
 
                 main_grid.add (users_separator);
@@ -118,6 +117,8 @@
     }
 
     public void connections () {
+        manager.close.connect (() => close ());
+
         lock_screen.clicked.connect (() => {
             close ();
             try {
@@ -151,7 +152,9 @@
         });
     }
 
-    public override void opened () {}
+    public override void opened () {
+        manager.update_all ();
+    }
 
     public override void closed () {}
 }

=== modified file 'src/Services/DbusInterfaces.vala'
--- src/Services/DbusInterfaces.vala	2016-08-05 22:26:34 +0000
+++ src/Services/DbusInterfaces.vala	2016-08-08 16:32:36 +0000
@@ -17,12 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
-/* To generate new UserBoxes for each user, and when a new one is added */
-[DBus (name = "org.freedesktop.Accounts")]
-interface AccountsInterface : Object {
-    public abstract string[] list_cached_users () throws IOError;
-    public signal void user_added (ObjectPath user_path);
-    public signal void user_deleted (ObjectPath user_path);
+struct UserInfo {
+    uint32 uid;
+    string user_name;
 }
 
 /* Power and system control */
@@ -42,26 +39,18 @@
     public abstract void reboot (bool interactive) throws IOError;
     public abstract void power_off (bool interactive) throws IOError;
 
-    public abstract string? get_user (uint32 uuid) throws IOError;
+    public abstract UserInfo[] list_users () throws IOError;
+    public abstract ObjectPath? get_user (uint32 uuid) throws IOError;
+}
+
+[DBus (name = "org.freedesktop.login1.User")]
+interface UserInterface : Object {
+    public abstract string state { owned get; }
 }
 
 [DBus (name = "org.freedesktop.DisplayManager.Seat")]
 interface SeatInterface : Object {
-    //public abstract void SwitchToGreeter () throws IOError;
+    public abstract bool has_guest_account { get; }
     public abstract void switch_to_guest (string session_name) throws IOError;
     public abstract void switch_to_user (string username, string session_name) throws IOError;
-}
-
-/* for User.vala, to get the user properties */
-[DBus (name = "org.freedesktop.Accounts.User")]
-interface UserInterface : Object {
-    public signal void changed ();
-}
-
-[DBus (name = "org.freedesktop.DBus.Properties")]
-interface PropertiesInterface : Object {
-    public abstract Variant get (string interface, string propname) throws IOError;
-
-    /* public abstract void Set (string interface, string propname, Variant value) throws IOError; */
-    public signal void properties_changed ();
-}
+}
\ No newline at end of file

=== removed file 'src/Services/User.vala'
--- src/Services/User.vala	2016-01-15 18:20:25 +0000
+++ src/Services/User.vala	1970-01-01 00:00:00 +0000
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2011-2015 Wingpanel Developers (http://launchpad.net/wingpanel)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-public class Session.Services.User : Object {
-    private static string ACCOUNTS_INTERFACE = "org.freedesktop.Accounts";
-    private static string USER_INTERFACE = "org.freedesktop.Accounts.User";
-    private static string LOGIN_INTERFACE = "org.freedesktop.login1";
-    private static string MANAGER = "/org/freedesktop/login1";
-
-    public string user_path { get; private set; }
-    public string real_name { get; private set; }
-    public string user_name { get; private set; }
-    public string icon_file { get; private set; }
-    public uint64 Uid { get; private set; }
-    public bool locked { get; private set; }
-
-    private UserInterface? user_interface = null;
-    private PropertiesInterface? user_properties = null;
-    private PropertiesInterface? state_properties = null;
-    private SystemInterface? system_interface = null;
-
-    public signal void properties_updated ();
-
-    public User (string user_path_) {
-        this.user_path = user_path_;
-
-        connect_to_bus ();
-        connect_signals ();
-        update_properties ();
-        get_state ();
-
-    }
-
-    private bool connect_to_bus () {
-        try {
-            system_interface = Bus.get_proxy_sync (BusType.SYSTEM, LOGIN_INTERFACE, MANAGER, DBusProxyFlags.NONE);
-            user_interface = Bus.get_proxy_sync (BusType.SYSTEM, ACCOUNTS_INTERFACE, user_path, DBusProxyFlags.NONE);
-            user_properties = Bus.get_proxy_sync (BusType.SYSTEM, ACCOUNTS_INTERFACE, user_path, DBusProxyFlags.NONE);
-
-            update_properties ();
-            string? user_object_path = system_interface.get_user ((uint32)Uid);
-            state_properties = Bus.get_proxy_sync (BusType.SYSTEM, LOGIN_INTERFACE, user_object_path, DBusProxyFlags.NONE);
-
-            debug ("Connection to user account established. User path: %s", user_object_path);
-
-            return user_interface != null & user_properties != null;
-        } catch (Error e) {
-            critical ("Connecting to Accounts failed: %s", e.message);
-            return false;
-        }
-    }
-
-    private void connect_signals () {
-        user_interface.changed.connect (update_properties);
-        user_properties.properties_changed.connect (update_properties);
-        state_properties.properties_changed.connect (update_properties);
-    }
-
-    public bool get_state () {
-        bool state = false;
-
-        try {
-            string status = state_properties.get (LOGIN_INTERFACE + ".User", "State").get_string ();
-
-            if (status == "active" || status == "online") {
-                state = true;
-            }
-        } catch (Error e) {
-            critical ("Could not get users' state: %s", e.message);
-        }
-
-        return state;
-    }
-
-    public void update_properties () {
-        try {
-            real_name = user_properties.get (USER_INTERFACE, "RealName").get_string ();
-            user_name = user_properties.get (USER_INTERFACE, "UserName").get_string ();
-            icon_file = user_properties.get (USER_INTERFACE, "IconFile").get_string ();
-            locked = user_properties.get (USER_INTERFACE, "Locked").get_boolean ();
-            Uid = user_properties.get (USER_INTERFACE, "Uid").get_uint64 ();
-
-            if (real_name == "") {
-                real_name = user_name;
-            }
-
-            properties_updated ();
-        } catch (Error e) {
-            critical ("Updating device properties failed: %s", e.message);
-        }
-    }
-}

=== modified file 'src/Services/UserManager.vala'
--- src/Services/UserManager.vala	2016-05-21 15:56:59 +0000
+++ src/Services/UserManager.vala	2016-08-08 16:32:36 +0000
@@ -17,16 +17,93 @@
  * Boston, MA 02111-1307, USA.
  */
 
+public enum UserState {
+    ACTIVE,
+    ONLINE,
+    OFFLINE;
+
+    public static UserState to_enum (string state) {
+        switch (state) {
+            case "active":
+                return UserState.ACTIVE;
+            case "online":
+                return UserState.ONLINE;
+        }
+
+        return UserState.OFFLINE;
+    }
+}
+
 public class Session.Services.UserManager : Object {
+    public signal void close ();
+
+    private const string LOGIN_IFACE = "org.freedesktop.login1";
+    private const string LOGIN_PATH = "/org/freedesktop/login1";
+
     private signal void delete_user (ObjectPath user_path);
-    private AccountsInterface accounts_interface;
-    private PropertiesInterface state_properties;
+    private Act.UserManager manager;
+    private List<Widgets.Userbox> userbox_list;
+    private SeatInterface dm_proxy;
     private Wingpanel.Widgets.Separator users_separator;
 
     public Session.Widgets.UserListBox user_grid;
-    public Session.Widgets.Userbox current_user;
     
-    public bool has_guest {public get; private set; default = false;}
+    public bool has_guest { public get; private set; default = false; }
+
+    private static SystemInterface? login_proxy;
+
+    static construct {
+        try {
+            login_proxy = Bus.get_proxy_sync (BusType.SYSTEM, LOGIN_IFACE, LOGIN_PATH, DBusProxyFlags.NONE);
+        } catch (IOError e) {
+            stderr.printf ("UserManager error: %s\n", e.message);
+        }        
+    }
+
+    public static UserState get_user_state (uint32 uuid) {
+        if (login_proxy == null) {
+            return UserState.OFFLINE;
+        }
+
+        try {
+            ObjectPath? path = login_proxy.get_user (uuid);
+            if (path == null) {
+                return UserState.OFFLINE;
+            }
+
+            UserInterface? user = Bus.get_proxy_sync (BusType.SYSTEM, LOGIN_IFACE, path, DBusProxyFlags.NONE);
+            if (user == null) {
+                return UserState.OFFLINE;
+            }
+
+            return UserState.to_enum (user.state);
+        } catch (IOError e) {
+            stderr.printf ("Error: %s\n", e.message);
+        }
+
+        return UserState.OFFLINE;
+    }
+
+    public static UserState get_guest_state () {
+        if (login_proxy == null) {
+            return UserState.OFFLINE;
+        }
+
+        try {
+            UserInfo[] users = login_proxy.list_users ();
+            foreach (UserInfo user in users) {
+                var state = get_user_state (user.uid);
+                if (user.user_name.has_prefix ("guest-")
+                    && state == UserState.ACTIVE) {
+                    return UserState.ACTIVE;
+                }
+            }
+        } catch (IOError e) {
+            stderr.printf ("Error: %s\n", e.message);
+        }
+
+        return UserState.OFFLINE;
+    }
 
     public UserManager (Wingpanel.Widgets.Separator users_separator) {
         this.users_separator = users_separator;
@@ -37,74 +114,91 @@
     }
 
     private void init () {
+        userbox_list = new List<Widgets.Userbox> ();
         user_grid = new Session.Widgets.UserListBox ();
+        user_grid.close.connect (() => close ());
+
+        manager = Act.UserManager.get_default ();
+        connect_signals ();
+        init_users ();
 
         try {
-            accounts_interface = Bus.get_proxy_sync (BusType.SYSTEM, "org.freedesktop.Accounts", "/org/freedesktop/Accounts", DBusProxyFlags.NONE);
-            state_properties = Bus.get_proxy_sync (BusType.SYSTEM, "org.freedesktop.DisplayManager", Environment.get_variable ("XDG_SEAT_PATH"), DBusProxyFlags.NONE);
-            has_guest = state_properties.get ("org.freedesktop.DisplayManager.Seat", "HasGuestAccount").get_boolean ();
-
-            connect_signals ();
-            init_users ();
+            dm_proxy = Bus.get_proxy_sync (BusType.SYSTEM, "org.freedesktop.DisplayManager", Environment.get_variable ("XDG_SEAT_PATH"), DBusProxyFlags.NONE);
+            has_guest = dm_proxy.has_guest_account;
         } catch (IOError e) {
             stderr.printf ("UserManager error: %s\n", e.message);
         }
     }
 
     private void connect_signals () {
-        accounts_interface.user_added.connect ((user_path) => {
-            var user = new_user (user_path);
+        manager.user_added.connect (add_user);
+        manager.user_removed.connect (remove_user);
+        manager.user_is_logged_in_changed.connect (update_user);
 
-            if (user != null) {
-                user_grid.add (user);
+        manager.notify["is-loaded"].connect (() => {
+            if (manager.is_loaded) {
+                init_users ();
             }
-        });
-
-        accounts_interface.user_deleted.connect ((user_path) => {
-            delete_user (user_path);
-        });
+        });  
     }
 
     private void init_users () {
-        string current_user = GLib.Environment.get_user_name ();
-
-        try {
-            var users = accounts_interface.list_cached_users ();
-            foreach (string user_address in users) {
-                var userbox = new_user (user_address);
-
-                if (userbox.user.user_name == current_user) {
-                    this.current_user = userbox;
-                } else {
-                    user_grid.add (userbox);
-                }
-            }
-        } catch (IOError e) {
-            stderr.printf ("ERROR: %s\n", e.message);
+        foreach (Act.User user in manager.list_users ()) {
+            add_user (user);
         }
     }
 
-    private Session.Widgets.Userbox new_user (string user_address) {
-        var user = new Session.Services.User (user_address);
+    private void add_user (Act.User user) {
         var userbox = new Session.Widgets.Userbox (user);
-
-        delete_user.connect ((user_path) => {
-            if (userbox.user.user_path == user_path) {
-                user_grid.remove (userbox);
+        userbox_list.append (userbox);
+
+        user_grid.add (userbox);
+
+        users_separator.visible = true;
+    }
+
+    private Widgets.Userbox? get_userbox_from_user (Act.User user) {
+        foreach (Widgets.Userbox userbox in userbox_list) {
+            if (userbox.user.get_user_name () == user.get_user_name ()) {
+                return userbox;
             }
-        });
-
-        users_separator.visible = true;
-
-        return userbox;
-    }
-
-    public Session.Widgets.Userbox guest (bool logged_in) {
+        } 
+
+        return null;       
+    }
+
+    private void remove_user (Act.User user) {
+        var userbox = get_userbox_from_user (user);
+        if (userbox == null) {
+            return;
+        }
+
+        userbox_list.remove (userbox);
+        user_grid.remove (userbox);
+    }
+
+    private void update_user (Act.User user) {
+        var userbox = get_userbox_from_user (user);
+        if (userbox == null) {
+            return;
+        }
+
+        userbox.update_state ();
+    }
+
+    public void update_all () {
+        foreach (var userbox in userbox_list) {
+            userbox.update_state ();
+        }
+    }
+
+    public void add_guest (bool logged_in) {
         var userbox = new Session.Widgets.Userbox.from_data (_("Guest"), logged_in, true);
+        userbox_list.append (userbox);
         userbox.visible = true;
 
+        user_grid.add_guest (userbox);
+
         users_separator.visible = true;
-
-        return userbox;
     }
 }

=== modified file 'src/Widgets/UserBox.vala'
--- src/Widgets/UserBox.vala	2016-05-21 17:15:08 +0000
+++ src/Widgets/UserBox.vala	2016-08-08 16:32:36 +0000
@@ -22,28 +22,30 @@
     private const string LOGGED_OFF = _("Logged out");
     private const int ICON_SIZE = 48;
 
-    public Session.Services.User user { public get; private set; }
+    public Act.User? user { public get; private set; }
     public bool is_guest = false;
 
     private Granite.Widgets.Avatar avatar;
     private Gtk.Label fullname_label;
     private Gtk.Label status_label;
 
-    public Userbox (Session.Services.User user) {
+    public Userbox (Act.User user) {
         this.user = user;
         build_ui ();
         connect_signals ();
-        user.update_properties ();
+        update ();
+        update_state ();
     }
 
     public Userbox.from_data (string fullname, bool logged_in, bool is_guest = false) {
         this.is_guest = is_guest;
-        build_ui (false);
+        this.user = null;
+        build_ui ();
         fullname_label.label = "<b>" + fullname + "</b>";
-        update_state (logged_in);
+        update_state ();
     }
 
-    private void build_ui (bool load_icon = true) {
+    private void build_ui () {
         get_style_context ().add_class ("menuitem");
 
         var grid = new Gtk.Grid ();
@@ -56,11 +58,12 @@
         status_label = new Gtk.Label (LOGGED_OFF);
         status_label.halign = Gtk.Align.START;
 
-        if (load_icon) {
-            avatar = new Granite.Widgets.Avatar.from_file (user.icon_file, ICON_SIZE);
-        } else {
+        if (is_guest) {
             avatar = new Granite.Widgets.Avatar.with_default_icon (ICON_SIZE);
+        } else {
+            avatar = new Granite.Widgets.Avatar.from_file (user.get_icon_file (), ICON_SIZE);
         }
+
         avatar.margin_end = 6;
 
         grid.attach (avatar, 0, 0, 3, 3);
@@ -69,11 +72,34 @@
         this.add (grid);
     }
 
-    public void update (string? fullname, string icon) {
-        this.fullname_label.set_label ("<b>" + fullname + "</b>");
+    // For some reason Act.User.is_logged_in () does not work
+    public UserState get_user_state () {
+        if (is_guest) {
+            return Services.UserManager.get_guest_state ();
+        }
+
+        return Services.UserManager.get_user_state (user.get_uid ());
+    }
+
+    public bool is_logged_in () {
+        var state = get_user_state ();
+        return state == UserState.ONLINE || state == UserState.ACTIVE;
+    }
+
+    public void set_can_activate (bool can_activate) {
+        selectable = can_activate;
+        activatable = can_activate;
+    }
+
+    private void update () {
+        if (is_guest) {
+            return;
+        }
+
+        this.fullname_label.label = "<b>" + user.get_real_name () + "</b>";
 
         try {
-            var pixbuf = new Gdk.Pixbuf.from_file (icon);
+            var pixbuf = new Gdk.Pixbuf.from_file (user.get_icon_file ());
             pixbuf = pixbuf.scale_simple (ICON_SIZE, ICON_SIZE, Gdk.InterpType.BILINEAR);
             avatar.pixbuf = pixbuf;
         } catch (Error e) {
@@ -81,21 +107,33 @@
         }
     }
 
-    public void update_state (bool logged_in) {
-        if (logged_in) {
+    public void update_state () {
+        var state = get_user_state ();
+        set_can_activate (state != UserState.ACTIVE);
+        if (is_logged_in ()) {
             status_label.label = LOGGED_IN;
         } else {
             status_label.label = LOGGED_OFF;
         }
+
+        changed ();
     }
 
     private void connect_signals () {
-        user.properties_updated.connect (() => {
-            update (user.real_name, user.icon_file);
-            update_state (user.get_state ());
+        user.changed.connect (() => {
+            update ();
+            update_state ();
         });
 
         user.bind_property ("locked", this, "visible", BindingFlags.SYNC_CREATE | BindingFlags.INVERT_BOOLEAN);
-        user.bind_property ("locked", this, "no_show_all", BindingFlags.SYNC_CREATE);
+        user.bind_property ("locked", this, "no-show-all", BindingFlags.SYNC_CREATE);
     }
+
+    public override bool draw (Cairo.Context ctx) {
+        if (!get_selectable ()) {
+            get_style_context ().set_state (Gtk.StateFlags.NORMAL);
+        }
+
+        return base.draw (ctx);
+    }    
 }

=== modified file 'src/Widgets/UserListBox.vala'
--- src/Widgets/UserListBox.vala	2016-02-22 17:24:06 +0000
+++ src/Widgets/UserListBox.vala	2016-08-08 16:32:36 +0000
@@ -18,6 +18,8 @@
  */
 
  public class Session.Widgets.UserListBox : Gtk.ListBox {
+    public signal void close ();
+
     private SeatInterface? seat = null;
     private string session_path;
     private bool has_guest;
@@ -32,6 +34,7 @@
             stderr.printf ("DisplayManager.Seat error: %s\n", e.message);
         }
 
+        this.set_sort_func (sort_func);
         this.set_activate_on_single_click (true);
     }
 
@@ -50,14 +53,35 @@
             return;
         }
 
+        close ();
         try {
             if (userbox.is_guest) {
                 seat.switch_to_guest ("");
             } else {
-                seat.switch_to_user (userbox.user.user_name, session_path);
-            }            
+                seat.switch_to_user (userbox.user.get_user_name (), session_path);
+            }
         } catch (IOError e) {
             stderr.printf ("DisplayManager.Seat error: %s\n", e.message);
         }
     }
- }
\ No newline at end of file
+
+    // We could use here Act.User.collate () but we want to show the logged user first
+    public int sort_func (Gtk.ListBoxRow row1, Gtk.ListBoxRow row2) {
+        var userbox1 = (Userbox)row1;
+        var userbox2 = (Userbox)row2;
+
+        if (userbox1.get_user_state () == UserState.ACTIVE) {
+            return -1;
+        } else if (userbox2.get_user_state () == UserState.ACTIVE) {
+            return 1;
+        }
+
+        if (userbox1.is_guest && !userbox2.is_guest) {
+            return 1;
+        } else if (!userbox1.is_guest && userbox2.is_guest) {
+            return -1;
+        }
+
+        return 0;
+    }
+}
\ No newline at end of file