Merge branch 'backport' into work

[chaz/openbox] / obt / display.c

diff --git a/obt/display.c b/obt/display.c
index 6993addb1d449c65d3c11cd66a4a0cf01f315ebe..72c1b4d64f93d27f64511b2d29ae117afa04362d 100644 (file)
--- a/obt/display.c
+++ b/obt/display.c
@@ -18,6 +18,8 @@
 
 #include "obt/display.h"
 #include "obt/prop.h"
+#include "obt/internal.h"
+#include "obt/keyboard.h"
 
 #ifdef HAVE_STRING_H
 #  include <string.h>
@@ -108,14 +110,16 @@ gboolean obt_display_open(const char *display_name)
 #endif
 
         obt_prop_startup();
+        obt_keyboard_reload();
     }
     g_free(n);
 
     return obt_display != NULL;
 }
 
-void obt_display_close()
+void obt_display_close(void)
 {
+    obt_keyboard_shutdown();
     if (obt_display) XCloseDisplay(obt_display);
 }
 
@@ -131,7 +135,7 @@ static gint xerror_handler(Display *d, XErrorEvent *e)
         else
             g_error("X Error: %s", errtxt);
     } else
-        g_message("XError code %d '%s'", e->error_code, errtxt);
+        g_message("Ignoring XError code %d '%s'", e->error_code, errtxt);
 #else
     (void)d; (void)e;
 #endif