From 02525056d6086e911e8fe717d81541501a35148a Mon Sep 17 00:00:00 2001
From: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>
Date: Sat, 22 Jun 2019 16:15:31 +0000
Subject: [PATCH] Removed X11 header, added some clarifications

---
 eek/eek-xkb-layout.c                | 4 ++--
 eek/eek-xkb-layout.h                | 1 -
 eekboard/eekboard-context-service.h | 2 ++
 src/server-context-service.c        | 1 -
 src/server-context-service.h        | 1 +
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/eek/eek-xkb-layout.c b/eek/eek-xkb-layout.c
index c0fffef0..2ad5d49e 100644
--- a/eek/eek-xkb-layout.c
+++ b/eek/eek-xkb-layout.c
@@ -31,14 +31,14 @@
 #include "config.h"
 #endif  /* HAVE_CONFIG_H */
 
+#include "eek-xkb-layout.h"
+
 #include <X11/keysym.h>
-#include <X11/XKBlib.h>
 #include <X11/extensions/XKBgeom.h>
 #include <string.h>
 #include <stdarg.h>
 #include <gio/gio.h>
 
-#include "eek-xkb-layout.h"
 #include "eek-keyboard.h"
 #include "eek-section.h"
 #include "eek-key.h"
diff --git a/eek/eek-xkb-layout.h b/eek/eek-xkb-layout.h
index 81bfc9ae..f715fb72 100644
--- a/eek/eek-xkb-layout.h
+++ b/eek/eek-xkb-layout.h
@@ -25,7 +25,6 @@
 #ifndef EEK_XKB_LAYOUT_H
 #define EEK_XKB_LAYOUT_H 1
 
-#include <X11/Xlib.h>
 #include <X11/XKBlib.h>
 #include "eek-layout.h"
 
diff --git a/eekboard/eekboard-context-service.h b/eekboard/eekboard-context-service.h
index 136d827e..50ade0b1 100644
--- a/eekboard/eekboard-context-service.h
+++ b/eekboard/eekboard-context-service.h
@@ -43,6 +43,8 @@ typedef struct _EekboardContextServicePrivate EekboardContextServicePrivate;
 /**
  * EekboardContextService:
  *
+ * TODO: Restrict to managing keyboard layouts, and maybe button rerpeats.
+ *
  * The #EekboardContextService structure contains only private data
  * and should only be accessed using the provided API.
  */
diff --git a/src/server-context-service.c b/src/server-context-service.c
index 10c13c57..e7619127 100644
--- a/src/server-context-service.c
+++ b/src/server-context-service.c
@@ -22,7 +22,6 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include <X11/Xatom.h>
 #include <gdk/gdkx.h>
 
 #include "eek/eek-gtk.h"
diff --git a/src/server-context-service.h b/src/server-context-service.h
index 51105cf5..49745dc1 100644
--- a/src/server-context-service.h
+++ b/src/server-context-service.h
@@ -29,6 +29,7 @@ G_BEGIN_DECLS
 #define SERVER_IS_CONTEXT_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SERVER_TYPE_CONTEXT_SERVICE))
 #define SERVER_CONTEXT_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SERVER_TYPE_CONTEXT_SERVICE, ServerContextServiceClass))
 
+/** Manages the liecycle of the window displaying layouts. */
 typedef struct _ServerContextService ServerContextService;
 
 ServerContextService *server_context_service_new ();