Merge pull request #802 from ceamac/fix/dbus

CarterLi · web-flow · commit 57f6aff2de39 · 2024-04-22T23:33:51.000+08:00
fix/dbus
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 2.10.1
+
+Bugfixes:
+* fix build with ENABLE_DBUS=OFF
+
 # 2.10.0
 
 Changes:
diff --git a/src/detection/de/de_linux.c b/src/detection/de/de_linux.c
@@ -45,12 +45,16 @@ static void getKDE(FFstrbuf* result, FFDEOptions* options)
 
 static const char* getGnomeBySo(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)

Original file line number	Diff line number	Diff line change
`@@ -45,12 +45,16 @@ static void getKDE(FFstrbuf* result, FFDEOptions* options)`
`45`	`45`
`46`	`46`	`static const char* getGnomeBySo(FFstrbuf* result)`
`47`	`47`	`{`
	`48`	`+#ifdef FF_HAVE_DBUS`
`48`	`49`	`FFDBusData dbus;`
`49`	`50`	`if (ffDBusLoadData(DBUS_BUS_SESSION, &dbus) != NULL)`
`50`	`51`	`return "ffDBusLoadData() failed";`
`51`	`52`
`52`	`53`	`ffDBusGetPropertyString(&dbus, "org.gnome.Shell", "/org/gnome/Shell", "org.gnome.Shell", "ShellVersion", result);`
`53`	`54`	`return NULL;`
	`55`	`+#else // FF_HAVE_DBUS`
	`56`	`+ return "ffDBusLoadData() failed: dbus support not compiled in";`
	`57`	`+#endif // FF_HAVE_DBUS`
`54`	`58`	`}`
`55`	`59`
`56`	`60`	`static void getGnome(FFstrbuf* result, FF_MAYBE_UNUSED FFDEOptions* options)`