Load and use session types

diff --git a/src/mir-server.c b/src/mir-server.c
index 65617a8cf43c8165272125a4e6cdc49dcebb7460..387b09a0c79f64c74efed1446e6f05e7434ed99d 100644 (file)
--- a/src/mir-server.c
+++ b/src/mir-server.c
@@ -14,7 +14,8 @@
 #include "mir-server.h"
 
 struct MirServerPrivate
-{  
+{
+    int dummy;
 };
 
 G_DEFINE_TYPE (MirServer, mir_server, DISPLAY_SERVER_TYPE);

diff --git a/src/seat.c b/src/seat.c
index a94a114dc6670997042bb5a9293a65b75396180c..ba0b7c72dea8ab662d0a0bcd483f30c893884549 100644 (file)
--- a/src/seat.c
+++ b/src/seat.c
@@ -729,12 +729,16 @@ create_user_session (Seat *seat, const gchar *username)
         session_set_username (session, username);
         session_set_do_authenticate (session, TRUE);
         argv = get_session_argv (session_config, seat_get_string_property (seat, "session-wrapper"));
-        g_object_unref (session_config);
         session_set_argv (session, argv);
         g_strfreev (argv);
+
+        g_object_unref (session_config);
     }
     else
+    {
         g_debug ("Can't find session '%s'", seat_get_string_property (seat, "user-session"));
+        session = NULL;
+    }
 
     g_object_unref (user);
 
@@ -941,7 +945,6 @@ create_greeter_session (Seat *seat)
         return NULL;
 
     argv = get_session_argv (session_config, NULL);
-    g_object_unref (session_config);
     greeter_wrapper = seat_get_string_property (seat, "greeter-wrapper");
     if (greeter_wrapper)
     {
@@ -952,6 +955,7 @@ create_greeter_session (Seat *seat)
     }
 
     greeter_session = SEAT_GET_CLASS (seat)->create_greeter_session (seat);
+    session_set_session_type (SESSION (greeter_session), session_config_get_session_type (session_config));
     seat->priv->sessions = g_list_append (seat->priv->sessions, SESSION (greeter_session));
     g_signal_connect (greeter_session, "authentication-complete", G_CALLBACK (session_authentication_complete_cb), seat);
     g_signal_connect (greeter_session, "stopped", G_CALLBACK (session_stopped_cb), seat);
@@ -977,6 +981,8 @@ create_greeter_session (Seat *seat)
     greeter_set_hint (greeter_session, "show-remote-login", seat_get_boolean_property (seat, "greeter-show-remote-login") ? "true" : "false");
     greeter_set_hint (greeter_session, "has-guest-account", seat_get_allow_guest (seat) && seat_get_boolean_property (seat, "greeter-allow-guest") ? "true" : "false");
 
+    g_object_unref (session_config);
+
     return greeter_session;
 }
 

diff --git a/src/session-config.c b/src/session-config.c
index a445ca853b63a1d52b3e843a785f17d0b7feee51..5ad780fc8f1e20e3573cc396dfb40868c1a66415 100644 (file)
--- a/src/session-config.c
+++ b/src/session-config.c
@@ -41,11 +41,14 @@ session_config_new_from_file (const gchar *filename, GError **error)
                      "No Exec option in session file: %s", filename);
         return NULL;
     }
-    g_key_file_free (desktop_file);
 
     config = g_object_new (SESSION_CONFIG_TYPE, NULL);
     config->priv->command = command;
     config->priv->session_type = g_key_file_get_string (desktop_file, G_KEY_FILE_DESKTOP_GROUP, "X-LightDM-Session-Type", NULL);
+    if (!config->priv->session_type)
+        config->priv->session_type = g_strdup ("x");
+
+    g_key_file_free (desktop_file);
 
     return config;
 }

diff --git a/src/session.c b/src/session.c
index b2d591022e410a5dd32af077161f24f97257ae22..78a7c01d1af6e270eeed60328061effc32bb1103 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -37,6 +37,9 @@ static guint signals[LAST_SIGNAL] = { 0 };
 
 struct SessionPrivate
 {
+    /* Session type */
+    gchar *session_type;
+
     /* Display server running on */
     DisplayServer *display_server;
 
@@ -128,13 +131,16 @@ session_new (void)
 void
 session_set_session_type (Session *session, const gchar *session_type)
 {
+    g_return_if_fail (session != NULL);
+    g_free (session->priv->session_type);
+    session->priv->session_type = g_strdup (session_type);
 }
 
 const gchar *
 session_get_session_type (Session *session)
 {
     g_return_val_if_fail (session != NULL, NULL);
-    return "x";
+    return session->priv->session_type;
 }
 
 void
@@ -793,6 +799,7 @@ session_finalize (GObject *object)
     Session *self = SESSION (object);
     int i;
 
+    g_free (self->priv->session_type);
     if (self->priv->display_server)
         g_object_unref (self->priv->display_server);
     if (self->priv->pid)