From 22daefba3a3f7ffe6956d1126bcffbcfdaf6d49e Mon Sep 17 00:00:00 2001
From: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>
Date: Tue, 25 Feb 2020 15:46:58 +0000
Subject: [PATCH] levelkeyboard: Rearrange to make future conversion easier

---
 eek/eek-keyboard.c                  | 4 +---
 eek/eek-keyboard.h                  | 3 +--
 eekboard/eekboard-context-service.c | 3 ++-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/eek/eek-keyboard.c b/eek/eek-keyboard.c
index 24ef537b..292a0879 100644
--- a/eek/eek-keyboard.c
+++ b/eek/eek-keyboard.c
@@ -38,10 +38,8 @@ void level_keyboard_free(LevelKeyboard *self) {
 }
 
 LevelKeyboard*
-level_keyboard_new (const gchar            *keyboard_type,
-                    enum squeek_arrangement_kind t)
+level_keyboard_new (struct squeek_layout *layout)
 {
-    struct squeek_layout *layout = squeek_load_layout(keyboard_type, t);
     LevelKeyboard *keyboard = g_new0(LevelKeyboard, 1);
 
     if (!keyboard) {
diff --git a/eek/eek-keyboard.h b/eek/eek-keyboard.h
index fab549e1..b1377c47 100644
--- a/eek/eek-keyboard.h
+++ b/eek/eek-keyboard.h
@@ -47,8 +47,7 @@ gchar *             eek_keyboard_get_keymap
                                      (LevelKeyboard *keyboard);
 
 LevelKeyboard*
-level_keyboard_new (const gchar            *keyboard_type,
-                    enum squeek_arrangement_kind t);
+level_keyboard_new (struct squeek_layout *layout);
 void level_keyboard_free(LevelKeyboard *self);
 
 G_END_DECLS
diff --git a/eekboard/eekboard-context-service.c b/eekboard/eekboard-context-service.c
index 46ef548a..4a91be0e 100644
--- a/eekboard/eekboard-context-service.c
+++ b/eekboard/eekboard-context-service.c
@@ -139,7 +139,8 @@ eekboard_context_service_use_layout(EekboardContextService *context, struct sque
     }
 
     // generic part follows
-    LevelKeyboard *keyboard = level_keyboard_new(layout_name, state->arrangement);
+    struct squeek_layout *layout = squeek_load_layout(layout_name, state->arrangement);
+    LevelKeyboard *keyboard = level_keyboard_new(layout);
     // set as current
     LevelKeyboard *previous_keyboard = context->priv->keyboard;
     context->priv->keyboard = keyboard;