From 1a8e5634ea780869574072ce5d4b33048fb35698 Mon Sep 17 00:00:00 2001

From: Ray Strode <rstrode@redhat.com>

Date: Thu, 13 Dec 2007 10:12:30 -0500

Subject: [PATCH] Change user-chooser-widget over to use new chooser widget

---

 gui/simple-greeter/Makefile.am               |   10 +

 gui/simple-greeter/gdm-user-chooser-widget.c |  600 ++------------------------

 gui/simple-greeter/gdm-user-chooser-widget.h |   11 +-

 3 files changed, 59 insertions(+), 562 deletions(-)

diff --git a/gui/simple-greeter/Makefile.am b/gui/simple-greeter/Makefile.am

index a403f24..836c620 100644

--- a/gui/simple-greeter/Makefile.am

+++ b/gui/simple-greeter/Makefile.am

@@ -45,6 +45,8 @@ test_greeter_login_window_SOURCES = 	\

 	test-greeter-login-window.c	\

 	gdm-greeter-login-window.h	\

 	gdm-greeter-login-window.c	\

+	gdm-chooser-widget.h		\

+	gdm-chooser-widget.c		\

 	gdm-user-chooser-widget.h	\

 	gdm-user-chooser-widget.c	\

 	gdm-user-chooser-dialog.h	\

@@ -86,6 +88,8 @@ test_language_chooser_LDADD =	\

 test_session_chooser_SOURCES = 	\

 	test-session-chooser.c		\

+	gdm-chooser-widget.h		\

+	gdm-chooser-widget.c		\

 	gdm-session-chooser-widget.h	\

 	gdm-session-chooser-widget.c	\

 	gdm-session-chooser-dialog.h	\

@@ -98,6 +102,8 @@ test_session_chooser_LDADD =		\

 test_user_chooser_SOURCES = 		\

 	test-user-chooser.c		\

+	gdm-chooser-widget.h		\

+	gdm-chooser-widget.c		\

 	gdm-user-chooser-widget.h	\

 	gdm-user-chooser-widget.c	\

 	gdm-user-chooser-dialog.h	\

@@ -131,6 +137,8 @@ libexec_PROGRAMS =			\

 gdm_simple_greeter_SOURCES =  		\

 	greeter-main.c 			\

+	gdm-chooser-widget.h		\

+	gdm-chooser-widget.c		\

 	gdm-greeter-client.h		\

 	gdm-greeter-client.c		\

 	gdm-greeter-session.h		\

@@ -145,6 +153,8 @@ gdm_simple_greeter_SOURCES =  		\

 	gdm-greeter-panel.c		\

 	gdm-greeter-background.h	\

 	gdm-greeter-background.c	\

+	gdm-session-chooser-widget.h	\

+	gdm-session-chooser-widget.c	\

 	gdm-user-chooser-widget.h	\

 	gdm-user-chooser-widget.c	\

 	gdm-user-manager.h		\

diff --git a/gui/simple-greeter/gdm-user-chooser-widget.c b/gui/simple-greeter/gdm-user-chooser-widget.c

index e8c0cdc..b8a9bb7 100644

--- a/gui/simple-greeter/gdm-user-chooser-widget.c

+++ b/gui/simple-greeter/gdm-user-chooser-widget.c

@@ -1,6 +1,7 @@

 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-

  *

  * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>

+ * Copyright (C) 2007 Ray Strode <rstrode@redhat.com>

  *

  * 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

