Merge lp:~lightdm-gtk-greeter-team/lightdm-gtk-greeter/bug_1317236_default_image into lp:~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk

[Andrew P.]

Bugfix for #1317236:

set_user_image() is not called if users list is hidden => default-user-image option is not applied to user_image

[Simon Steinbeiß (ochosi)]

I've successfully reproduced the bug now and also tested the patch. Great work once again, Andrew!

review: Approve

=== modified file 'src/lightdm-gtk-greeter.c'
--- src/lightdm-gtk-greeter.c	2014-05-02 11:03:59 +0000
+++ src/lightdm-gtk-greeter.c	2014-05-10 00:49:23 +0000
@@ -727,11 +727,12 @@
 set_user_image (const gchar *username)
 {
     const gchar *path;
-    LightDMUser *user;
+    LightDMUser *user = NULL;
     GdkPixbuf *image = NULL;
     GError *error = NULL;
 
-    user = lightdm_user_list_get_user_by_name (lightdm_user_list_get_instance (), username);
+    if (username)
+        user = lightdm_user_list_get_user_by_name (lightdm_user_list_get_instance (), username);
     if (user)
     {
         path = lightdm_user_get_image (user);
@@ -2700,6 +2701,7 @@
     {
         /* Set the background to default */
         set_background (NULL);
+        set_user_image (NULL);
         start_authentication ("*other");
     }
     else