Skip to content

Commit 5770463

Browse files
authored
csd-wacom: remove ifdef code that cannot compile (#395)
Regression in commit 88e9de5. This was probably a bad merge from gnome. The HAVE_WAYLAND define is never defined, but if it did then the code would try to include a cinnamon header that has never existed, then call a gnome-settings-daemon internal function that does not exist. It is possible to properly implement HAVE_WAYLAND, but this code didn't.
1 parent bcc2dc3 commit 5770463

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

plugins/wacom/csd-wacom-manager.c

+1-10
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@
4646
#include "csd-enums.h"
4747
#include "cinnamon-settings-profile.h"
4848

49-
#if HAVE_WAYLAND
50-
#include "cinnamon-settings-bus.h"
51-
#endif
52-
5349
#include "csd-wacom-manager.h"
5450
#include "csd-wacom-oled.h"
5551
#include "migrate-settings.h"
@@ -193,12 +189,7 @@ csd_wacom_manager_class_init (CsdWacomManagerClass *klass)
193189
static gchar *
194190
get_device_path (GdkDevice *device)
195191
{
196-
#if HAVE_WAYLAND
197-
if (gnome_settings_is_wayland ())
198-
return g_strdup (gdk_wayland_device_get_node_path (device));
199-
else
200-
#endif
201-
return xdevice_get_device_node (gdk_x11_device_get_id (device));
192+
return xdevice_get_device_node (gdk_x11_device_get_id (device));
202193
}
203194

204195
static gboolean

0 commit comments

Comments
 (0)