From: Daniel Otero <otero.o.daniel@gmail.com>
Date: Thu, 12 Feb 2015 10:12:38 +0000 (+0100)
Subject: Remove xkb_context initialization code from load_compose_table
X-Git-Tag: 2.7~11^2~2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=562e824246b9e81e65644660714db404035e693a;p=i3%2Fi3lock

Remove xkb_context initialization code from load_compose_table

xkb_context is guaranteed to be initializated from load_keymap.
---

diff --git a/i3lock.c b/i3lock.c
index 02e6794..b58297e 100644
--- a/i3lock.c
+++ b/i3lock.c
@@ -145,13 +145,6 @@ static bool load_keymap(void) {
  *
  */
 static bool load_compose_table(const char *locale) {
-    if (xkb_context == NULL) {
-        if ((xkb_context = xkb_context_new(0)) == NULL) {
-            fprintf(stderr, "[i3lock] could not create xkbcommon context\n");
-            return false;
-        }
-    }
-
     xkb_compose_table_unref(xkb_compose_table);
 
     if ((xkb_compose_table = xkb_compose_table_new_from_locale(xkb_context, locale, 0)) == NULL) {