diff options
| -rw-r--r-- | src/indicator-session.c | 4 | ||||
| -rw-r--r-- | src/users-service-dbus.c | 36 |
2 files changed, 4 insertions, 36 deletions
diff --git a/src/indicator-session.c b/src/indicator-session.c index 833d19b..9510807 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -509,11 +509,11 @@ receive_signal (GDBusProxy * proxy, } else if (g_strcmp0(signal_name, "RestartRequired") == 0) { if (greeter_mode == TRUE){ - self->devices.image = indicator_image_helper (GREETER_ICON_RESTART); + indicator_image_helper_update(self->devices.image, GREETER_ICON_RESTART); } else{ g_debug ("reboot required"); - self->devices.image = indicator_image_helper (ICON_RESTART); + indicator_image_helper_update(self->devices.image, ICON_RESTART); } } } 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."); |