@@ -47,61 +48,23 @@ enum {

 struct GdmUserChooserWidgetPrivate

 {

-        GtkWidget          *treeview;

-

-        GtkTreeModel       *real_model;

-        GtkTreeModel       *filter_model;

-        GtkTreeModel       *sort_model;

-

         GdmUserManager     *manager;

         GdkPixbuf          *logged_in_pixbuf;

-        char               *chosen_user;

-        gboolean            show_only_chosen;

-        gboolean            show_other_user;

-        gboolean            show_guest_user;

-        guint               populate_id;

+        guint               show_other_user : 1;

+        guint               show_guest_user : 1;

 };

 enum {

         PROP_0,

 };

-enum {

-        USER_CHOSEN,

-        LAST_SIGNAL

-};

-

-static guint signals [LAST_SIGNAL] = { 0, };

-

 static void     gdm_user_chooser_widget_class_init  (GdmUserChooserWidgetClass *klass);

 static void     gdm_user_chooser_widget_init        (GdmUserChooserWidget      *user_chooser_widget);

 static void     gdm_user_chooser_widget_finalize    (GObject                   *object);

-G_DEFINE_TYPE (GdmUserChooserWidget, gdm_user_chooser_widget, GTK_TYPE_VBOX)

-

-enum {

-        CHOOSER_LIST_PIXBUF_COLUMN = 0,

-        CHOOSER_LIST_NAME_COLUMN,

-        CHOOSER_LIST_TOOLTIP_COLUMN,

-        CHOOSER_LIST_IS_LOGGED_IN_COLUMN,

-        CHOOSER_LIST_ID_COLUMN

-};

-

-void

-gdm_user_chooser_widget_set_show_only_chosen (GdmUserChooserWidget *widget,

-                                              gboolean              show_only)

-{

-        g_return_if_fail (GDM_IS_USER_CHOOSER_WIDGET (widget));

-

-        if (widget->priv->show_only_chosen != show_only) {

-                widget->priv->show_only_chosen = show_only;

-                if (widget->priv->filter_model != NULL) {

-                        gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (widget->priv->filter_model));

-                }

-        }

-}

+G_DEFINE_TYPE (GdmUserChooserWidget, gdm_user_chooser_widget, GDM_TYPE_CHOOSER_WIDGET)

 void

 gdm_user_chooser_widget_set_show_other_user (GdmUserChooserWidget *widget,

@@ -111,9 +74,6 @@ gdm_user_chooser_widget_set_show_other_user (GdmUserChooserWidget *widget,

         if (widget->priv->show_other_user != show_user) {

                 widget->priv->show_other_user = show_user;

-                if (widget->priv->filter_model != NULL) {

-                        gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (widget->priv->filter_model));

-                }

         }

 }

@@ -125,122 +85,15 @@ gdm_user_chooser_widget_set_show_guest_user (GdmUserChooserWidget *widget,

         if (widget->priv->show_guest_user != show_user) {

                 widget->priv->show_guest_user = show_user;

-                if (widget->priv->filter_model != NULL) {

-                        gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (widget->priv->filter_model));

-                }

         }

 }

 char *

 gdm_user_chooser_widget_get_chosen_user_name (GdmUserChooserWidget *widget)

 {

-        char *user_name;

-

         g_return_val_if_fail (GDM_IS_USER_CHOOSER_WIDGET (widget), NULL);

-        user_name = NULL;

-        if (widget->priv->chosen_user != NULL) {

-                user_name = g_strdup (widget->priv->chosen_user);

-        }

-

-        return user_name;

-}

-

-static void

-activate_name (GdmUserChooserWidget *widget,

-               const char           *name)

-{

-        GtkTreeModel *model;

-        GtkTreeIter   iter;

-        GtkTreePath  *path;

-

-        path = NULL;

-

-        model = widget->priv->real_model;

-

-        if (name != NULL && gtk_tree_model_get_iter_first (model, &iter)) {

-

-                do {

-                        char           *id;

-                        gboolean        found;

-

-                        id = NULL;

-                        gtk_tree_model_get (model,

-                                            &iter,

-                                            CHOOSER_LIST_ID_COLUMN, &id,

-                                            -1);

-                        if (id == NULL) {

-                                continue;

-                        }

-

-                        found = (strcmp (id, name) == 0);

-

-                        if (found) {

-                                path = gtk_tree_model_get_path (model, &iter);

-                                break;

-                        }

-

-                } while (gtk_tree_model_iter_next (model, &iter));

-        }

-

-        if (path != NULL) {

-                gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (widget->priv->treeview),

-                                              path,

-                                              NULL,

-                                              TRUE,

-                                              0.5,

-                                              0.0);

-                gtk_tree_view_set_cursor (GTK_TREE_VIEW (widget->priv->treeview),

-                                          path,

-                                          NULL,

-                                          FALSE);

-

-                gtk_tree_view_row_activated (GTK_TREE_VIEW (widget->priv->treeview),

-                                             path,

-                                             NULL);

-                gtk_tree_path_free (path);

-        }

-}

-

-static void

-choose_user_id (GdmUserChooserWidget *widget,

-                const char           *id)

