From e5f731375d73fe2106304310e84bd68dc8da12fa Mon Sep 17 00:00:00 2001
From: Stefano Karapetsas <stefano@karapetsas.com>
Date: Tue, 21 Oct 2014 12:06:19 +0200
Subject: Fix g_desktop_app_info_set_desktop_env deprecation

---
 src/caja-main.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/caja-main.c b/src/caja-main.c
index 3227b5d4..7eee311a 100644
--- a/src/caja-main.c
+++ b/src/caja-main.c
@@ -393,8 +393,10 @@ main (int argc, char *argv[])
     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");
+#endif
 
     if (g_getenv ("CAJA_DEBUG") != NULL)
     {
-- 
cgit v1.2.1