diff options
Diffstat (limited to 'src/caja-main.c')
| -rw-r--r-- | src/caja-main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/caja-main.c b/src/caja-main.c index 7eee311a..4307e0f3 100644 --- a/src/caja-main.c +++ b/src/caja-main.c @@ -389,10 +389,6 @@ main (int argc, char *argv[]) mallopt (M_MMAP_THRESHOLD, 128 *1024); #endif -#if !GLIB_CHECK_VERSION (2, 32, 0) - g_thread_init (NULL); -#endif - #if !GLIB_CHECK_VERSION (2, 42, 0) /* This will be done by gtk+ later, but for now, force it to MATE */ g_desktop_app_info_set_desktop_env ("MATE"); @@ -469,6 +465,10 @@ main (int argc, char *argv[]) no_default_window = TRUE; no_desktop = FALSE; } + else if (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "MATE") != 0) + { + no_desktop = TRUE; + } if (perform_self_check && remaining != NULL) { |