-{

-

-        g_debug ("GdmUserChooserWidget: Selection changed from:'%s' to:'%s'",

-                 widget->priv->chosen_user ? widget->priv->chosen_user : "",

-                 id ? id : "");

-

-        g_free (widget->priv->chosen_user);

-        widget->priv->chosen_user = g_strdup (id);

-

-        gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (widget->priv->filter_model));

-}

-

-static void

-choose_selected_user (GdmUserChooserWidget *widget)

-{

-        char             *id;

-        GtkTreeSelection *selection;

-        GtkTreeModel     *model;

-        GtkTreeIter       iter;

-

-        id = NULL;

-

-        selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget->priv->treeview));

-        if (gtk_tree_selection_get_selected (selection, &model, &iter)) {

-                gtk_tree_model_get (model, &iter, CHOOSER_LIST_ID_COLUMN, &id, -1);

-        }

-

-        choose_user_id (widget, id);

-}

-

-static void

-clear_selection (GdmUserChooserWidget *widget)

-{

-        GtkTreeSelection *selection;

-        selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget->priv->treeview));

-        gtk_tree_selection_unselect_all (selection);

+        return gdm_chooser_widget_get_active_item (GDM_CHOOSER_WIDGET (widget));

 }

 void

@@ -249,14 +102,18 @@ gdm_user_chooser_widget_set_chosen_user_name (GdmUserChooserWidget *widget,

 {

         g_return_if_fail (GDM_IS_USER_CHOOSER_WIDGET (widget));

-        if (name == NULL) {

-                clear_selection (widget);

-                choose_user_id (widget, NULL);

-        } else {

-                activate_name (widget, name);

-        }

+        gdm_chooser_widget_set_active_item (GDM_CHOOSER_WIDGET (widget), name);

 }

+void

+gdm_user_chooser_widget_set_show_only_chosen (GdmUserChooserWidget *widget,

+                                              gboolean              show_only) {

+        g_return_if_fail (GDM_IS_USER_CHOOSER_WIDGET (widget));

+

+        gdm_chooser_widget_set_hide_inactive_items (GDM_CHOOSER_WIDGET (widget),

+                                                    show_only);

+

+}

 static void

 gdm_user_chooser_widget_set_property (GObject        *object,

                                       guint           prop_id,

@@ -315,55 +172,22 @@ gdm_user_chooser_widget_dispose (GObject *object)

         widget = GDM_USER_CHOOSER_WIDGET (object);

-        g_free (widget->priv->chosen_user);

-        widget->priv->chosen_user = NULL;

-

         G_OBJECT_CLASS (gdm_user_chooser_widget_parent_class)->dispose (object);

 }

 static void

 gdm_user_chooser_widget_class_init (GdmUserChooserWidgetClass *klass)

 {

-        GObjectClass   *object_class = G_OBJECT_CLASS (klass);

-

+        GObjectClass          *object_class = G_OBJECT_CLASS (klass);

         object_class->get_property = gdm_user_chooser_widget_get_property;

         object_class->set_property = gdm_user_chooser_widget_set_property;

         object_class->constructor = gdm_user_chooser_widget_constructor;

         object_class->dispose = gdm_user_chooser_widget_dispose;

         object_class->finalize = gdm_user_chooser_widget_finalize;

-        signals [USER_CHOSEN] = g_signal_new ("user-chosen",

-                                              G_TYPE_FROM_CLASS (object_class),

-                                              G_SIGNAL_RUN_LAST,

-                                              G_STRUCT_OFFSET (GdmUserChooserWidgetClass, user_chosen),

-                                              NULL,

-                                              NULL,

-                                              g_cclosure_marshal_VOID__VOID,

-                                              G_TYPE_NONE,

-                                              0);

-

         g_type_class_add_private (klass, sizeof (GdmUserChooserWidgetPrivate));

 }

-static void

-on_selection_changed (GtkTreeSelection     *selection,

-                      GdmUserChooserWidget *widget)

-{

-}

-

-static void

-on_row_activated (GtkTreeView          *tree_view,

-                  GtkTreePath          *tree_path,

-                  GtkTreeViewColumn    *tree_column,

-                  GdmUserChooserWidget *widget)

-{

-        choose_selected_user (widget);

-

-        g_signal_emit (widget, signals[USER_CHOSEN], 0);

-

-        clear_selection (widget);

-}

-

 static GdkPixbuf *

 get_pixbuf_for_user (GdmUserChooserWidget *widget,

                      const char           *username)

@@ -394,107 +218,37 @@ get_logged_in_pixbuf (GdmUserChooserWidget *widget)

 }

 static gboolean

