From b0f59711785d43d0d3dd76e09064e36bea516e1b Mon Sep 17 00:00:00 2001

From: Ray Strode <rstrode@redhat.com>

Date: Wed, 12 Nov 2014 11:27:50 -0500

Subject: [PATCH 1/5] Revert "loginDialog: make banner message more prominent."

This reverts commit 1f00c48feb75a8749b80a7cace94f622df825f7c.

---

 data/theme/gnome-shell.css | 13 ++++++++-----

 js/gdm/loginDialog.js      | 44 ++++++++++++++++++++++----------------------

 2 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css

index e12c78d..0db9d1e 100644

--- a/data/theme/gnome-shell.css

+++ b/data/theme/gnome-shell.css

@@ -2188,65 +2188,68 @@ StScrollBar StButton#vhandle:active {

     border-radius: 4px;

     background-color: rgba(255,255,255,0.1);

 }

 .candidate-page-button-box {

     height: 2em;

     width: 80px;

 }

 .vertical .candidate-page-button-box {

     padding-top: 0.5em;

 }

 .horizontal .candidate-page-button-box {

     padding-left: 0.5em;

 }

 .candidate-page-button-previous {

     border-radius: 4px 0px 0px 4px;

 }

 .candidate-page-button-next {

     border-radius: 0px 4px 4px 0px;

 }

 .candidate-page-button-icon {

     icon-size: 1em;

 }

 /* Login Dialog */

 .login-dialog-banner-view {

-    padding-top: 96px;

-    padding-left: 1em;

-    height: 14em;

-    max-width: 42em;

-    min-width: 25em;

+    padding-top: 10em;

+    height: 10em;

+}

+

