Merge pull request #806 from fastfetch-cli/dev

Release: v2.10.2

CHANGELOG.md

@@ -1,3 +1,13 @@
+# 2.10.2
+
+Bugfixes:
+* Fix a regression that detect x11 as wayland (#805, WM, Linux)
+
+# 2.10.1
+
+Bugfixes:
+* Fix build with `-DENABLE_DBUS=OFF` (Linux)
+
 # 2.10.0
 
 Changes:

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.12.0) # target_link_libraries with OBJECT libs & project homepage url
 
 project(fastfetch
-    VERSION 2.10.0
+    VERSION 2.10.2
     LANGUAGES C
     DESCRIPTION "Fast neofetch-like system information tool"
     HOMEPAGE_URL "https://github.com/fastfetch-cli/fastfetch"

src/detection/de/de_linux.c

@@ -43,19 +43,23 @@ static void getKDE(FFstrbuf* result, FFDEOptions* options)
     }
 }
 
-static const char* getGnomeBySo(FFstrbuf* result)
+static const char* getGnomeByDbus(FF_MAYBE_UNUSED FFstrbuf* result)
 {
+#ifdef FF_HAVE_DBUS
     FFDBusData dbus;
     if (ffDBusLoadData(DBUS_BUS_SESSION, &dbus) != NULL)
         return "ffDBusLoadData() failed";
 
     ffDBusGetPropertyString(&dbus, "org.gnome.Shell", "/org/gnome/Shell", "org.gnome.Shell", "ShellVersion", result);
     return NULL;
+#else // FF_HAVE_DBUS
+    return "ffDBusLoadData() failed: dbus support not compiled in";
+#endif // FF_HAVE_DBUS
 }
 
 static void getGnome(FFstrbuf* result, FF_MAYBE_UNUSED FFDEOptions* options)
 {
-    getGnomeBySo(result);
+    getGnomeByDbus(result);
 
     if (result->length == 0 && options->slowVersionDetection)
     {

src/detection/displayserver/linux/wayland/wayland.c

@@ -135,7 +135,7 @@ void ffdsConnectWayland(FFDisplayServerResult* result)
     const char* xdgSessionType = getenv("XDG_SESSION_TYPE");
 
     //If XDG_SESSION_TYPE is set, and doesn't contain "wayland", we are probably not running in a wayland session.
-    if(xdgSessionType != NULL && ffStrEqualsIgnCase(xdgSessionType, "wayland"))
+    if(xdgSessionType != NULL && !ffStrEqualsIgnCase(xdgSessionType, "wayland"))
         return;
 
     //If XDG_SESSION_TYPE is not set, check if WAYLAND_DISPLAY or WAYLAND_SOCKET is set.