liblightdm-gobject splits UserList into its own class

5 files changed, 64 insertions, 26 deletions

diff --git a/liblightdm-gobject/lightdm/greeter.h b/liblightdm-gobject/lightdm/greeter.h
index 659f8a98..ab698543 100644
--- a/liblightdm-gobject/lightdm/greeter.h
+++ b/liblightdm-gobject/lightdm/greeter.h
@@ -14,6 +14,11 @@
 
 #include <glib-object.h>
 
+#include "user-list.h"
+#include "language.h"
+#include "layout.h"
+#include "session.h"
+
 G_BEGIN_DECLS
 
 #define LIGHTDM_TYPE_GREETER            (lightdm_greeter_get_type())
@@ -23,14 +28,6 @@ G_BEGIN_DECLS
 #define LIGHTDM_IS_GREETER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIGHTDM_TYPE_GREETER))
 #define LIGHTDM_GREETER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), LIGHTDM_TYPE_GREETER, LightDMGreeterClass))
 
-typedef struct _LightDMGreeter        LightDMGreeter;
-typedef struct _LightDMGreeterClass   LightDMGreeterClass;
-
-#include "user.h"
-#include "language.h"
-#include "layout.h"
-#include "session.h"
-
 /**
  * LightDMPromptType:
  * @LIGHTDM_PROMPT_TYPE_QUESTION: Prompt is a question.  The information can be shown as it is entered.
@@ -53,12 +50,12 @@ typedef enum
     LIGHTDM_MESSAGE_TYPE_ERROR
 } LightDMMessageType;
 
-struct _LightDMGreeter
+typedef struct
 {
     GObject parent_instance;
-};
+} LightDMGreeter;
 
-struct _LightDMGreeterClass
+typedef struct
 {
     GObjectClass parent_class;
 
@@ -68,11 +65,8 @@ struct _LightDMGreeterClass
     void (*authentication_complete)(LightDMGreeter *greeter);
     void (*session_failed)(LightDMGreeter *greeter);
     void (*autologin_timer_expired)(LightDMGreeter *greeter);
-    void (*user_added)(LightDMGreeter *greeter, LightDMUser *user);
-    void (*user_changed)(LightDMGreeter *greeter, LightDMUser *user);
-    void (*user_removed)(LightDMGreeter *greeter, LightDMUser *user);
     void (*quit)(LightDMGreeter *greeter);
-};
+} LightDMGreeterClass;
 
 GType lightdm_greeter_get_type (void);
 
@@ -82,11 +76,7 @@ gboolean lightdm_greeter_connect_to_server (LightDMGreeter *greeter);
 
 const gchar *lightdm_greeter_get_hostname (LightDMGreeter *greeter);
 
-gint lightdm_greeter_get_num_users (LightDMGreeter *greeter);
-
-GList *lightdm_greeter_get_users (LightDMGreeter *greeter);
-
-LightDMUser *lightdm_greeter_get_user_by_name (LightDMGreeter *greeter, const gchar *username);
+LightDMUserList *lightdm_greeter_get_user_list (LightDMGreeter *greeter);
 
 const gchar *lightdm_greeter_get_default_language (LightDMGreeter *greeter);
 
diff --git a/liblightdm-gobject/lightdm/language.h b/liblightdm-gobject/lightdm/language.h
index f6813bfb..e8a34008 100644
--- a/liblightdm-gobject/lightdm/language.h
+++ b/liblightdm-gobject/lightdm/language.h
@@ -35,8 +35,6 @@ typedef struct
 
 GType lightdm_language_get_type (void);
 
-LightDMLanguage *lightdm_language_new (const gchar *code);
-
 const gchar *lightdm_language_get_code (LightDMLanguage *language);
 
 const gchar *lightdm_language_get_name (LightDMLanguage *language);
diff --git a/liblightdm-gobject/lightdm/layout.h b/liblightdm-gobject/lightdm/layout.h
index 0bc57578..f98dbe20 100644
--- a/liblightdm-gobject/lightdm/layout.h
+++ b/liblightdm-gobject/lightdm/layout.h
@@ -35,8 +35,6 @@ typedef struct
 
 GType lightdm_layout_get_type (void);
 
-LightDMLayout *lightdm_layout_new (const gchar *name, const gchar *short_description, const gchar *description);
-
 const gchar *lightdm_layout_get_name (LightDMLayout *layout);
 
 const gchar *lightdm_layout_get_short_description (LightDMLayout *layout);
diff --git a/liblightdm-gobject/lightdm/session.h b/liblightdm-gobject/lightdm/session.h
index c0bede7e..4f9d4a2f 100644
--- a/liblightdm-gobject/lightdm/session.h
+++ b/liblightdm-gobject/lightdm/session.h
@@ -35,8 +35,6 @@ typedef struct
 
 GType lightdm_session_get_type (void);
 
-LightDMSession *lightdm_session_new (const gchar *key, const gchar *name, const gchar *comment);
-
 const gchar *lightdm_session_get_key (LightDMSession *session);
 
 const gchar *lightdm_session_get_name (LightDMSession *session);
diff --git a/liblightdm-gobject/lightdm/user-list.h b/liblightdm-gobject/lightdm/user-list.h
new file mode 100644
index 00000000..76e4460b
--- /dev/null
+++ b/liblightdm-gobject/lightdm/user-list.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2010 Robert Ancell.
+ * Author: Robert Ancell <robert.ancell@canonical.com>
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version. See http://www.gnu.org/copyleft/lgpl.html the full text of the
+ * license.
+ */
+
+#ifndef _LIGHTDM_USER_LIST_H_
+#define _LIGHTDM_USER_LIST_H_
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define LIGHTDM_TYPE_USER_LIST            (lightdm_user_list_get_type())
+#define LIGHTDM_USER_LIST(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIGHTDM_TYPE_USER_LIST, LightDMUserList));
+#define LIGHTDM_USER_LIST_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), LIGHTDM_TYPE_USER_LIST, LightDMUserListClass))
+#define LIGHTDM_IS_USER_LIST(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIGHTDM_TYPE_USER_LIST))
+#define LIGHTDM_IS_USER_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIGHTDM_TYPE_USER_LIST))
+#define LIGHTDM_USER_LIST_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), LIGHTDM_TYPE_USER_LIST, LightDMUserListClass))
+
+#include "user.h"
+
+typedef struct
+{
+    GObject parent_instance;
+} LightDMUserList;
+
+typedef struct
+{
+    GObjectClass parent_class;
+
+    void (*user_added)(LightDMUserList *user_list, LightDMUser *user);
+    void (*user_changed)(LightDMUserList *user_list, LightDMUser *user);
+    void (*user_removed)(LightDMUserList *user_list, LightDMUser *user);
+} LightDMUserListClass;
+
+GType lightdm_user_list_get_type (void);
+
+LightDMUserList *lightdm_user_list_new (void);
+
+gint lightdm_user_list_get_num_users (LightDMUserList *user_list);
+
+LightDMUser *lightdm_user_list_get_user_by_name (LightDMUserList *user_list, const gchar *username);
+
+GList *lightdm_user_list_get_users (LightDMUserList *user_list);
+
+G_END_DECLS
+
+#endif /* _LIGHTDM_USER_LIST_H_ */