diff options
author | Robert Ancell <robert.ancell@canonical.com> | 2011-09-29 10:15:46 +1000 |
---|---|---|
committer | Robert Ancell <robert.ancell@canonical.com> | 2011-09-29 10:15:46 +1000 |
commit | 68c0eb13569583b6d8b83b44a1bf38ed902a5bc7 (patch) | |
tree | 38727c14ca8b03eb63f4f63f9118ba5ba8733f48 /src/lightdm.c | |
parent | e470ae42b8e77e9c9875156b254a2b81b27abeb2 (diff) | |
download | lightdm-68c0eb13569583b6d8b83b44a1bf38ed902a5bc7.tar.gz |
Remove GetSeatForCookie and GetSessionForCookie D-Bus methods
Diffstat (limited to 'src/lightdm.c')
-rw-r--r-- | src/lightdm.c | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/src/lightdm.c b/src/lightdm.c index 18411062..60cd42cd 100644 --- a/src/lightdm.c +++ b/src/lightdm.c @@ -341,47 +341,6 @@ handle_display_manager_call (GDBusConnection *connection, else// FIXME: Need to make proper error g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "Failed to start seat"); } - /* NOTE: This method is deprecated, use the XSG_SEAT_PATH environment variable instead */ - else if (g_strcmp0 (method_name, "GetSeatForCookie") == 0) - { - gchar *cookie; - Seat *seat = NULL; - BusEntry *entry = NULL; - - if (!g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(s)"))) - return; - - g_variant_get (parameters, "(&s)", &cookie); - - get_session_for_cookie (cookie, &seat); - if (seat) - entry = g_hash_table_lookup (seat_bus_entries, seat); - if (entry) - g_dbus_method_invocation_return_value (invocation, g_variant_new ("(o)", entry->path)); - else // FIXME: Need to make proper error - g_dbus_method_invocation_return_error_literal (invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "Unable to find seat for cookie"); - } - - /* NOTE: This method is deprecated, use the XSG_SESSION_PATH environment variable instead */ - else if (g_strcmp0 (method_name, "GetSessionForCookie") == 0) - { - gchar *cookie; - Session *session; - BusEntry *entry = NULL; - - if (!g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(s)"))) - return; - - g_variant_get (parameters, "(&s)", &cookie); - - session = get_session_for_cookie (cookie, NULL); - if (session) - entry = g_hash_table_lookup (session_bus_entries, session); - if (entry) - g_dbus_method_invocation_return_value (invocation, g_variant_new ("(o)", entry->path)); - else // FIXME: Need to make proper error - g_dbus_method_invocation_return_error_literal (invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "Unable to find session for cookie"); - } } static GVariant * @@ -681,14 +640,6 @@ bus_acquired_cb (GDBusConnection *connection, " <arg name='display-number' direction='in' type='i'/>" " <arg name='seat' direction='out' type='o'/>" " </method>" - " <method name='GetSeatForCookie'>" - " <arg name='cookie' direction='in' type='s'/>" - " <arg name='seat' direction='out' type='o'/>" - " </method>" - " <method name='GetSessionForCookie'>" - " <arg name='cookie' direction='in' type='s'/>" - " <arg name='session' direction='out' type='o'/>" - " </method>" " <signal name='SeatAdded'>" " <arg name='seat' type='o'/>" " </signal>" |