From df84721b5587fcd678ed59073dcdb5e1a44a1a10 Mon Sep 17 00:00:00 2001 From: CSoellinger Date: Wed, 1 Feb 2023 10:01:47 +0100 Subject: [PATCH 1/2] fix: add another mutter detection for linux mint 21.1 (cinnamon) --- src/detection/displayserver/linux/wmde.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/detection/displayserver/linux/wmde.c b/src/detection/displayserver/linux/wmde.c index 33d03a20a..aaad2b938 100644 --- a/src/detection/displayserver/linux/wmde.c +++ b/src/detection/displayserver/linux/wmde.c @@ -70,7 +70,8 @@ static void applyPrettyNameIfWM(FFDisplayServerResult* result, const char* proce strcasecmp(processName, "gnome-shell") == 0 || strcasecmp(processName, "gnome shell") == 0 || strcasecmp(processName, "gnome-session-binary") == 0 || - strcasecmp(processName, "Mutter") == 0 + strcasecmp(processName, "Mutter") == 0 || + strcasecmp(processName, "Mutter (Muffin)") == 0 ) ffStrbufSetS(&result->wmPrettyName, FF_WM_PRETTY_MUTTER); else if( strcasecmp(processName, "cinnamon-session") == 0 || From 55da030e2a5fcbb6eb55652b9a3bb90b77f1ae9c Mon Sep 17 00:00:00 2001 From: CSoellinger Date: Wed, 1 Feb 2023 10:50:31 +0100 Subject: [PATCH 2/2] fix: move mutter(muffin) detection to get FF_WM_PRETTY_MUFFIN back --- src/detection/displayserver/linux/wmde.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/detection/displayserver/linux/wmde.c b/src/detection/displayserver/linux/wmde.c index aaad2b938..71b1d1474 100644 --- a/src/detection/displayserver/linux/wmde.c +++ b/src/detection/displayserver/linux/wmde.c @@ -70,12 +70,12 @@ static void applyPrettyNameIfWM(FFDisplayServerResult* result, const char* proce strcasecmp(processName, "gnome-shell") == 0 || strcasecmp(processName, "gnome shell") == 0 || strcasecmp(processName, "gnome-session-binary") == 0 || - strcasecmp(processName, "Mutter") == 0 || - strcasecmp(processName, "Mutter (Muffin)") == 0 + strcasecmp(processName, "Mutter") == 0 ) ffStrbufSetS(&result->wmPrettyName, FF_WM_PRETTY_MUTTER); else if( strcasecmp(processName, "cinnamon-session") == 0 || - strcasecmp(processName, "Muffin") == 0 + strcasecmp(processName, "Muffin") == 0 || + strcasecmp(processName, "Mutter (Muffin)") == 0 ) ffStrbufSetS(&result->wmPrettyName, FF_WM_PRETTY_MUFFIN); else if(strcasecmp(processName, "sway") == 0) ffStrbufSetS(&result->wmPrettyName, FF_WM_PRETTY_SWAY);