[gdm/multi-stack] Add some fixes for smart card plugin (needs squash)

[Ray Strode <halfline src gnome org>]

commit 2db699a6120f9fe9adb39f70c437875ba693e796
Author: Ray Strode <rstrode redhat com>
Date:   Mon Jun 7 15:52:37 2010 -0400

    Add some fixes for smart card plugin (needs squash)

 gui/simple-greeter/gdm-greeter-login-window.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
index 2c65e61..2a644e5 100644
--- a/gui/simple-greeter/gdm-greeter-login-window.c
+++ b/gui/simple-greeter/gdm-greeter-login-window.c
@@ -167,6 +167,7 @@ static void     switch_mode                 (GdmGreeterLoginWindow *login_window
 static void     update_banner_message       (GdmGreeterLoginWindow *login_window);
 static void     gdm_greeter_login_window_start_session_when_ready (GdmGreeterLoginWindow *login_window,
                                                                    const char            *service_name);
+static void     _show_cancel_button (GdmGreeterLoginWindow *login_window);
 
 G_DEFINE_TYPE (GdmGreeterLoginWindow, gdm_greeter_login_window, GTK_TYPE_WINDOW)
 
@@ -533,7 +534,7 @@ switch_mode (GdmGreeterLoginWindow *login_window,
 
                 show_widget (login_window, "cancel-button", FALSE);
                 show_widget (login_window, "auth-page-box", FALSE);
-                show_widget (login_window, "conversation-list", FALSE);
+                gtk_widget_hide (login_window->priv->conversation_list);
 
                 sensitize_widget (login_window, "disconnect-button", FALSE);
 
@@ -555,7 +556,11 @@ switch_mode (GdmGreeterLoginWindow *login_window,
                 show_widget (login_window, "auth-page-box", TRUE);
 
                 number_of_tasks = gdm_task_list_get_number_of_tasks (GDM_TASK_LIST (login_window->priv->conversation_list));
-                show_widget (login_window, "conversation-list", number_of_tasks > 1);
+                if (number_of_tasks > 1) {
+                        gtk_widget_show (login_window->priv->conversation_list);
+                } else {
+                        gtk_widget_hide (login_window->priv->conversation_list);
+                }
 
                 default_name = "log-in-button";
                 break;
@@ -862,6 +867,7 @@ gdm_greeter_login_window_info (GdmGreeterLoginWindow *login_window,
         g_return_val_if_fail (GDM_IS_GREETER_LOGIN_WINDOW (login_window), FALSE);
         g_debug ("GdmGreeterLoginWindow: info: %s", text);
 
+        _show_cancel_button (login_window);
         task = find_task_with_service_name (login_window, service_name);
 
         if (task != NULL) {
@@ -883,6 +889,7 @@ gdm_greeter_login_window_problem (GdmGreeterLoginWindow *login_window,
         g_return_val_if_fail (GDM_IS_GREETER_LOGIN_WINDOW (login_window), FALSE);
         g_debug ("GdmGreeterLoginWindow: problem: %s", text);
 
+        _show_cancel_button (login_window);
         task = find_task_with_service_name (login_window, service_name);
 
         if (task != NULL) {
@@ -1673,6 +1680,7 @@ load_theme (GdmGreeterLoginWindow *login_window)
          */
         login_window->priv->conversation_list = gdm_task_list_new ();
         gtk_box_pack_start (GTK_BOX (box), login_window->priv->conversation_list, TRUE, TRUE, 0);
+        gtk_box_reorder_child (GTK_BOX (box), login_window->priv->conversation_list, 0);
 
         g_signal_connect_swapped (GDM_TASK_LIST (login_window->priv->conversation_list),
                                   "activated",