summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhang Xianwei <[email protected]>2018-10-29 20:13:28 +0800
committerraveit65 <[email protected]>2018-11-07 17:04:28 +0100
commit2676eaf3ed92ef33e2a39aece779465c427a59db (patch)
tree5b68da5de7dcd3d69d2471c9cf6ba1e8af196305
parent0bffad73380b318d9775e12ea7153ae14488349c (diff)
downloadcaja-2676eaf3ed92ef33e2a39aece779465c427a59db.tar.bz2
caja-2676eaf3ed92ef33e2a39aece779465c427a59db.tar.xz
Fix case-insensitive comparison in running_in_mate
The environment variable XDG_SESSION_DESKTOP and DESKTOP_SESSION in running_in_mate are compared using "MATE". Actually the environment variable in MATE DE is "mate"(lower case). Using "mate" instead of "MATE" to fix it. Signed-off-by: Zhang Xianwei <[email protected]>
-rw-r--r--libegg/eggsmclient.c4
-rw-r--r--src/caja-application.c4
-rw-r--r--src/caja-main.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/libegg/eggsmclient.c b/libegg/eggsmclient.c
index 4886f147..84848921 100644
--- a/libegg/eggsmclient.c
+++ b/libegg/eggsmclient.c
@@ -57,8 +57,8 @@ static gboolean
running_in_mate (void)
{
return (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "MATE") == 0)
- || (g_strcmp0 (g_getenv ("XDG_SESSION_DESKTOP"), "MATE") == 0)
- || (g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "MATE") == 0);
+ || (g_strcmp0 (g_getenv ("XDG_SESSION_DESKTOP"), "mate") == 0)
+ || (g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "mate") == 0);
}
static void
diff --git a/src/caja-application.c b/src/caja-application.c
index 86a6c826..5843c4c5 100644
--- a/src/caja-application.c
+++ b/src/caja-application.c
@@ -2041,8 +2041,8 @@ static gboolean
running_in_mate (void)
{
return (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "MATE") == 0)
- || (g_strcmp0 (g_getenv ("XDG_SESSION_DESKTOP"), "MATE") == 0)
- || (g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "MATE") == 0);
+ || (g_strcmp0 (g_getenv ("XDG_SESSION_DESKTOP"), "mate") == 0)
+ || (g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "mate") == 0);
}
static gboolean
diff --git a/src/caja-main.c b/src/caja-main.c
index c74e43b0..a6e296ff 100644
--- a/src/caja-main.c
+++ b/src/caja-main.c
@@ -220,8 +220,8 @@ static gboolean
running_in_mate (void)
{
return (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "MATE") == 0)
- || (g_strcmp0 (g_getenv ("XDG_SESSION_DESKTOP"), "MATE") == 0)
- || (g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "MATE") == 0);
+ || (g_strcmp0 (g_getenv ("XDG_SESSION_DESKTOP"), "mate") == 0)
+ || (g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "mate") == 0);
}
static gboolean