diff options
| author | Mike Gorse <mgorse@suse.com> | 2014-06-07 15:01:51 -0500 |
|---|---|---|
| committer | Mike Gorse <mgorse@suse.com> | 2014-06-07 15:01:51 -0500 |
| commit | 7529a9d658512f7fcef4b8c5fe476eb35035d308 (patch) | |
| tree | e1a78e9c9970e8a1a1ecc251e13666a1b1a19c60 | |
| parent | 09854f7a6d7f7b89f415e5f6ffb8beeb70ce1af4 (diff) | |
| download | at-spi2-core-7529a9d658512f7fcef4b8c5fe476eb35035d308.tar.gz | |
Fix ucs2keysym prototype
https://bugzilla.gnome.org/show_bug.cgi?id=730897
| -rw-r--r-- | registryd/deviceeventcontroller-x11.c | 5 | ||||
| -rw-r--r-- | registryd/deviceeventcontroller.c | 3 | ||||
| -rw-r--r-- | registryd/deviceeventcontroller.h | 4 | ||||
| -rw-r--r-- | registryd/ucs2keysym.c | 1 |
4 files changed, 6 insertions, 7 deletions
diff --git a/registryd/deviceeventcontroller-x11.c b/registryd/deviceeventcontroller-x11.c index 2e26f175..d878d534 100644 --- a/registryd/deviceeventcontroller-x11.c +++ b/registryd/deviceeventcontroller-x11.c @@ -65,9 +65,6 @@ #include "introspection.h" -KeySym ucs2keysym (long ucs); -long keysym2ucs(KeySym keysym); - static void spi_dec_x11_emit_modifier_event (SpiDEController *controller, guint prev_mask, guint current_mask); @@ -1149,7 +1146,7 @@ spi_dec_x11_unlock_modifiers (SpiDEController *controller, unsigned modifiers) static KeySym keysym_for_unichar (SpiDEController *controller, gunichar unichar) { - return ucs2keysym ((long) unichar); + return (KeySym) ucs2keysym ((long) unichar); } static gboolean diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c index 0a67af1e..6d04a275 100644 --- a/registryd/deviceeventcontroller.c +++ b/registryd/deviceeventcontroller.c @@ -50,9 +50,6 @@ #include "introspection.h" -long ucs2keysym (long ucs); -long keysym2ucs(long keysym); - #define CHECK_RELEASE_DELAY 20 #define BIT(c, x) (c[x/8]&(1<<(x%8))) static SpiDEController *saved_controller; diff --git a/registryd/deviceeventcontroller.h b/registryd/deviceeventcontroller.h index 9efbee83..0c6eee43 100644 --- a/registryd/deviceeventcontroller.h +++ b/registryd/deviceeventcontroller.h @@ -170,6 +170,10 @@ void spi_dec_dbus_emit(SpiDEController *controller, const char *interface, const #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_ */ diff --git a/registryd/ucs2keysym.c b/registryd/ucs2keysym.c index 2a637ecd..b4967bef 100644 --- a/registryd/ucs2keysym.c +++ b/registryd/ucs2keysym.c @@ -32,6 +32,7 @@ */ #include <X11/X.h> +#include "deviceeventcontroller.h" /* for prototype */ struct codepair { unsigned short keysym; |