-populate_model (GdmUserChooserWidget *widget)

+add_special_users (GdmUserChooserWidget *widget)

 {

-        GtkTreeIter iter;

         GdkPixbuf  *pixbuf;

         widget->priv->logged_in_pixbuf = get_logged_in_pixbuf (widget);

         pixbuf = get_pixbuf_for_user (widget, NULL);

-        /* Add some fake entries */

-        gtk_list_store_append (GTK_LIST_STORE (widget->priv->real_model), &iter);

-        gtk_list_store_set (GTK_LIST_STORE (widget->priv->real_model), &iter,

-                            CHOOSER_LIST_PIXBUF_COLUMN, pixbuf,

-                            CHOOSER_LIST_NAME_COLUMN, _("Other..."),

-                            CHOOSER_LIST_TOOLTIP_COLUMN, _("Choose a different account"),

-                            CHOOSER_LIST_IS_LOGGED_IN_COLUMN, FALSE,

-                            CHOOSER_LIST_ID_COLUMN, GDM_USER_CHOOSER_USER_OTHER,

-                            -1);

-

-        gtk_list_store_append (GTK_LIST_STORE (widget->priv->real_model), &iter);

-        gtk_list_store_set (GTK_LIST_STORE (widget->priv->real_model), &iter,

-                            CHOOSER_LIST_PIXBUF_COLUMN, pixbuf,

-                            CHOOSER_LIST_NAME_COLUMN, _("Guest"),

-                            CHOOSER_LIST_TOOLTIP_COLUMN, _("Login as a temporary guest"),

-                            CHOOSER_LIST_IS_LOGGED_IN_COLUMN, FALSE,

-                            CHOOSER_LIST_ID_COLUMN, GDM_USER_CHOOSER_USER_GUEST,

-                            -1);

-

+        gdm_chooser_widget_add_item (GDM_CHOOSER_WIDGET (widget),

+                                     GDM_USER_CHOOSER_USER_OTHER,

+                                     pixbuf, _("Other..."),

+                                     _("Choose a different account"), FALSE,

+                                     TRUE);

+

+        gdm_chooser_widget_add_item (GDM_CHOOSER_WIDGET (widget),

+                                     GDM_USER_CHOOSER_USER_GUEST,

+                                     pixbuf, _("Guest"),

+                                     _("Login as a temporary guest"), FALSE,

+                                     TRUE);

         if (pixbuf != NULL) {

                 g_object_unref (pixbuf);

         }

-        widget->priv->populate_id = 0;

         return FALSE;

 }

-static int

-compare_user_names (char *name_a,

-                    char *name_b,

-                    char *id_a,

-                    char *id_b)

-{

-

-        if (id_a == NULL) {

-                return 1;

-        } else if (id_b == NULL) {

-                return -1;

-        }

-

-        if (strcmp (id_a, "__other") == 0) {

-                return 1;

-        } else if (strcmp (id_b, "__other") == 0) {

-                return -1;

-        } else if (strcmp (id_a, "__guest") == 0) {

-                return 1;

-        } else if (strcmp (id_b, "__guest") == 0) {

-                return -1;

-        }

-

-        if (name_a == NULL) {

-                return 1;

-        } else if (name_b == NULL) {

-                return -1;

-        }

-

-        return g_utf8_collate (name_a, name_b);

-}

-

-static int

-compare_user  (GtkTreeModel *model,

-                  GtkTreeIter  *a,

-                  GtkTreeIter  *b,

-                  gpointer      user_data)

-{

-        char *name_a;

-        char *name_b;

-        char *id_a;

-        char *id_b;

-        int   result;

-

-        gtk_tree_model_get (model, a, CHOOSER_LIST_NAME_COLUMN, &name_a, -1);

-        gtk_tree_model_get (model, b, CHOOSER_LIST_NAME_COLUMN, &name_b, -1);

-        gtk_tree_model_get (model, a, CHOOSER_LIST_ID_COLUMN, &id_a, -1);

-        gtk_tree_model_get (model, b, CHOOSER_LIST_ID_COLUMN, &id_b, -1);

-

-        result = compare_user_names (name_a, name_b, id_a, id_b);

-

-        g_free (name_a);

-        g_free (name_b);

-        g_free (id_a);

-        g_free (id_b);

-

-        return result;

-}

