Merge lp:~tintou/switchboard-plug-useraccounts/avatar-no-pixbuf into lp:~elementary-pantheon/switchboard-plug-useraccounts/trunk

[Corentin Noël]

Don't use pixbufs

[lp:~tintou/switchboard-plug-useraccounts/avatar-no-pixbuf]

264. By Corentin Noël on 2016-12-17

Use the image files directly

[Zisu Andrei (matzipan)]

1 comment inline

review: Needs Information

[Corentin Noël (tintou)]

widget.destroy () != delete (widget)
https://valadoc.org/gtk+-3.0/Gtk.Widget.destroy.html
It just kindly ask its container to release it, which results in freeing it.
But you're right for the null-check

Unmerged revisions

264. By Corentin Noël on 2016-12-17

Use the image files directly

=== modified file 'src/Widgets/UserItem.vala'
--- src/Widgets/UserItem.vala	2015-10-18 22:49:57 +0000
+++ src/Widgets/UserItem.vala	2016-12-17 20:43:31 +0000
@@ -59,12 +59,10 @@
         }
 
         public void update_ui () {
-            try {
-                var avatar_pixbuf = new Gdk.Pixbuf.from_file_at_scale (user.get_icon_file (), 32, 32, true);
-                avatar.pixbuf = avatar_pixbuf;
-            } catch (Error e) {
-                avatar.show_default (32);
-            }
+            var new_avatar = new Granite.Widgets.Avatar.from_file (user.get_icon_file (), 32);
+            grid.attach (new_avatar, 0, 0, 1, 2);
+            avatar.destroy ();
+            avatar = new_avatar;
 
             full_name_label.label = user.get_real_name ();
             username_label.label = "<span font_size=\"small\">%s</span>".printf (GLib.Markup.escape_text (user.get_user_name ()));