From 84b70fbc837576fd0c5d642413c7acd765780ce5 Mon Sep 17 00:00:00 2001
From: Robert Ancell <robert.ancell@canonical.com>
Date: Tue, 19 Jul 2011 14:46:47 +1000
Subject: [PATCH] Get rid of lightdm_greeter_get_user_list

---
 doc/lightdm-gobject-1-sections.txt           |  1 -
 greeters/gtk/lightdm-gtk-greeter.c           |  6 +++---
 liblightdm-gobject/greeter.c                 | 22 --------------------
 liblightdm-gobject/liblightdm-gobject-1.vapi |  9 +++++---
 liblightdm-gobject/lightdm/greeter.h         |  2 --
 5 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/doc/lightdm-gobject-1-sections.txt b/doc/lightdm-gobject-1-sections.txt
index 303a1083..86eaf37a 100644
--- a/doc/lightdm-gobject-1-sections.txt
+++ b/doc/lightdm-gobject-1-sections.txt
@@ -112,7 +112,6 @@ LightDMPromptType
 lightdm_greeter_new
 lightdm_greeter_connect_to_server
 lightdm_greeter_get_hostname
-lightdm_greeter_get_user_list
 lightdm_greeter_get_default_language
 lightdm_greeter_get_languages
 lightdm_greeter_get_layouts
diff --git a/greeters/gtk/lightdm-gtk-greeter.c b/greeters/gtk/lightdm-gtk-greeter.c
index 6d2304c0..bab73f67 100644
--- a/greeters/gtk/lightdm-gtk-greeter.c
+++ b/greeters/gtk/lightdm-gtk-greeter.c
@@ -19,6 +19,7 @@
 #include "lightdm/greeter.h"
 
 static LightDMGreeter *greeter;
+static LightDMUserList *user_list;
 static GtkWidget *window, *message_label, *user_view;
 static GdkPixbuf *background_pixbuf = NULL;
 static GtkWidget *prompt_box, *prompt_label, *prompt_entry, *session_combo;
@@ -79,7 +80,7 @@ start_authentication (const gchar *username)
     else
     {
         LightDMUser *user;
-        user = lightdm_user_list_get_user_by_name (lightdm_greeter_get_user_list (greeter), username);
+        user = lightdm_user_list_get_user_by_name (user_list, username);
         if (user)
             set_session (lightdm_user_get_session (user));
         else
@@ -430,12 +431,11 @@ draw_background_cb (GtkWidget *widget, GdkEventExpose *event)
 static void
 load_user_list ()
 {
-    LightDMUserList *user_list;
     const GList *items, *item;
     GtkTreeModel *model;
     GtkTreeIter iter;
 
-    user_list = lightdm_greeter_get_user_list (greeter);
+    user_list = lightdm_user_list_new ();
     g_signal_connect (user_list, "user-added", G_CALLBACK (user_added_cb), NULL);
     g_signal_connect (user_list, "user-changed", G_CALLBACK (user_changed_cb), NULL);
     g_signal_connect (user_list, "user-removed", G_CALLBACK (user_removed_cb), NULL);
diff --git a/liblightdm-gobject/greeter.c b/liblightdm-gobject/greeter.c
index 8035de23..42461332 100644
--- a/liblightdm-gobject/greeter.c
+++ b/liblightdm-gobject/greeter.c
@@ -547,28 +547,6 @@ lightdm_greeter_get_hostname (LightDMGreeter *greeter)
     return priv->hostname;
 }
 
-/**
- * lightdm_greeter_get_user_list:
- * @greeter: A #LightDMGreeter
- *
- * Get a list of users to present to the user.  This list contains users that can login.
- *
- * Return value: (transfer none): A #LightDMUserList object that contains the user list.
- **/
-LightDMUserList *
-lightdm_greeter_get_user_list (LightDMGreeter *greeter)
-{
-    LightDMGreeterPrivate *priv;
-
-    g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), NULL);
-
-    priv = GET_PRIVATE (greeter);
-
-    if (!priv->user_list)
-        priv->user_list = lightdm_user_list_new ();
-    return priv->user_list;
-}
-
 static void
 update_languages (LightDMGreeter *greeter)
 {
diff --git a/liblightdm-gobject/liblightdm-gobject-1.vapi b/liblightdm-gobject/liblightdm-gobject-1.vapi
index f64aad39..8373b5cd 100644
--- a/liblightdm-gobject/liblightdm-gobject-1.vapi
+++ b/liblightdm-gobject/liblightdm-gobject-1.vapi
@@ -15,9 +15,6 @@ namespace LightDM {
 
         public bool connect_to_server ();
         public unowned string hostname { get; }
-        public int num_users { get; }
-        public unowned GLib.List<weak LightDM.User> get_users ();
-        public unowned LightDM.User get_user_by_name (string username);
         public unowned string default_language { get; }
         public unowned GLib.List<weak LightDM.Language> get_languages ();
         public unowned GLib.List<weak LightDM.Layout> get_layouts ();
@@ -74,6 +71,12 @@ namespace LightDM {
         public unowned string key { get; }
         public unowned string name { get; }
     }
+    public class UserList : GLib.Object {
+        public UserList ();
+        public int num_users { get; }
+        public unowned GLib.List<weak LightDM.User> get_users ();
+        public unowned LightDM.User get_user_by_name (string username);
+    }
     public class User : GLib.Object {
         public unowned string display_name { get; }
         public unowned string image { get; }
diff --git a/liblightdm-gobject/lightdm/greeter.h b/liblightdm-gobject/lightdm/greeter.h
index ab698543..54a6b7c4 100644
--- a/liblightdm-gobject/lightdm/greeter.h
+++ b/liblightdm-gobject/lightdm/greeter.h
@@ -76,8 +76,6 @@ gboolean lightdm_greeter_connect_to_server (LightDMGreeter *greeter);
 
 const gchar *lightdm_greeter_get_hostname (LightDMGreeter *greeter);
 
-LightDMUserList *lightdm_greeter_get_user_list (LightDMGreeter *greeter);
-
 const gchar *lightdm_greeter_get_default_language (LightDMGreeter *greeter);
 
 GList *lightdm_greeter_get_languages (LightDMGreeter *greeter);
-- 
2.39.2