From a9cacb929470eb82582396984c61d5b611bfeb1a Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Fri, 12 Jun 2015 14:33:40 -0400
Subject: session: drop session-type property

It was used by ConsoleKit to set the "LoginWindow" property on
login screen sessions.  it's not used by logind and ConsoleKit
is gone now, so drop it.

https://bugzilla.gnome.org/show_bug.cgi?id=743940
---
 daemon/gdm-launch-environment.c |  2 --
 daemon/gdm-session-worker.c     | 15 ---------------
 daemon/gdm-session-worker.xml   |  3 ---
 daemon/gdm-session.c            | 21 ---------------------
 daemon/gdm-session.h            |  2 --
 5 files changed, 43 deletions(-)

diff --git a/daemon/gdm-launch-environment.c b/daemon/gdm-launch-environment.c
index 69301357..4982f7c2 100644
--- a/daemon/gdm-launch-environment.c
+++ b/daemon/gdm-launch-environment.c
@@ -310,8 +310,6 @@ on_session_setup_complete (GdmSession        *session,
                 gdm_session_set_environment_variable (launch_environment->priv->session, key, value);
         }
         g_hash_table_destroy (hash);
-
-        gdm_session_select_session_type (launch_environment->priv->session, "LoginWindow");
 }
 
 static void
diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c
index bb4c3326..6ed6d6cc 100644
--- a/daemon/gdm-session-worker.c
+++ b/daemon/gdm-session-worker.c
@@ -145,7 +145,6 @@ struct GdmSessionWorkerPrivate
         char             *hostname;
         char             *username;
         char             *log_file;
-        char             *session_type;
         char             *session_id;
         uid_t             uid;
         gid_t             gid;
@@ -2186,19 +2185,6 @@ gdm_session_worker_handle_set_session_name (GdmDBusWorker         *object,
         return TRUE;
 }
 
-static gboolean
-gdm_session_worker_handle_set_session_type (GdmDBusWorker         *object,
-                                            GDBusMethodInvocation *invocation,
-                                            const char            *session_type)
-{
-        GdmSessionWorker *worker = GDM_SESSION_WORKER (object);
-        g_debug ("GdmSessionWorker: session type set to %s", session_type);
-        g_free (worker->priv->session_type);
-        worker->priv->session_type = g_strdup (session_type);
-        gdm_dbus_worker_complete_set_session_type (object, invocation);
-        return TRUE;
-}
-
 static gboolean
 gdm_session_worker_handle_set_session_display_mode (GdmDBusWorker         *object,
                                                     GDBusMethodInvocation *invocation,
@@ -3007,7 +2993,6 @@ worker_interface_init (GdmDBusWorkerIface *interface)
         interface->handle_open = gdm_session_worker_handle_open;
         interface->handle_set_language_name = gdm_session_worker_handle_set_language_name;
         interface->handle_set_session_name = gdm_session_worker_handle_set_session_name;
-        interface->handle_set_session_type = gdm_session_worker_handle_set_session_type;
         interface->handle_set_session_display_mode = gdm_session_worker_handle_set_session_display_mode;
         interface->handle_set_environment_variable = gdm_session_worker_handle_set_environment_variable;
         interface->handle_start_program = gdm_session_worker_handle_start_program;
diff --git a/daemon/gdm-session-worker.xml b/daemon/gdm-session-worker.xml
index 853bc6a4..9f6d8b35 100644
--- a/daemon/gdm-session-worker.xml
+++ b/daemon/gdm-session-worker.xml
@@ -13,9 +13,6 @@
     <method name="SetSessionName">
       <arg name="session_name" direction="in" type="s" />
     </method>
-    <method name="SetSessionType">
-      <arg name="session_type" direction="in" type="s"/>
-    </method>
     <method name="SetSessionDisplayMode">
       <arg name="mode" direction="in" type="s"/>
     </method>
diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
index 52fbc172..b64c3edc 100644
--- a/daemon/gdm-session.c
+++ b/daemon/gdm-session.c
@@ -2985,27 +2985,6 @@ gdm_session_select_program (GdmSession *self,
         self->priv->selected_program = g_strdup (text);
 }
 
-void
-gdm_session_select_session_type (GdmSession *self,
-                                 const char *text)
-{
-        GHashTableIter iter;
-        gpointer key, value;
-
-        g_debug ("GdmSession: selecting session type '%s'", text);
-
-        g_hash_table_iter_init (&iter, self->priv->conversations);
-        while (g_hash_table_iter_next (&iter, &key, &value)) {
-                GdmSessionConversation *conversation;
-
-                conversation = (GdmSessionConversation *) value;
-
-                gdm_dbus_worker_call_set_session_type (conversation->worker_proxy,
-                                                       text,
-                                                       NULL, NULL, NULL);
-        }
-}
-
 void
 gdm_session_select_session (GdmSession *self,
                             const char *text)
diff --git a/daemon/gdm-session.h b/daemon/gdm-session.h
index 6d13f111..7cfaca18 100644
--- a/daemon/gdm-session.h
+++ b/daemon/gdm-session.h
@@ -176,8 +176,6 @@ void              gdm_session_answer_query                (GdmSession *session,
                                                            const char *text);
 void              gdm_session_select_program              (GdmSession *session,
                                                            const char *command_line);
-void              gdm_session_select_session_type         (GdmSession *session,
-                                                           const char *session_type);
 void              gdm_session_select_session              (GdmSession *session,
                                                            const char *session_name);
 void              gdm_session_select_user                 (GdmSession *session,
-- 
cgit v1.2.1