summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Jon McCann <mccann@jhu.edu>2007-11-05 00:57:11 +0000
committerWilliam Jon McCann <mccann@src.gnome.org>2007-11-05 00:57:11 +0000
commitd3685184e84fcc705d60192e240e2bb54e33fda1 (patch)
tree5e95c88e9fa43f5232dbccab00542eed5a4c6857
parent4214119f2078df1dbb78e97aa5238825fb0d6ec9 (diff)
downloadgdm-d3685184e84fcc705d60192e240e2bb54e33fda1.tar.gz
More session list stuff.
2007-11-04 William Jon McCann <mccann@jhu.edu> * gui/simple-greeter/gdm-user-chooser-widget.c: (on_user_added), (on_user_is_logged_in_changed): * gui/simple-greeter/gdm-user.c: (gdm_user_get_num_sessions), (gdm_user_init): More session list stuff. svn path=/trunk/; revision=5492
-rw-r--r--ChangeLog8
-rw-r--r--gui/simple-greeter/gdm-user-chooser-widget.c4
-rw-r--r--gui/simple-greeter/gdm-user.c16
3 files changed, 14 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 31843c13..08777ef1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-04 William Jon McCann <mccann@jhu.edu>
+
+ * gui/simple-greeter/gdm-user-chooser-widget.c: (on_user_added),
+ (on_user_is_logged_in_changed):
+ * gui/simple-greeter/gdm-user.c: (gdm_user_get_num_sessions),
+ (gdm_user_init):
+ More session list stuff.
+
2007-11-04 William Jon McCann <mccannwj@acsnb1>
* gui/simple-greeter/gdm-user-manager.c: (reload_passwd):
diff --git a/gui/simple-greeter/gdm-user-chooser-widget.c b/gui/simple-greeter/gdm-user-chooser-widget.c
index 19285a1e..bf0ab159 100644
--- a/gui/simple-greeter/gdm-user-chooser-widget.c
+++ b/gui/simple-greeter/gdm-user-chooser-widget.c
@@ -511,7 +511,7 @@ on_user_added (GdmUserManager *manager,
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_is_logged_in (user),
+ CHOOSER_LIST_IS_LOGGED_IN_COLUMN, gdm_user_get_num_sessions (user) > 0,
CHOOSER_LIST_ID_COLUMN, gdm_user_get_user_name (user),
-1);
g_free (tooltip);
@@ -578,7 +578,7 @@ on_user_is_logged_in_changed (GdmUserManager *manager,
found = FALSE;
user_name = gdm_user_get_user_name (user);
- is_logged_in = gdm_user_is_logged_in (user);
+ is_logged_in = gdm_user_get_num_sessions (user) > 0;
if (gtk_tree_model_get_iter_first (widget->priv->real_model, &iter)) {
diff --git a/gui/simple-greeter/gdm-user.c b/gui/simple-greeter/gdm-user.c
index c970e486..35fab297 100644
--- a/gui/simple-greeter/gdm-user.c
+++ b/gui/simple-greeter/gdm-user.c
@@ -78,6 +78,7 @@ typedef struct _GdmUserClass
GObjectClass parent_class;
void (* icon_changed) (GdmUser *user);
+ void (* sessions_changed) (GdmUser *user);
} GdmUserClass;
static void gdm_user_finalize (GObject *object);
@@ -116,9 +117,8 @@ _gdm_user_remove_session (GdmUser *user,
}
}
-void
-_gdm_user_remove_session (GdmUser *user,
- const char *ssid)
+guint
+gdm_user_get_num_sessions (GdmUser *user)
{
return g_slist_length (user->sessions);
}
@@ -261,7 +261,7 @@ gdm_user_init (GdmUser *user)
user->manager = NULL;
user->user_name = NULL;
user->real_name = NULL;
- user->is_logged_in = FALSE;
+ user->sessions = NULL;
}
static void
@@ -486,14 +486,6 @@ gdm_user_get_shell (GdmUser *user)
return user->shell;
}
-gboolean
-gdm_user_is_logged_in (GdmUser *user)
-{
- g_return_val_if_fail (GDM_IS_USER (user), FALSE);
-
- return user->is_logged_in;
-}
-
gint
gdm_user_collate (GdmUser *user1,
GdmUser *user2)