From eae73883db9f199ccf1b2b4dc41461fa0d997a21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Thu, 6 Jun 2024 16:42:11 +0800 Subject: [PATCH] DE (Linux): correctly capitalize GNOME Fix #997 --- CHANGELOG.md | 6 +++--- src/detection/displayserver/displayserver.h | 4 ++-- src/detection/displayserver/linux/wmde.c | 4 ++-- src/detection/gtk_qt/gtk.c | 2 +- src/logo/builtin.c | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a1eb81e..fdffc050 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -273,7 +273,7 @@ Features: * Improve GPU detection on Linux (GPU, Linux) * Support GPU memory usage detection for AMD GPUs * Support GPU frequency detection for Intel GPUs -* Improve performance of Gnome version detection (DE, Linux) +* Improve performance of GNOME version detection (DE, Linux) * Improve performance of kitty version detection (Terminal, Linux) * Detect refresh rate when using `--ds-force-drm sysfs-only` (Display, Linux) * Add option `--ts-version` to disable terminal and shell version detection. Mainly for benchmarking purposes @@ -980,7 +980,7 @@ Bugfixes: * Fix Windows drives detection in WSL (Linux, Disk) * Fix CPU temp detection (FreeBSD, CPU) * Fix disk detection (Android, Disk) -* Fix Gnome Terminal version and font detection (FreeBSD, TerminalFont) +* Fix GNOME Terminal version and font detection (FreeBSD, TerminalFont) * Fix crash on newer wayland desktops (Linux, Display, #477) * Fix vendor detection for Intel GPU (macOS, GPU) * Fix possible crashes on Windows Server (Windows, GPU, #484) @@ -1006,7 +1006,7 @@ Features: * Add mac address detection `--localip-show-mac` (LocalIP, #451) Bugfixes: -* Fix Gnome version detection on Fedora (DE) +* Fix GNOME version detection on Fedora (DE) * Fix Windows drives detection in WSL (Disk) Changes: diff --git a/src/detection/displayserver/displayserver.h b/src/detection/displayserver/displayserver.h index 1497e786..dc223b79 100644 --- a/src/detection/displayserver/displayserver.h +++ b/src/detection/displayserver/displayserver.h @@ -3,8 +3,8 @@ #include "fastfetch.h" #define FF_DE_PRETTY_PLASMA "KDE Plasma" -#define FF_DE_PRETTY_GNOME "Gnome" -#define FF_DE_PRETTY_GNOME_CLASSIC "Gnome Classic" +#define FF_DE_PRETTY_GNOME "GNOME" +#define FF_DE_PRETTY_GNOME_CLASSIC "GNOME Classic" #define FF_DE_PRETTY_XFCE4 "Xfce4" #define FF_DE_PRETTY_CINNAMON "Cinnamon" #define FF_DE_PRETTY_MATE "Mate" diff --git a/src/detection/displayserver/linux/wmde.c b/src/detection/displayserver/linux/wmde.c index 4ee96cd4..10ea048d 100644 --- a/src/detection/displayserver/linux/wmde.c +++ b/src/detection/displayserver/linux/wmde.c @@ -43,7 +43,7 @@ static const char* parseEnv(void) return "KDE"; if(getenv("GNOME_DESKTOP_SESSION_ID") != NULL) - return "Gnome"; + return "GNOME"; if(getenv("MATE_DESKTOP_SESSION_ID") != NULL) return "Mate"; @@ -163,7 +163,7 @@ static void applyPrettyNameIfDE(FFDisplayServerResult* result, const char* name) } else if( - ffStrEqualsIgnCase(name, "Gnome") || + ffStrEqualsIgnCase(name, "GNOME") || ffStrEqualsIgnCase(name, "ubuntu:GNOME") || ffStrEqualsIgnCase(name, "ubuntu") || ffStrEqualsIgnCase(name, "gnome-shell") diff --git a/src/detection/gtk_qt/gtk.c b/src/detection/gtk_qt/gtk.c index ef5e4f17..da3bbd02 100644 --- a/src/detection/gtk_qt/gtk.c +++ b/src/detection/gtk_qt/gtk.c @@ -153,7 +153,7 @@ static void detectGTKFromConfigDir(FFstrbuf* configDir, const char* version, FFG static void detectGTK(const char* version, FFGTKResult* result) { - //Mate, Cinnamon, Gnome, Unity, Budgie use dconf to save theme config + //Mate, Cinnamon, GNOME, Unity, Budgie use dconf to save theme config //On other DEs, this will do nothing detectGTKFromSettings(result); if(allPropertiesSet(result)) diff --git a/src/logo/builtin.c b/src/logo/builtin.c index c7ae03e7..0c92a20c 100644 --- a/src/logo/builtin.c +++ b/src/logo/builtin.c @@ -1802,9 +1802,9 @@ static const FFlogo G[] = { .colorKeys = FF_COLOR_FG_BLUE, .colorTitle = FF_COLOR_FG_BLUE, }, - // Gnome + // GNOME { - .names = {"Gnome"}, + .names = {"GNOME"}, .lines = FASTFETCH_DATATEXT_LOGO_GNOME, .colors = { FF_COLOR_FG_BLUE, @@ -4158,7 +4158,7 @@ static const FFlogo U[] = { FF_COLOR_FG_WHITE, }, }, - // UbuntuGnome + // UbuntuGNOME { .names = {"ubuntu gnome", "ubuntu-gnome"}, .lines = FASTFETCH_DATATEXT_LOGO_UBUNTU_GNOME,