summaryrefslogtreecommitdiff
path: root/registryd
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@gnome.org>2022-12-06 17:10:22 -0600
committerFederico Mena Quintero <federico@gnome.org>2022-12-06 17:10:33 -0600
commit42e04064dbfb6d53c6a7a167fad7d631b012491f (patch)
treee6338e70a0f81e32f377526a9bd01a924cc6e8ea /registryd
parent74325ccc57c6d0404f48edfb6c573c2d45684725 (diff)
downloadat-spi2-core-42e04064dbfb6d53c6a7a167fad7d631b012491f.tar.gz
Move X11-specific prototypes to deviceeventcontroller-x11.h
This removes "HAVE_X11" from deviceeventcontroller.h
Diffstat (limited to 'registryd')
-rw-r--r--registryd/deviceeventcontroller-x11.c2
-rw-r--r--registryd/deviceeventcontroller-x11.h7
-rw-r--r--registryd/deviceeventcontroller.h7
3 files changed, 8 insertions, 8 deletions
diff --git a/registryd/deviceeventcontroller-x11.c b/registryd/deviceeventcontroller-x11.c
index bf984d4a..689191f7 100644
--- a/registryd/deviceeventcontroller-x11.c
+++ b/registryd/deviceeventcontroller-x11.c
@@ -49,8 +49,8 @@
#include "display.h"
#include "event-source.h"
-#include "deviceeventcontroller-x11.h"
#include "deviceeventcontroller.h"
+#include "deviceeventcontroller-x11.h"
#include "reentrant-list.h"
static void spi_dec_x11_emit_modifier_event (SpiDEController *controller,
diff --git a/registryd/deviceeventcontroller-x11.h b/registryd/deviceeventcontroller-x11.h
index 62e29843..e66799e4 100644
--- a/registryd/deviceeventcontroller-x11.h
+++ b/registryd/deviceeventcontroller-x11.h
@@ -25,4 +25,11 @@ typedef struct {
guint reserved_reset_timeout;
} SpiDEControllerPrivate;
+#ifdef HAVE_X11
+void spi_dec_setup_x11 (SpiDEControllerClass *klass);
+#endif
+
+long ucs2keysym (long ucs);
+long keysym2ucs(long keysym);
+
#endif /* _DEVICEEVENTCONTROLLER_X11_H_ */
diff --git a/registryd/deviceeventcontroller.h b/registryd/deviceeventcontroller.h
index db67791b..a080a13e 100644
--- a/registryd/deviceeventcontroller.h
+++ b/registryd/deviceeventcontroller.h
@@ -156,13 +156,6 @@ gboolean spi_dec_synth_keysym (SpiDEController *controller, long keysym);
void spi_dec_dbus_emit(SpiDEController *controller, const char *interface, const char *name, const char *minor, int a1, int a2);
-#ifdef HAVE_X11
-void spi_dec_setup_x11 (SpiDEControllerClass *klass);
-#endif
-
-long ucs2keysym (long ucs);
-long keysym2ucs(long keysym);
-
G_END_DECLS
#endif /* DEVICEEVENTCONTROLLER_H_ */