+.login-dialog-banner {

+    font-size: 9pt;

+    color: #666666;

+    width: 30em;

 }

 .login-dialog-title {

     font-size: 14pt;

     font-weight: bold;

     color: #666666;

     padding-bottom: 2em;

 }

 .login-dialog {

     /* Reset border and background */

     border: none;

     background-color: transparent;

 }

 .login-dialog-button-box {

     spacing: 5px;

 }

 .login-dialog-user-list-view {

     -st-vfade-offset: 1em;

 }

 .login-dialog-user-list {

     spacing: 12px;

     padding: .2em;

     width: 23em;

 }

 .login-dialog-user-list-item {

diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js

index 8f5044f..aadc5a9 100644

--- a/js/gdm/loginDialog.js

+++ b/js/gdm/loginDialog.js

@@ -407,136 +407,136 @@ const LoginDialog = new Lang.Class({

         this._userManager = AccountsService.UserManager.get_default()

         let gdmClient = new Gdm.Client();

         if (GLib.getenv('GDM_GREETER_TEST') != '1') {

             this._greeter = gdmClient.get_greeter_sync(null);

             this._greeter.connect('default-session-name-changed',

                                   Lang.bind(this, this._onDefaultSessionChanged));

             this._greeter.connect('session-opened',

                                   Lang.bind(this, this._onSessionOpened));

             this._greeter.connect('timed-login-requested',

                                   Lang.bind(this, this._onTimedLoginRequested));

         }

         this._settings = new Gio.Settings({ schema: GdmUtil.LOGIN_SCREEN_SCHEMA });

         this._settings.connect('changed::' + GdmUtil.BANNER_MESSAGE_KEY,

                                Lang.bind(this, this._updateBanner));

         this._settings.connect('changed::' + GdmUtil.BANNER_MESSAGE_TEXT_KEY,

                                Lang.bind(this, this._updateBanner));

         this._settings.connect('changed::' + GdmUtil.DISABLE_USER_LIST_KEY,

                                Lang.bind(this, this._updateDisableUserList));

         this._settings.connect('changed::' + GdmUtil.LOGO_KEY,

                                Lang.bind(this, this._updateLogo));

         this._textureCache = St.TextureCache.get_default();

         this._textureCache.connect('texture-file-changed',

                                    Lang.bind(this, this._updateLogoTexture));

-        let outerBox = new St.BoxLayout({ x_align: Clutter.ActorAlign.CENTER,

-                                          y_align: Clutter.ActorAlign.START,

-                                          y_expand: true,

-                                          vertical: true });

-        table.pack(outerBox, 0, 0);

-        this._bannerView = new St.ScrollView({ style_class: 'login-dialog-banner-view',

-                                               opacity: 0,

-                                               vscrollbar_policy: Gtk.PolicyType.AUTOMATIC,

-                                               hscrollbar_policy: Gtk.PolicyType.NEVER });

-        outerBox.add_actor(this._bannerView);

-

-        let innerBox = new St.BoxLayout({ vertical: true });

-

-        this._bannerView.add_actor(innerBox);

-        this._bannerLabel = new St.Label({ style_class: 'login-dialog-banner',

-                                           text: '' });

-        this._bannerLabel.clutter_text.line_wrap = true;

-        this._bannerLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;

-        innerBox.add_child(this._bannerLabel);

-        this._updateBanner();

-

         this._userSelectionBox = new St.BoxLayout({ style_class: 'login-dialog-user-selection-box',

                                                     x_align: Clutter.ActorAlign.CENTER,

                                                     y_align: Clutter.ActorAlign.CENTER,

                                                     x_expand: true,

                                                     y_expand: true,

                                                     vertical: true,

                                                     visible: false });

         this._userList = new UserList();

         this._userSelectionBox.add(this._userList.actor,

                                    { expand: true,

                                      x_fill: true,

                                      y_fill: true });

         this._authPrompt = new AuthPrompt.AuthPrompt(gdmClient, AuthPrompt.AuthPromptMode.UNLOCK_OR_LOG_IN);

         this._authPrompt.connect('prompted', Lang.bind(this, this._onPrompted));

         this._authPrompt.connect('reset', Lang.bind(this, this._onReset));

         this._authPrompt.hide();

         this._authPrompt.actor.x_align = Clutter.ActorAlign.CENTER;

         this._authPrompt.actor.y_align = Clutter.ActorAlign.CENTER;

         this._authPrompt.actor.x_expand = false;

         this._authPrompt.actor.y_expand = false;

         table.pack(this._authPrompt.actor, 0, 0);

         table.set_span(this._authPrompt.actor, 1, 3);

         // translators: this message is shown below the user list on the

         // login screen. It can be activated to reveal an entry for

         // manually entering the username.

         let notListedLabel = new St.Label({ text: _("Not listed?"),

                                             style_class: 'login-dialog-not-listed-label' });

         this._notListedButton = new St.Button({ style_class: 'login-dialog-not-listed-button',

                                                 button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,

                                                 can_focus: true,

                                                 child: notListedLabel,

                                                 reactive: true,

                                                 x_align: St.Align.START,

                                                 x_fill: true });

         this._notListedButton.connect('clicked', Lang.bind(this, this._hideUserListAskForUsernameAndBeginVerification));

         this._notListedButton.hide();

         this._userSelectionBox.add(this._notListedButton,

                                    { expand: false,

                                      x_align: St.Align.START,

                                      x_fill: true });

         this._logoBin = new St.Widget({ style_class: 'login-dialog-logo-bin',

                                         x_align: Clutter.ActorAlign.CENTER,

                                         y_align: Clutter.ActorAlign.END,

                                         x_expand: true,

                                         y_expand: true });

         table.pack(this._userSelectionBox, 0, 0);

         table.set_span(this._userSelectionBox, 1, 3);

+        let outerBox = new St.BoxLayout({ x_align: Clutter.ActorAlign.CENTER,

+                                          y_align: Clutter.ActorAlign.CENTER,

+                                          vertical: true });

+        table.pack(outerBox, 0, 2);

+        table.set_span(outerBox, 1, 1);

+        this._bannerView = new St.ScrollView({ style_class: 'login-dialog-banner-view',

+                                               opacity: 0,

+                                               vscrollbar_policy: Gtk.PolicyType.AUTOMATIC,

+                                               hscrollbar_policy: Gtk.PolicyType.NEVER });

+        outerBox.add_actor(this._bannerView);

+

+        let innerBox = new St.BoxLayout({ vertical: true });

+

+        this._bannerView.add_actor(innerBox);

+        this._bannerLabel = new St.Label({ style_class: 'login-dialog-banner',

+                                           text: '' });

+        this._bannerLabel.clutter_text.line_wrap = true;

+        this._bannerLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;

+        innerBox.add_child(this._bannerLabel);

+        this._updateBanner();

+

         table.pack(this._logoBin, 0, 2);

         table.set_span(this._logoBin, 1, 1);

         this._updateLogo();

         // We have overlapping widgets to obtain the kind of centering we want.

         // We need to make sure the widgets that take input are on top of the

         // stack.

         this.actor.set_child_above_sibling(this._userSelectionBox, null);

         this.actor.set_child_above_sibling(this._authPrompt.actor, null);

         this._userList.connect('activate',

                                Lang.bind(this, function(userList, item) {

                                    this._onUserListActivated(item);

                                }));

         this._sessionMenuButton = new SessionMenuButton();

         this._sessionMenuButton.connect('session-activated',

                                   Lang.bind(this, function(list, sessionId) {

                                                 this._greeter.call_select_session_sync (sessionId, null);

                                             }));

         this._sessionMenuButton.actor.opacity = 0;

         this._sessionMenuButton.actor.show();

         this._authPrompt.addActorToDefaultButtonWell(this._sessionMenuButton.actor);

         this._disableUserList = undefined;

         this._userListLoaded = false;

         // If the user list is enabled, it should take key focus; make sure the

         // screen shield is initialized first to prevent it from stealing the

@@ -599,107 +599,107 @@ const LoginDialog = new Lang.Class({

         Tweener.addTween(this._bannerView,

                          { opacity: 255,

                            time: _FADE_ANIMATION_TIME,

                            transition: 'easeOutQuad' });

     },

     _hideBannerView: function() {

         Tweener.removeTweens(this._bannerView);

         this._bannerView.opacity = 0;

     },

     _updateLogoTexture: function(cache, uri) {

         if (this._logoFileUri != uri)

             return;

         this._logoBin.destroy_all_children();

         if (this._logoFileUri)

             this._logoBin.add_child(this._textureCache.load_uri_async(this._logoFileUri,

                                                                       -1, _LOGO_ICON_HEIGHT));

     },

     _updateLogo: function() {

         let path = this._settings.get_string(GdmUtil.LOGO_KEY);

         this._logoFileUri = path ? Gio.file_new_for_path(path).get_uri() : null;

         this._updateLogoTexture(this._textureCache, this._logoFileUri);

     },

     _onPrompted: function() {

         this._sessionMenuButton.updateSensitivity(true);

+        this._fadeInBannerView();

         if (this._shouldShowSessionMenuButton())

             this._authPrompt.setActorInDefaultButtonWell(this._sessionMenuButton.actor);

         this._showPrompt();

     },

     _onReset: function(authPrompt, beginRequest) {

         this._sessionMenuButton.updateSensitivity(true);

         this._hideBannerView();

         this._user = null;

         if (beginRequest == AuthPrompt.BeginRequestType.PROVIDE_USERNAME) {

             if (!this._disableUserList)

                 this._showUserList();

             else

                 this._hideUserListAskForUsernameAndBeginVerification();

         } else {

             this._hideUserListAndBeginVerification();

         }

     },

     _onDefaultSessionChanged: function(client, sessionId) {

         this._sessionMenuButton.setActiveSession(sessionId);

     },

     _shouldShowSessionMenuButton: function() {

         if (this._authPrompt.verificationStatus != AuthPrompt.AuthPromptStatus.VERIFYING &&

             this._authPrompt.verificationStatus != AuthPrompt.AuthPromptStatus.VERIFICATION_FAILED)

           return false;

         if (this._user && this._user.is_loaded && this._user.is_logged_in())

           return false;

         return true;

     },

     _showPrompt: function() {

         if (this._authPrompt.actor.visible)

             return;

         this._authPrompt.actor.opacity = 0;

         this._authPrompt.actor.show();

         Tweener.addTween(this._authPrompt.actor,

                          { opacity: 255,

                            time: _FADE_ANIMATION_TIME,

                            transition: 'easeOutQuad' });

-        this._fadeInBannerView();

     },

     _showRealmLoginHint: function(realmManager, hint) {

         if (!hint)

             return;

         hint = hint.replace(/%U/g, 'user');

         hint = hint.replace(/%D/g, 'DOMAIN');

         hint = hint.replace(/%[^UD]/g, '');

         // Translators: this message is shown below the username entry field

         // to clue the user in on how to login to the local network realm

         this._authPrompt.setMessage(_("(e.g., user or %s)").format(hint), GdmUtil.MessageType.HINT);

     },

     _askForUsernameAndBeginVerification: function() {

         this._authPrompt.setPasswordChar('');

         this._authPrompt.setQuestion(_("Username: "));

         let realmManager = new Realmd.Manager();

         let realmSignalId = realmManager.connect('login-format-changed',

                                                  Lang.bind(this, this._showRealmLoginHint));

         this._showRealmLoginHint(realmManager.loginFormat);

         let nextSignalId = this._authPrompt.connect('next',

                                                     Lang.bind(this, function() {

                                                         this._authPrompt.disconnect(nextSignalId);

                                                         this._authPrompt.updateSensitivity(false);

                                                         let answer = this._authPrompt.getAnswer();

                                                         this._user = this._userManager.get_user(answer);

-- 

2.1.0

From c5ef28f7ccc96bf6ed57c80fe98cd5fe31f4004d Mon Sep 17 00:00:00 2001

From: Ray Strode <rstrode@redhat.com>

Date: Wed, 12 Nov 2014 11:29:22 -0500

Subject: [PATCH 2/5] Revert "loginDialog: display banner message when

 disable-user-list=true"

This reverts commit b94289671424068d973a553fb610398830d25e21.

Conflicts:

	js/gdm/loginDialog.js

---

 data/theme/gnome-shell.css | 10 +++---

 js/gdm/loginDialog.js      | 76 +++++++++++++---------------------------------

 2 files changed, 25 insertions(+), 61 deletions(-)

diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css

index 0db9d1e..aa82632 100644

--- a/data/theme/gnome-shell.css

+++ b/data/theme/gnome-shell.css

@@ -2187,69 +2187,67 @@ StScrollBar StButton#vhandle:active {

 .candidate-box:hover {

     border-radius: 4px;

     background-color: rgba(255,255,255,0.1);

 }

 .candidate-page-button-box {

     height: 2em;

     width: 80px;

 }

 .vertical .candidate-page-button-box {

     padding-top: 0.5em;

 }

 .horizontal .candidate-page-button-box {

     padding-left: 0.5em;

 }

 .candidate-page-button-previous {

     border-radius: 4px 0px 0px 4px;

 }

 .candidate-page-button-next {

     border-radius: 0px 4px 4px 0px;

 }

 .candidate-page-button-icon {

     icon-size: 1em;

 }

 /* Login Dialog */

-.login-dialog-banner-view {

-    padding-top: 10em;

-    height: 10em;

-}

 .login-dialog-banner {

-    font-size: 9pt;

+    font-size: 10pt;

+    font-weight: bold;

+    text-align: center;

     color: #666666;

-    width: 30em;

+    padding-bottom: 1em;

 }

 .login-dialog-title {

     font-size: 14pt;

     font-weight: bold;

     color: #666666;

     padding-bottom: 2em;

 }

 .login-dialog {

     /* Reset border and background */

     border: none;

     background-color: transparent;

 }

 .login-dialog-button-box {

     spacing: 5px;

 }

 .login-dialog-user-list-view {

     -st-vfade-offset: 1em;

 }

 .login-dialog-user-list {

     spacing: 12px;

     padding: .2em;

     width: 23em;

 }

 .login-dialog-user-list-item {

diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js

index aadc5a9..f35921c 100644

--- a/js/gdm/loginDialog.js

+++ b/js/gdm/loginDialog.js

@@ -1,61 +1,60 @@

 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

 /*

  * Copyright 2011 Red Hat, Inc

  *

  * 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, 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.

  */

 const AccountsService = imports.gi.AccountsService;

 const Atk = imports.gi.Atk;

 const Clutter = imports.gi.Clutter;

 const Gdm = imports.gi.Gdm;

 const Gio = imports.gi.Gio;

 const GLib = imports.gi.GLib;

 const Gtk = imports.gi.Gtk;

 const Lang = imports.lang;

 const Mainloop = imports.mainloop;

 const Meta = imports.gi.Meta;

-const Pango = imports.gi.Pango;

 const Shell = imports.gi.Shell;

 const Signals = imports.signals;

 const St = imports.gi.St;

 const AuthPrompt = imports.gdm.authPrompt;

 const Batch = imports.gdm.batch;

 const BoxPointer = imports.ui.boxpointer;

 const CtrlAltTab = imports.ui.ctrlAltTab;

 const GdmUtil = imports.gdm.util;

 const Layout = imports.ui.layout;

 const Main = imports.ui.main;

 const PopupMenu = imports.ui.popupMenu;

 const Realmd = imports.gdm.realmd;

 const Tweener = imports.ui.tweener;

 const UserMenu = imports.ui.userMenu;

 const UserWidget = imports.ui.userWidget;

 const _FADE_ANIMATION_TIME = 0.25;

 const _SCROLL_ANIMATION_TIME = 0.5;

 const _TIMED_LOGIN_IDLE_THRESHOLD = 5.0;

 const _LOGO_ICON_HEIGHT = 48;

 let _loginDialog = null;

 const UserListItem = new Lang.Class({

     Name: 'UserListItem',

     _init: function(user) {

         this.user = user;

         this._userChangedId = this.user.connect('changed',

@@ -367,185 +366,166 @@ const SessionMenuButton = new Lang.Class({

         ids.sort();

         if (ids.length <= 1) {

             this._button.hide();

             return;

         }

         for (let i = 0; i < ids.length; i++) {

             let [sessionName, sessionDescription] = Gdm.get_session_name_and_description(ids[i]);

             let id = ids[i];

             let item = new PopupMenu.PopupMenuItem(sessionName);

             this._menu.addMenuItem(item);

             this._items[id] = item;

             if (!this._activeSessionId)

                 this.setActiveSession(id);

             item.connect('activate', Lang.bind(this, function() {

                 this.setActiveSession(id);

             }));

         }

     }

 });

 Signals.addSignalMethods(SessionMenuButton.prototype);

 const LoginDialog = new Lang.Class({

     Name: 'LoginDialog',

     _init: function(parentActor) {

-        let table = new Clutter.TableLayout();

         this.actor = new St.Widget({ accessible_role: Atk.Role.WINDOW,

-                                     layout_manager: table,

+                                     layout_manager: new Clutter.BinLayout(),

                                      style_class: 'login-dialog',

                                      visible: false });

         this.actor.add_constraint(new Layout.MonitorConstraint({ primary: true }));

         this.actor.connect('destroy', Lang.bind(this, this._onDestroy));

         parentActor.add_child(this.actor);

         this._userManager = AccountsService.UserManager.get_default()

         let gdmClient = new Gdm.Client();

         if (GLib.getenv('GDM_GREETER_TEST') != '1') {

             this._greeter = gdmClient.get_greeter_sync(null);

             this._greeter.connect('default-session-name-changed',

                                   Lang.bind(this, this._onDefaultSessionChanged));

             this._greeter.connect('session-opened',

                                   Lang.bind(this, this._onSessionOpened));

             this._greeter.connect('timed-login-requested',

                                   Lang.bind(this, this._onTimedLoginRequested));

         }

         this._settings = new Gio.Settings({ schema: GdmUtil.LOGIN_SCREEN_SCHEMA });

         this._settings.connect('changed::' + GdmUtil.BANNER_MESSAGE_KEY,

                                Lang.bind(this, this._updateBanner));

         this._settings.connect('changed::' + GdmUtil.BANNER_MESSAGE_TEXT_KEY,

                                Lang.bind(this, this._updateBanner));

         this._settings.connect('changed::' + GdmUtil.DISABLE_USER_LIST_KEY,

                                Lang.bind(this, this._updateDisableUserList));

         this._settings.connect('changed::' + GdmUtil.LOGO_KEY,

                                Lang.bind(this, this._updateLogo));

         this._textureCache = St.TextureCache.get_default();

         this._textureCache.connect('texture-file-changed',

                                    Lang.bind(this, this._updateLogoTexture));

         this._userSelectionBox = new St.BoxLayout({ style_class: 'login-dialog-user-selection-box',

                                                     x_align: Clutter.ActorAlign.CENTER,

                                                     y_align: Clutter.ActorAlign.CENTER,

                                                     x_expand: true,

                                                     y_expand: true,

                                                     vertical: true,

                                                     visible: false });

+        this.actor.add_child(this._userSelectionBox);

+

+        this._bannerLabel = new St.Label({ style_class: 'login-dialog-banner',

+                                           text: '' });

+        this._userSelectionBox.add(this._bannerLabel);

+        this._updateBanner();

+

         this._userList = new UserList();

         this._userSelectionBox.add(this._userList.actor,

                                    { expand: true,

                                      x_fill: true,

                                      y_fill: true });

         this._authPrompt = new AuthPrompt.AuthPrompt(gdmClient, AuthPrompt.AuthPromptMode.UNLOCK_OR_LOG_IN);

         this._authPrompt.connect('prompted', Lang.bind(this, this._onPrompted));

         this._authPrompt.connect('reset', Lang.bind(this, this._onReset));

         this._authPrompt.hide();

-        this._authPrompt.actor.x_align = Clutter.ActorAlign.CENTER;

-        this._authPrompt.actor.y_align = Clutter.ActorAlign.CENTER;

-        this._authPrompt.actor.x_expand = false;

-        this._authPrompt.actor.y_expand = false;

-        table.pack(this._authPrompt.actor, 0, 0);

-        table.set_span(this._authPrompt.actor, 1, 3);

+        this.actor.add_child(this._authPrompt.actor);

         // translators: this message is shown below the user list on the

         // login screen. It can be activated to reveal an entry for

         // manually entering the username.

         let notListedLabel = new St.Label({ text: _("Not listed?"),

                                             style_class: 'login-dialog-not-listed-label' });

         this._notListedButton = new St.Button({ style_class: 'login-dialog-not-listed-button',

                                                 button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,

                                                 can_focus: true,

                                                 child: notListedLabel,

                                                 reactive: true,

                                                 x_align: St.Align.START,

                                                 x_fill: true });

         this._notListedButton.connect('clicked', Lang.bind(this, this._hideUserListAskForUsernameAndBeginVerification));

         this._notListedButton.hide();

         this._userSelectionBox.add(this._notListedButton,

                                    { expand: false,

                                      x_align: St.Align.START,

                                      x_fill: true });

         this._logoBin = new St.Widget({ style_class: 'login-dialog-logo-bin',

                                         x_align: Clutter.ActorAlign.CENTER,

                                         y_align: Clutter.ActorAlign.END,

                                         x_expand: true,

                                         y_expand: true });

-

-        table.pack(this._userSelectionBox, 0, 0);

-        table.set_span(this._userSelectionBox, 1, 3);

-

-        let outerBox = new St.BoxLayout({ x_align: Clutter.ActorAlign.CENTER,

-                                          y_align: Clutter.ActorAlign.CENTER,

-                                          vertical: true });

-        table.pack(outerBox, 0, 2);

-        table.set_span(outerBox, 1, 1);

-        this._bannerView = new St.ScrollView({ style_class: 'login-dialog-banner-view',

-                                               opacity: 0,

-                                               vscrollbar_policy: Gtk.PolicyType.AUTOMATIC,

-                                               hscrollbar_policy: Gtk.PolicyType.NEVER });

-        outerBox.add_actor(this._bannerView);

-

-        let innerBox = new St.BoxLayout({ vertical: true });

-

-        this._bannerView.add_actor(innerBox);

-        this._bannerLabel = new St.Label({ style_class: 'login-dialog-banner',

-                                           text: '' });

-        this._bannerLabel.clutter_text.line_wrap = true;

-        this._bannerLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;

-        innerBox.add_child(this._bannerLabel);

-        this._updateBanner();

-

-        table.pack(this._logoBin, 0, 2);

-        table.set_span(this._logoBin, 1, 1);

+        this.actor.add_child(this._logoBin);

         this._updateLogo();

-        // We have overlapping widgets to obtain the kind of centering we want.

-        // We need to make sure the widgets that take input are on top of the

-        // stack.

-        this.actor.set_child_above_sibling(this._userSelectionBox, null);

-        this.actor.set_child_above_sibling(this._authPrompt.actor, null);

+        if (!this._userManager.is_loaded)

+            this._userManagerLoadedId = this._userManager.connect('notify::is-loaded',

+                                                                  Lang.bind(this, function() {

+                                                                      if (this._userManager.is_loaded) {

+                                                                          this._loadUserList();

+                                                                          this._userManager.disconnect(this._userManagerLoadedId);

+                                                                          this._userManagerLoadedId = 0;

+                                                                      }

+                                                                  }));

+        else

+            this._loadUserList();

         this._userList.connect('activate',

                                Lang.bind(this, function(userList, item) {

                                    this._onUserListActivated(item);

                                }));

         this._sessionMenuButton = new SessionMenuButton();

         this._sessionMenuButton.connect('session-activated',

                                   Lang.bind(this, function(list, sessionId) {

                                                 this._greeter.call_select_session_sync (sessionId, null);

                                             }));

         this._sessionMenuButton.actor.opacity = 0;

         this._sessionMenuButton.actor.show();

         this._authPrompt.addActorToDefaultButtonWell(this._sessionMenuButton.actor);

         this._disableUserList = undefined;

         this._userListLoaded = false;