-

 static void

 on_user_added (GdmUserManager       *manager,

                GdmUser              *user,

                GdmUserChooserWidget *widget)

 {

-        GtkTreeIter   iter;

         GdkPixbuf    *pixbuf;

         char         *tooltip;

@@ -502,18 +256,13 @@ on_user_added (GdmUserManager       *manager,

         pixbuf = gdm_user_render_icon (user, GTK_WIDGET (widget), ICON_SIZE);

-        tooltip = g_strdup_printf ("%s: %s",

-                                   _("Short Name"),

+        tooltip = g_strdup_printf (_("Log in as %s"),

                                    gdm_user_get_user_name (user));

-        gtk_list_store_append (GTK_LIST_STORE (widget->priv->real_model), &iter);

-        gtk_list_store_set (GTK_LIST_STORE (widget->priv->real_model), &iter,

-                            CHOOSER_LIST_PIXBUF_COLUMN, pixbuf,

-                            CHOOSER_LIST_NAME_COLUMN, gdm_user_get_real_name (user),

-                            CHOOSER_LIST_TOOLTIP_COLUMN, tooltip,

-                            CHOOSER_LIST_IS_LOGGED_IN_COLUMN, gdm_user_get_num_sessions (user) > 0,

-                            CHOOSER_LIST_ID_COLUMN, gdm_user_get_user_name (user),

-                            -1);

+        gdm_chooser_widget_add_item (GDM_CHOOSER_WIDGET (widget),

+                                     gdm_user_get_user_name (user),

+                                     pixbuf, gdm_user_get_real_name (user),

+                                     tooltip, FALSE, FALSE);

         g_free (tooltip);

         if (pixbuf != NULL) {

@@ -526,41 +275,14 @@ on_user_removed (GdmUserManager       *manager,

                  GdmUser              *user,

                  GdmUserChooserWidget *widget)

 {

-        GtkTreeIter iter;

-        gboolean    found;

         const char *user_name;

         g_debug ("GdmUserChooserWidget: User removed: %s", gdm_user_get_user_name (user));

-        found = FALSE;

-

         user_name = gdm_user_get_user_name (user);

-        if (gtk_tree_model_get_iter_first (widget->priv->real_model, &iter)) {

-

-                do {

-                        char *id;

-

-                        id = NULL;

-                        gtk_tree_model_get (widget->priv->real_model,

-                                            &iter,

-                                            CHOOSER_LIST_ID_COLUMN, &id,

-                                            -1);

-                        if (id == NULL) {

-                                continue;

-                        }

-

-                        found = (strcmp (id, user_name) == 0);

-

-                        if (found) {

-                                break;

-                        }

-

-                } while (gtk_tree_model_iter_next (widget->priv->real_model, &iter));

-        }

-        if (found) {

-                gtk_list_store_remove (GTK_LIST_STORE (widget->priv->real_model), &iter);

-        }

+        gdm_chooser_widget_remove_item (GDM_CHOOSER_WIDGET (widget),

+                                        user_name);

 }

 static void

@@ -568,162 +290,28 @@ on_user_is_logged_in_changed (GdmUserManager       *manager,

                               GdmUser              *user,

                               GdmUserChooserWidget *widget)

 {

-        GtkTreeIter iter;

-        gboolean    found;

         const char *user_name;

         gboolean    is_logged_in;

         g_debug ("GdmUserChooserWidget: User logged in changed: %s", gdm_user_get_user_name (user));

-        found = FALSE;

-

         user_name = gdm_user_get_user_name (user);

         is_logged_in = gdm_user_get_num_sessions (user) > 0;

-        if (gtk_tree_model_get_iter_first (widget->priv->real_model, &iter)) {

-

-                do {

-                        char *id;

-

-                        id = NULL;

-                        gtk_tree_model_get (widget->priv->real_model,

-                                            &iter,

-                                            CHOOSER_LIST_ID_COLUMN, &id,

-                                            -1);

-                        if (id == NULL) {

-                                continue;

-                        }

-

-                        found = (strcmp (id, user_name) == 0);

-

-                        if (found) {

-                                break;

-                        }

-

-                } while (gtk_tree_model_iter_next (widget->priv->real_model, &iter));

-        }

-

-        if (found) {

-                gtk_list_store_set (GTK_LIST_STORE (widget->priv->real_model),

-                                    &iter,

-                                    CHOOSER_LIST_IS_LOGGED_IN_COLUMN, is_logged_in,

-                                    -1);

-        }

-}

-

-static gboolean

-user_visible_cb (GtkTreeModel         *model,

-                 GtkTreeIter          *iter,

-                 GdmUserChooserWidget *widget)

-{

-        char    *id;

-        gboolean ret;

-

-        ret = FALSE;

-

-        id = NULL;

-        gtk_tree_model_get (model, iter, CHOOSER_LIST_ID_COLUMN, &id, -1);

-        if (id == NULL) {

-                goto out;

-        }

-

-        /* if a user is chosen */

-        if (widget->priv->chosen_user != NULL

-            && widget->priv->show_only_chosen) {

-

-                ret = (strcmp (id, widget->priv->chosen_user) == 0);

-                goto out;

-        }

-

-        if (! widget->priv->show_other_user

-            && strcmp (id, GDM_USER_CHOOSER_USER_OTHER) == 0) {

-                ret = FALSE;

-                goto out;

-        }

-        if (! widget->priv->show_guest_user

-            && strcmp (id, GDM_USER_CHOOSER_USER_GUEST) == 0) {

-                ret = FALSE;

-                goto out;

-        }

-

-        ret = TRUE;

-

- out:

-        g_free (id);

-

-        return ret;

-}

-

-static void

-name_cell_data_func (GtkTreeViewColumn    *tree_column,

-                     GtkCellRenderer      *cell,

-                     GtkTreeModel         *model,

-                     GtkTreeIter          *iter,

-                     GdmUserChooserWidget *widget)

-{

-        gboolean logged_in;

-        char    *name;

-        char    *markup;

-

-        name = NULL;

-        gtk_tree_model_get (model,

-                            iter,

-                            CHOOSER_LIST_IS_LOGGED_IN_COLUMN, &logged_in,

-                            CHOOSER_LIST_NAME_COLUMN, &name,

-                            -1);

-

-        if (logged_in) {

-                markup = g_strdup_printf ("%s\n%s",

-                                          name,

-                                          _("Currently logged in"));

-        } else {

-                markup = g_strdup_printf ("%s", name);

-        }

-

-        g_object_set (cell,

-                      "markup", markup,

-                      NULL);

-

-        g_free (markup);

-        g_free (name);

-}

-

-static void

-check_cell_data_func (GtkTreeViewColumn    *tree_column,

-                      GtkCellRenderer      *cell,

-                      GtkTreeModel         *model,

-                      GtkTreeIter          *iter,

-                      GdmUserChooserWidget *widget)

-{

-        gboolean   logged_in;

-        GdkPixbuf *pixbuf;

-

-        gtk_tree_model_get (model,

-                            iter,

-                            CHOOSER_LIST_IS_LOGGED_IN_COLUMN, &logged_in,

-                            -1);

-

-        if (logged_in) {

-                pixbuf = widget->priv->logged_in_pixbuf;

-        } else {

-                pixbuf = NULL;

-        }

-

-        g_object_set (cell,

-                      "pixbuf", pixbuf,

-                      NULL);

+        gdm_chooser_widget_set_item_in_use (GDM_CHOOSER_WIDGET (widget),

+                                            user_name, is_logged_in);

 }

 static void

 gdm_user_chooser_widget_init (GdmUserChooserWidget *widget)

 {

-        GtkWidget         *scrolled;

-        GtkTreeViewColumn *column;

-        GtkTreeSelection  *selection;

-        GtkCellRenderer   *renderer;

-

         widget->priv = GDM_USER_CHOOSER_WIDGET_GET_PRIVATE (widget);

+        gdm_chooser_widget_set_separator_position (GDM_CHOOSER_WIDGET (widget),

+                                                   GDM_CHOOSER_WIDGET_POSITION_BOTTOM);

+        gdm_chooser_widget_set_in_use_message (GDM_CHOOSER_WIDGET (widget),

+                                               _("Currently logged in"));

+

         widget->priv->manager = gdm_user_manager_ref_default ();

         g_signal_connect (widget->priv->manager,

                           "user-added",

@@ -738,103 +326,7 @@ gdm_user_chooser_widget_init (GdmUserChooserWidget *widget)

                           G_CALLBACK (on_user_is_logged_in_changed),

                           widget);

-        scrolled = gtk_scrolled_window_new (NULL, NULL);