From 0f1d6b3b234a1f8d8c6b9dff38388ab58f695b64 Mon Sep 17 00:00:00 2001
From: William Jon McCann <mccann@jhu.edu>
Date: Tue, 13 Mar 2007 13:50:58 -0400
Subject: 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.
---
 src/ck-manager.c | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

(limited to 'src/ck-manager.c')

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,
-- 
cgit