From 5cb83c75efa88de760b9d4f2ed622f01938b91ce Mon Sep 17 00:00:00 2001
From: infirit <infirit@gmail.com>
Date: Fri, 4 Sep 2015 22:35:05 +0200
Subject: [PATCH] Cleanup and fix --no-desktop

---
 src/caja-main.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/caja-main.c b/src/caja-main.c
index b829bf6..6a3e307 100644
--- a/src/caja-main.c
+++ b/src/caja-main.c
@@ -474,14 +474,19 @@ main (int argc, char *argv[])
     /* If in autostart mode (aka started by mate-session), we need to ensure
      * caja starts with the correct options.
      */
-    if (autostart_mode)
+    if (autostart_mode && !no_desktop)
     {
         no_default_window = TRUE;
         no_desktop = FALSE;
     }
-    else if (running_as_root () || !running_in_mate ())
+    else if (autostart_mode && no_desktop)
+    {
+        no_default_window = TRUE;
+    }
+
+    /* Never manage desktop when running as root */
+    if (running_as_root ())
     {
-        /* do not manage desktop when running as root or on other desktops */
         no_desktop = TRUE;
     }

--
2.5.1