Merge with trunk

diff --combined src/display.c
index db7f2211c6807135948f5b858c66f34e40634236,5ba1ebe6bb79a093ee67eccfcbc3c8bc84823889..deab9f40bb7b154eb10d813c1047b353e6964309
--- 1/src/display.c
--- 2/src/display.c
+++ b/src/display.c
@@@ -40,9 -40,6 +40,9 @@@ struct DisplayPrivat
      /* 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;
  
@@@ -133,13 -130,6 +133,13 @@@ display_get_display_server (Display *di
      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)
  {
@@@ -714,6 -704,7 +714,7 @@@ display_start_session (Display *display
      gchar *filename, *sessions_dir, *path;
      const gchar *language;
      gchar **argv;
+     gboolean disable_guest_wrapper;
  
      user = session_get_user (display->priv->session);
  
@@@ -748,7 -739,8 +749,8 @@@
      session_set_env (display->priv->session, "GDMSESSION", display->priv->user_session); // FIXME: Not cross-desktop
  
      /* Run a guest session through the wrapper covered by MAC */
-     if (display->priv->autologin_guest)
+     disable_guest_wrapper = config_get_boolean (config_get_instance (), "LightDM", "disable-guest-wrapper");
+     if (display->priv->autologin_guest && !disable_guest_wrapper)
      {
          gchar *wrapper = g_build_filename (PKGLIBEXEC_DIR, "lightdm-guest-session-wrapper", NULL);
          g_debug ("Running guest session through wrapper: %s", wrapper);