diff options
| author | Ray Strode <rstrode@redhat.com> | 2010-03-15 14:05:58 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2010-04-27 17:45:30 -0400 |
| commit | c9e7a8b8410ef7788c05c4937d4263a5308ae568 (patch) | |
| tree | 5c5996faabf91c060917e1307c7afb08971475ad | |
| parent | 4f766f1a7be43b0b8d20159651371b462a1f9301 (diff) | |
| download | gdm-c9e7a8b8410ef7788c05c4937d4263a5308ae568.tar.gz | |
Don't track manager from user object
We don't need it, and it's a bit backward anyway.
| -rw-r--r-- | gui/simple-greeter/gdm-user-manager.c | 2 | ||||
| -rw-r--r-- | gui/simple-greeter/gdm-user.c | 21 |
2 files changed, 1 insertions, 22 deletions
diff --git a/gui/simple-greeter/gdm-user-manager.c b/gui/simple-greeter/gdm-user-manager.c index 0bb868fc..aadb1471 100644 --- a/gui/simple-greeter/gdm-user-manager.c +++ b/gui/simple-greeter/gdm-user-manager.c @@ -683,7 +683,7 @@ create_user (GdmUserManager *manager) { GdmUser *user; - user = g_object_new (GDM_TYPE_USER, "manager", manager, NULL); + user = g_object_new (GDM_TYPE_USER, NULL); g_signal_connect (user, "sessions-changed", G_CALLBACK (on_user_sessions_changed), diff --git a/gui/simple-greeter/gdm-user.c b/gui/simple-greeter/gdm-user.c index 2c623343..65ca7b55 100644 --- a/gui/simple-greeter/gdm-user.c +++ b/gui/simple-greeter/gdm-user.c @@ -30,7 +30,6 @@ #include <gio/gio.h> #include <gtk/gtk.h> -#include "gdm-user-manager.h" #include "gdm-user-private.h" #define GDM_USER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDM_TYPE_USER, GdmUserClass)) @@ -44,7 +43,6 @@ enum { PROP_0, - PROP_MANAGER, PROP_REAL_NAME, PROP_DISPLAY_NAME, PROP_USER_NAME, @@ -62,8 +60,6 @@ enum { struct _GdmUser { GObject parent; - GdmUserManager *manager; - uid_t uid; char *user_name; char *real_name; @@ -170,10 +166,6 @@ gdm_user_set_property (GObject *object, user = GDM_USER (object); switch (param_id) { - case PROP_MANAGER: - user->manager = g_value_get_object (value); - g_assert (user->manager); - break; case PROP_LOGIN_FREQUENCY: _gdm_user_set_login_frequency (user, g_value_get_ulong (value)); break; @@ -194,9 +186,6 @@ gdm_user_get_property (GObject *object, user = GDM_USER (object); switch (param_id) { - case PROP_MANAGER: - g_value_set_object (value, user->manager); - break; case PROP_USER_NAME: g_value_set_string (value, user->user_name); break; @@ -236,15 +225,6 @@ gdm_user_class_init (GdmUserClass *class) gobject_class->finalize = gdm_user_finalize; g_object_class_install_property (gobject_class, - PROP_MANAGER, - g_param_spec_object ("manager", - _("Manager"), - _("The user manager object this user is controlled by."), - GDM_TYPE_USER_MANAGER, - (G_PARAM_READWRITE | - G_PARAM_CONSTRUCT_ONLY))); - - g_object_class_install_property (gobject_class, PROP_REAL_NAME, g_param_spec_string ("real-name", "Real Name", @@ -311,7 +291,6 @@ gdm_user_class_init (GdmUserClass *class) static void gdm_user_init (GdmUser *user) { - user->manager = NULL; user->user_name = NULL; user->real_name = NULL; user->display_name = NULL; |