From 292c1d08d804684377a073849a72a20fa5d58f31 Mon Sep 17 00:00:00 2001
From: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>
Date: Sun, 16 Jun 2019 12:55:50 +0000
Subject: [PATCH] fixes: Minor type and include mismatches

---
 eek/eek-keyboard.c           |  2 +-
 eekboard/key-emitter.c       | 10 +++++-----
 src/server-context-service.h |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/eek/eek-keyboard.c b/eek/eek-keyboard.c
index b325defd..48a548a2 100644
--- a/eek/eek-keyboard.c
+++ b/eek/eek-keyboard.c
@@ -365,7 +365,7 @@ static void
 eek_keyboard_finalize (GObject *object)
 {
     EekKeyboardPrivate *priv = EEK_KEYBOARD_GET_PRIVATE(object);
-    gint i;
+    guint i;
 
     g_list_free (priv->pressed_keys);
     g_list_free_full (priv->locked_keys,
diff --git a/eekboard/key-emitter.c b/eekboard/key-emitter.c
index f470de45..2e10096b 100644
--- a/eekboard/key-emitter.c
+++ b/eekboard/key-emitter.c
@@ -121,7 +121,7 @@ int WaylandFakeKeyEvent(
     Bool is_press,
     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;
 }
 
@@ -132,12 +132,12 @@ send_fake_modifier_key_event (Client         *client,
 {
     GdkDisplay *display = gdk_display_get_default ();
     Display *xdisplay = NULL; //GDK_DISPLAY_XDISPLAY (display);
-    gint i;
+    unsigned long i;
 
     for (i = 0; i < G_N_ELEMENTS(client->modifier_keycodes); i++) {
         if (modifiers & (1 << 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);
 
             WaylandFakeKeyEvent (xdisplay,
@@ -177,8 +177,8 @@ send_fake_key_event (Client  *client,
     }
 
     /* Clear level shift modifiers */
-    keyboard_modifiers &= ~EEK_SHIFT_MASK;
-    keyboard_modifiers &= ~EEK_LOCK_MASK;
+    keyboard_modifiers &= (unsigned)~EEK_SHIFT_MASK;
+    keyboard_modifiers &= (unsigned)~EEK_LOCK_MASK;
     /* FIXME: may need to remap ISO_Level3_Shift and NumLock */
 #if 0
     keyboard_modifiers &= ~EEK_MOD5_MASK;
diff --git a/src/server-context-service.h b/src/server-context-service.h
index 34fc6004..01114720 100644
--- a/src/server-context-service.h
+++ b/src/server-context-service.h
@@ -18,10 +18,10 @@
 #ifndef SERVER_CONTEXT_SERVICE_H
 #define SERVER_CONTEXT_SERVICE_H 1
 
-G_BEGIN_DECLS
-
 #include "eekboard/eekboard-service.h"
 
+G_BEGIN_DECLS
+
 #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_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SERVER_TYPE_CONTEXT_SERVICE, ServerContextServiceClass))