diff options
| author | Ted Gould <ted@gould.cx> | 2010-03-03 21:06:00 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-03-03 21:06:00 -0600 |
| commit | d9bc98c8b728ffce04d5536501efb11a6084c831 (patch) | |
| tree | 22f77b0048967d522ca9dea9c664adf286408c07 /src/users-service-dbus.c | |
| parent | 4533e76797864b2e949ffa150359145d861f0045 (diff) | |
| parent | 1af7a048d62b8616d3182a8bb48fe33e7b54d93d (diff) | |
| download | ayatana-indicator-session-d9bc98c8b728ffce04d5536501efb11a6084c831.tar.gz ayatana-indicator-session-d9bc98c8b728ffce04d5536501efb11a6084c831.tar.bz2 ayatana-indicator-session-d9bc98c8b728ffce04d5536501efb11a6084c831.zip | |
* Upstream Merge
* Fix naming to "Switch off" and "Sleep"
* Blocking the current user from the user list
* Change sorting to be based on real names and handle conflicts
* Removing some ConsoleKit errors
* Memory leak on PangoLayout allocation
* Don't set GTK decorations
* ConsoleKit fallback if gnome-session not available
Diffstat (limited to 'src/users-service-dbus.c')
| -rw-r--r-- | src/users-service-dbus.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/users-service-dbus.c b/src/users-service-dbus.c index 0e5c922..4aefdff 100644 --- a/src/users-service-dbus.c +++ b/src/users-service-dbus.c @@ -34,6 +34,7 @@ #include "users-service-dbus.h" #include "users-service-client.h" #include "users-service-marshal.h" +#include "consolekit-manager-client.h" static void users_service_dbus_class_init (UsersServiceDbusClass *klass); static void users_service_dbus_init (UsersServiceDbus *self); @@ -509,14 +510,7 @@ add_sessions_for_user (UsersServiceDbus *self, int i; error = NULL; - if (!dbus_g_proxy_call (priv->ck_proxy, - "GetSessionsForUnixUser", - &error, - G_TYPE_UINT, user->uid, - G_TYPE_INVALID, - dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH), - &sessions, - G_TYPE_INVALID)) + if (!org_freedesktop_ConsoleKit_Manager_get_sessions_for_unix_user(priv->ck_proxy, user->uid, &sessions, &error)) { g_debug ("Failed to call GetSessionsForUnixUser: %s", error->message); g_error_free (error); @@ -662,6 +656,7 @@ sync_users (UsersServiceDbus *self) user->shell = g_strdup (g_value_get_string (g_value_array_get_nth (values, 3))); user->login_count = g_value_get_int (g_value_array_get_nth (values, 4)); user->icon_url = g_strdup (g_value_get_string (g_value_array_get_nth (values, 5))); + user->real_name_conflict = FALSE; g_hash_table_insert (priv->users, g_strdup (user->user_name), |