Fix case-insensitive comparison in running_in_mate

zhangxianwei8 · raveit65 · commit 2676eaf3ed92 · 2018-11-07T17:04:28.000+01:00
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 &lt;zhang.xianwei8@zte.com.cn&gt;
diff --git 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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,8 @@ static gboolean`
`57`	`57`	`running_in_mate (void)`
`58`	`58`	`{`
`59`	`59`	`return (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "MATE") == 0)`
`60`		`- \|\| (g_strcmp0 (g_getenv ("XDG_SESSION_DESKTOP"), "MATE") == 0)`
`61`		`- \|\| (g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "MATE") == 0);`
	`60`	`+ \|\| (g_strcmp0 (g_getenv ("XDG_SESSION_DESKTOP"), "mate") == 0)`
	`61`	`+ \|\| (g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "mate") == 0);`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`static void`
Original file line number	Diff line number	Diff line change
`@@ -2041,8 +2041,8 @@ static gboolean`
`2041`	`2041`	`running_in_mate (void)`
`2042`	`2042`	`{`
`2043`	`2043`	`return (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "MATE") == 0)`
`2044`		`- \|\| (g_strcmp0 (g_getenv ("XDG_SESSION_DESKTOP"), "MATE") == 0)`
`2045`		`- \|\| (g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "MATE") == 0);`
	`2044`	`+ \|\| (g_strcmp0 (g_getenv ("XDG_SESSION_DESKTOP"), "mate") == 0)`
	`2045`	`+ \|\| (g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "mate") == 0);`
`2046`	`2046`	`}`
`2047`	`2047`
`2048`	`2048`	`static gboolean`
Original file line number	Diff line number	Diff line change
`@@ -220,8 +220,8 @@ static gboolean`
`220`	`220`	`running_in_mate (void)`
`221`	`221`	`{`
`222`	`222`	`return (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "MATE") == 0)`
`223`		`- \|\| (g_strcmp0 (g_getenv ("XDG_SESSION_DESKTOP"), "MATE") == 0)`
`224`		`- \|\| (g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "MATE") == 0);`
	`223`	`+ \|\| (g_strcmp0 (g_getenv ("XDG_SESSION_DESKTOP"), "mate") == 0)`
	`224`	`+ \|\| (g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "mate") == 0);`
`225`	`225`	`}`
`226`	`226`
`227`	`227`	`static gboolean`