[at-spi2-core] Fix ucs2keysym prototype
- From: Mike Gorse <mgorse src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [at-spi2-core] Fix ucs2keysym prototype
- Date: Sat, 7 Jun 2014 20:01:44 +0000 (UTC)
commit 7529a9d658512f7fcef4b8c5fe476eb35035d308
Author: Mike Gorse <mgorse suse com>
Date: Sat Jun 7 15:01:51 2014 -0500
Fix ucs2keysym prototype
https://bugzilla.gnome.org/show_bug.cgi?id=730897
registryd/deviceeventcontroller-x11.c | 5 +----
registryd/deviceeventcontroller.c | 3 ---
registryd/deviceeventcontroller.h | 4 ++++
registryd/ucs2keysym.c | 1 +
4 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/registryd/deviceeventcontroller-x11.c b/registryd/deviceeventcontroller-x11.c
index 2e26f17..d878d53 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 0a67af1..6d04a27 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 9efbee8..0c6eee4 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 2a637ec..b4967be 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;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]