diff options
| author | William Jon McCann <mccann@jhu.edu> | 2007-03-13 13:50:58 -0400 |
|---|---|---|
| committer | William Jon McCann <mccann@jhu.edu> | 2007-03-13 13:50:58 -0400 |
| commit | 0f1d6b3b234a1f8d8c6b9dff38388ab58f695b64 (patch) | |
| tree | 20233bd1ae56b5bd0b9a3434f37266e1a0d76f40 /src/ck-session.c | |
| parent | 921b5e02edf59117b64385edbe4d191819d90abd (diff) | |
deprecate the user properties and add unix-user properties
Also added deprecated notes to the docs. New code should
be using GetUnixUser instead of GetUser etc.
Diffstat (limited to 'src/ck-session.c')
| -rw-r--r-- | src/ck-session.c | 44 |
1 files changed, 35 insertions, 9 deletions
diff --git a/src/ck-session.c b/src/ck-session.c index c88cbbc..725a355 100644 --- a/src/ck-session.c +++ b/src/ck-session.c @@ -87,6 +87,7 @@ enum { PROP_ID, PROP_COOKIE, PROP_USER, + PROP_UNIX_USER, PROP_X11_DISPLAY, PROP_X11_DISPLAY_DEVICE, PROP_DISPLAY_DEVICE, @@ -441,9 +442,9 @@ ck_session_get_seat_id (CkSession *session, } gboolean -ck_session_get_user (CkSession *session, - guint *uid, - GError **error) +ck_session_get_unix_user (CkSession *session, + guint *uid, + GError **error) { g_return_val_if_fail (CK_IS_SESSION (session), FALSE); @@ -454,6 +455,15 @@ ck_session_get_user (CkSession *session, return TRUE; } +/* deprecated */ +gboolean +ck_session_get_user (CkSession *session, + guint *uid, + GError **error) +{ + return ck_session_get_unix_user (session, uid, error); +} + gboolean ck_session_get_x11_display (CkSession *session, char **x11_display, @@ -606,9 +616,9 @@ ck_session_set_seat_id (CkSession *session, } gboolean -ck_session_set_user (CkSession *session, - guint uid, - GError **error) +ck_session_set_unix_user (CkSession *session, + guint uid, + GError **error) { g_return_val_if_fail (CK_IS_SESSION (session), FALSE); @@ -717,8 +727,11 @@ ck_session_set_property (GObject *object, case PROP_DISPLAY_DEVICE: ck_session_set_display_device (self, g_value_get_string (value), NULL); break; - case PROP_USER: - ck_session_set_user (self, g_value_get_uint (value), NULL); + case PROP_UNIX_USER: + ck_session_set_unix_user (self, g_value_get_uint (value), NULL); + break; + case PROP_USER: /* deprecated */ + ck_session_set_unix_user (self, g_value_get_uint (value), NULL); break; case PROP_REMOTE_HOST_NAME: ck_session_set_remote_host_name (self, g_value_get_string (value), NULL); @@ -767,7 +780,10 @@ ck_session_get_property (GObject *object, case PROP_DISPLAY_DEVICE: g_value_set_string (value, self->priv->display_device); break; - case PROP_USER: + case PROP_UNIX_USER: + g_value_set_uint (value, self->priv->uid); + break; + case PROP_USER: /* deprecated */ g_value_set_uint (value, self->priv->uid); break; case PROP_REMOTE_HOST_NAME: @@ -1015,6 +1031,16 @@ ck_session_class_init (CkSessionClass *klass) G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); g_object_class_install_property (object_class, + PROP_UNIX_USER, + g_param_spec_uint ("unix-user", + "POSIX User Id", + "POSIX User Id", + 0, + G_MAXINT, + 0, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); + /* deprecated */ + g_object_class_install_property (object_class, PROP_USER, g_param_spec_uint ("user", "User Id", |