Merge pull request #105935 from TTHHR/fixdbus

Repiteo · Repiteo · commit d7615dc75fb0 · 2025-04-30T09:18:44.000-05:00
Wayland: Fix compile error with DBUS disabled
diff --git a/platform/linuxbsd/wayland/display_server_wayland.cpp b/platform/linuxbsd/wayland/display_server_wayland.cpp
@@ -1541,7 +1541,10 @@ bool DisplayServerWayland::color_picker(const Callable &p_callback) {
 	// TODO: Use window IDs for multiwindow support.
 
 	WaylandThread::WindowState *ws = wayland_thread.wl_surface_get_window_state(wayland_thread.window_get_wl_surface(window_id));
+#ifdef DBUS_ENABLED
 	return portal_desktop->color_picker((ws ? ws->exported_handle : String()), p_callback);
+#endif
+	return false;
 }
 
 void DisplayServerWayland::try_suspend() {

Original file line number	Diff line number	Diff line change
`@@ -1541,7 +1541,10 @@ bool DisplayServerWayland::color_picker(const Callable &p_callback) {`
`1541`	`1541`	`// TODO: Use window IDs for multiwindow support.`
`1542`	`1542`
`1543`	`1543`	`WaylandThread::WindowState *ws = wayland_thread.wl_surface_get_window_state(wayland_thread.window_get_wl_surface(window_id));`
	`1544`	`+#ifdef DBUS_ENABLED`
`1544`	`1545`	`return portal_desktop->color_picker((ws ? ws->exported_handle : String()), p_callback);`
	`1546`	`+#endif`
	`1547`	`+ return false;`
`1545`	`1548`	`}`
`1546`	`1549`
`1547`	`1550`	`void DisplayServerWayland::try_suspend() {`