Commit 292c1d08 authored by Dorota Czaplejewicz's avatar Dorota Czaplejewicz

fixes: Minor type and include mismatches

parent be564476
...@@ -365,7 +365,7 @@ static void ...@@ -365,7 +365,7 @@ static void
eek_keyboard_finalize (GObject *object) eek_keyboard_finalize (GObject *object)
{ {
EekKeyboardPrivate *priv = EEK_KEYBOARD_GET_PRIVATE(object); EekKeyboardPrivate *priv = EEK_KEYBOARD_GET_PRIVATE(object);
gint i; guint i;
g_list_free (priv->pressed_keys); g_list_free (priv->pressed_keys);
g_list_free_full (priv->locked_keys, g_list_free_full (priv->locked_keys,
......
...@@ -121,7 +121,7 @@ int WaylandFakeKeyEvent( ...@@ -121,7 +121,7 @@ int WaylandFakeKeyEvent(
Bool is_press, Bool is_press,
unsigned long delay unsigned long delay
) { ) {
printf("Sending fake event %d press %d delay %d\n", keycode, is_press, delay); printf("Sending fake event %d press %d delay %ld\n", keycode, is_press, delay);
return 0; return 0;
} }
...@@ -132,12 +132,12 @@ send_fake_modifier_key_event (Client *client, ...@@ -132,12 +132,12 @@ send_fake_modifier_key_event (Client *client,
{ {
GdkDisplay *display = gdk_display_get_default (); GdkDisplay *display = gdk_display_get_default ();
Display *xdisplay = NULL; //GDK_DISPLAY_XDISPLAY (display); Display *xdisplay = NULL; //GDK_DISPLAY_XDISPLAY (display);
gint i; unsigned long i;
for (i = 0; i < G_N_ELEMENTS(client->modifier_keycodes); i++) { for (i = 0; i < G_N_ELEMENTS(client->modifier_keycodes); i++) {
if (modifiers & (1 << i)) { if (modifiers & (1 << i)) {
guint keycode = client->modifier_keycodes[i]; guint keycode = client->modifier_keycodes[i];
printf("Trying to send a modifier %d press %ld\n", i, is_pressed); printf("Trying to send a modifier %ld press %d\n", i, is_pressed);
g_return_if_fail (keycode > 0); g_return_if_fail (keycode > 0);
WaylandFakeKeyEvent (xdisplay, WaylandFakeKeyEvent (xdisplay,
...@@ -177,8 +177,8 @@ send_fake_key_event (Client *client, ...@@ -177,8 +177,8 @@ send_fake_key_event (Client *client,
} }
/* Clear level shift modifiers */ /* Clear level shift modifiers */
keyboard_modifiers &= ~EEK_SHIFT_MASK; keyboard_modifiers &= (unsigned)~EEK_SHIFT_MASK;
keyboard_modifiers &= ~EEK_LOCK_MASK; keyboard_modifiers &= (unsigned)~EEK_LOCK_MASK;
/* FIXME: may need to remap ISO_Level3_Shift and NumLock */ /* FIXME: may need to remap ISO_Level3_Shift and NumLock */
#if 0 #if 0
keyboard_modifiers &= ~EEK_MOD5_MASK; keyboard_modifiers &= ~EEK_MOD5_MASK;
......
...@@ -18,10 +18,10 @@ ...@@ -18,10 +18,10 @@
#ifndef SERVER_CONTEXT_SERVICE_H #ifndef SERVER_CONTEXT_SERVICE_H
#define SERVER_CONTEXT_SERVICE_H 1 #define SERVER_CONTEXT_SERVICE_H 1
G_BEGIN_DECLS
#include "eekboard/eekboard-service.h" #include "eekboard/eekboard-service.h"
G_BEGIN_DECLS
#define SERVER_TYPE_CONTEXT_SERVICE (server_context_service_get_type()) #define SERVER_TYPE_CONTEXT_SERVICE (server_context_service_get_type())
#define SERVER_CONTEXT_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SERVER_TYPE_CONTEXT_SERVICE, ServerContextService)) #define SERVER_CONTEXT_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SERVER_TYPE_CONTEXT_SERVICE, ServerContextService))
#define SERVER_CONTEXT_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SERVER_TYPE_CONTEXT_SERVICE, ServerContextServiceClass)) #define SERVER_CONTEXT_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SERVER_TYPE_CONTEXT_SERVICE, ServerContextServiceClass))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment