Merge with trunk

[sojka/lightdm.git] / src / display.c

diff --git a/src/display.c b/src/display.c
index 5ba1ebe6bb79a093ee67eccfcbc3c8bc84823889..deab9f40bb7b154eb10d813c1047b353e6964309 100644 (file)
--- a/src/display.c
+++ b/src/display.c
@@ -40,6 +40,9 @@ struct DisplayPrivate
     /* Display server */
     DisplayServer *display_server;
 
+    /* TRUE if the session can run on the same display server as the greeter */
+    gboolean share_display_server;
+
     /* Greeter session */
     gchar *greeter_session;
 
@@ -130,6 +133,13 @@ display_get_display_server (Display *display)
     return display->priv->display_server;
 }
 
+void
+display_set_share_display_server (Display *display, gboolean share_display_server)
+{
+    g_return_if_fail (display != NULL);
+    display->priv->share_display_server = share_display_server;
+}
+
 const gchar *
 display_get_username (Display *display)
 {