diff options
author | Ken VanDine <ken.vandine@canonical.com> | 2011-09-28 09:19:25 -0400 |
---|---|---|
committer | Ken VanDine <ken.vandine@canonical.com> | 2011-09-28 09:19:25 -0400 |
commit | d44c110df4e6702bb2441961c4d517f6885f5a3c (patch) | |
tree | 628e6d606000081a01cccc59e593ab914a6bff31 /src/users-service-dbus.c | |
parent | 18f3158453229388605760aa8e738a9adb65109b (diff) | |
parent | a3fd1aa6abf470016825dbb288565018cf834c12 (diff) | |
download | ayatana-indicator-session-d44c110df4e6702bb2441961c4d517f6885f5a3c.tar.gz ayatana-indicator-session-d44c110df4e6702bb2441961c4d517f6885f5a3c.tar.bz2 ayatana-indicator-session-d44c110df4e6702bb2441961c4d517f6885f5a3c.zip |
* New upstream release.
* Fix convert file key naming (LP: #847807)
* Use environment variable to get seat path (LP: #856455)
* Fix abort when using ConsoleKit fallback (LP: #740382)
* Update session icon instead of creating a new one (LP: #854292)
* Update to latest Launchpad translations
Diffstat (limited to 'src/users-service-dbus.c')
-rw-r--r-- | src/users-service-dbus.c | 36 |
1 files changed, 2 insertions, 34 deletions
diff --git a/src/users-service-dbus.c b/src/users-service-dbus.c index 0bab8c8..971b854 100644 --- a/src/users-service-dbus.c +++ b/src/users-service-dbus.c @@ -203,40 +203,10 @@ static void create_display_manager_proxy (UsersServiceDbus *self) { UsersServiceDbusPrivate *priv = USERS_SERVICE_DBUS_GET_PRIVATE (self); - DBusGProxy *dm_proxy = NULL; GError *error = NULL; - const gchar *cookie = NULL; - gchar *seat = NULL; + const gchar *seat = NULL; - cookie = g_getenv ("XDG_SESSION_COOKIE"); - if (cookie == NULL || cookie[0] == 0) - { - g_warning ("Failed to get DisplayManager proxy: XDG_SESSION_COOKIE undefined."); - return; - } - - dm_proxy = dbus_g_proxy_new_for_name (priv->system_bus, - "org.freedesktop.DisplayManager", - "/org/freedesktop/DisplayManager", - "org.freedesktop.DisplayManager"); - - if (!dm_proxy) - { - g_warning ("Failed to get DisplayManager proxy."); - return; - } - - /* Now request the proper seat */ - if (!dbus_g_proxy_call (dm_proxy, "GetSeatForCookie", &error, - G_TYPE_STRING, cookie, G_TYPE_INVALID, - DBUS_TYPE_G_OBJECT_PATH, &seat, G_TYPE_INVALID)) - { - g_warning ("Failed to get DisplayManager seat proxy: %s", error->message); - g_object_unref (dm_proxy); - g_error_free (error); - return; - } - g_object_unref (dm_proxy); + seat = g_getenv ("XDG_SEAT_PATH"); g_debug ("CREATING DM PROXIES WITH %s", seat); priv->display_manager_proxy = dbus_g_proxy_new_for_name (priv->system_bus, "org.freedesktop.DisplayManager", @@ -249,8 +219,6 @@ create_display_manager_proxy (UsersServiceDbus *self) "org.freedesktop.DBus.Properties"); - g_free (seat); - if (!priv->display_manager_proxy) { g_warning ("Failed to get DisplayManager seat proxy."); |