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.

6 files changed, 71 insertions, 19 deletions

diff --git a/src/ck-manager.c b/src/ck-manager.c
index 8e66419..4575eb1 100644
--- a/src/ck-manager.c
+++ b/src/ck-manager.c
@@ -1473,14 +1473,14 @@ typedef struct {
 } GetSessionsData;
 
 static void
-get_sessions_for_user_iter (char            *id,
-                            CkSession       *session,
-                            GetSessionsData *data)
+get_sessions_for_unix_user_iter (char            *id,
+                                 CkSession       *session,
+                                 GetSessionsData *data)
 {
         guint    uid;
         gboolean res;
 
-        res = ck_session_get_user (session, &uid, NULL);
+        res = ck_session_get_unix_user (session, &uid, NULL);
 
         if (res && uid == data->uid) {
                 g_ptr_array_add (data->sessions, g_strdup (id));
@@ -1488,9 +1488,9 @@ get_sessions_for_user_iter (char            *id,
 }
 
 gboolean
-ck_manager_get_sessions_for_user (CkManager             *manager,
-                                  guint                  uid,
-                                  DBusGMethodInvocation *context)
+ck_manager_get_sessions_for_unix_user (CkManager             *manager,
+                                       guint                  uid,
+                                       DBusGMethodInvocation *context)
 {
         GetSessionsData *data;
 
@@ -1500,7 +1500,7 @@ ck_manager_get_sessions_for_user (CkManager             *manager,
         data->uid = uid;
         data->sessions = g_ptr_array_new ();
 
-        g_hash_table_foreach (manager->priv->sessions, (GHFunc)get_sessions_for_user_iter, data);
+        g_hash_table_foreach (manager->priv->sessions, (GHFunc)get_sessions_for_unix_user_iter, data);
 
         dbus_g_method_return (context, data->sessions);
 
@@ -1511,6 +1511,15 @@ ck_manager_get_sessions_for_user (CkManager             *manager,
         return TRUE;
 }
 
+/* This is deprecated */
+gboolean
+ck_manager_get_sessions_for_user (CkManager             *manager,
+                                  guint                  uid,
+                                  DBusGMethodInvocation *context)
+{
+        return ck_manager_get_sessions_for_unix_user (manager, uid, context);
+}
+
 static void
 listify_seat_ids (char       *id,
                   CkSeat     *seat,
diff --git a/src/ck-manager.h b/src/ck-manager.h
index 331a5c4..a6fd670 100644
--- a/src/ck-manager.h
+++ b/src/ck-manager.h
@@ -87,6 +87,10 @@ gboolean            ck_manager_get_session_for_cookie         (CkManager
 gboolean            ck_manager_get_session_for_unix_process   (CkManager             *manager,
                                                                guint                  pid,
                                                                DBusGMethodInvocation *context);
+gboolean            ck_manager_get_sessions_for_unix_user     (CkManager             *manager,
+                                                               guint                  uid,
+                                                               DBusGMethodInvocation *context);
+/* deprecated */
 gboolean            ck_manager_get_sessions_for_user          (CkManager             *manager,
                                                                guint                  uid,
                                                                DBusGMethodInvocation *context);
diff --git a/src/ck-manager.xml b/src/ck-manager.xml
index 5dc9213..f40d6d5 100644
--- a/src/ck-manager.xml
+++ b/src/ck-manager.xml
@@ -32,6 +32,11 @@
       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <arg name="ssid" direction="out" type="o"/>
     </method>
+    <method name="GetSessionsForUnixUser">
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <arg name="uid" direction="in" type="u"/>
+      <arg name="sessions" direction="out" type="ao"/>
+    </method>
     <method name="GetSessionsForUser">
       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <arg name="uid" direction="in" type="u"/>
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",
diff --git a/src/ck-session.h b/src/ck-session.h
index 40c5e9d..fea3a71 100644
--- a/src/ck-session.h
+++ b/src/ck-session.h
@@ -89,7 +89,7 @@ gboolean            ck_session_set_cookie             (CkSession             *se
 gboolean            ck_session_set_seat_id            (CkSession             *session,
                                                        const char            *sid,
                                                        GError               **error);
-gboolean            ck_session_set_user               (CkSession             *session,
+gboolean            ck_session_set_unix_user          (CkSession             *session,
                                                        guint                  uid,
                                                        GError               **error);
 gboolean            ck_session_set_x11_display        (CkSession             *session,
@@ -123,7 +123,7 @@ gboolean            ck_session_is_active              (CkSession             *se
 gboolean            ck_session_is_local               (CkSession             *session,
                                                        gboolean              *local,
                                                        GError               **error);
-gboolean            ck_session_get_user               (CkSession             *session,
+gboolean            ck_session_get_unix_user          (CkSession             *session,
                                                        guint                 *uid,
                                                        GError               **error);
 gboolean            ck_session_get_x11_display        (CkSession             *session,
@@ -144,6 +144,10 @@ gboolean            ck_session_get_remote_host_name   (CkSession             *se
 gboolean            ck_session_get_creation_time      (CkSession             *session,
                                                        char                 **iso8601_datetime,
                                                        GError               **error);
+/*deprecated*/
+gboolean            ck_session_get_user               (CkSession             *session,
+                                                       guint                 *uid,
+                                                       GError               **error);
 
 /* Non-authoritative properties */
 gboolean            ck_session_get_idle_hint          (CkSession             *session,
diff --git a/src/ck-session.xml b/src/ck-session.xml
index 5699c04..5fc85d0 100644
--- a/src/ck-session.xml
+++ b/src/ck-session.xml
@@ -13,6 +13,9 @@
     <method name="GetUser">
       <arg name="uid" direction="out" type="i"/>
     </method>
+    <method name="GetUnixUser">
+      <arg name="uid" direction="out" type="i"/>
+    </method>
     <method name="GetX11Display">
       <arg name="display" direction="out" type="s"/>
     </method>
@@ -61,6 +64,7 @@
     </signal>
     <signal name="Lock"/>
     <signal name="Unlock"/>
+    <property name="unix-user" type="u" access="readwrite"/>
     <property name="user" type="u" access="readwrite"/>
     <property name="session-type" type="s" access="readwrite"/>
     <property name="remote-host-name" type="s" access="readwrite"/>