X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=obt%2Fdisplay.c;h=37b1215737bf1117e3dc95dcd7839a65d76bcb01;hb=262591ec1adc1badfcb36e9e6876dd81f2df9492;hp=d72f8ad6d5fc18756d73d56115a583a41591f5ae;hpb=f6193ad9e048c5824142d3e7feeb109f91054052;p=chaz%2Fopenbox

diff --git a/obt/display.c b/obt/display.c
index d72f8ad6..37b12157 100644
--- a/obt/display.c
+++ b/obt/display.c
@@ -58,8 +58,8 @@ gboolean obt_display_open(const char *display_name)
     n = display_name ? g_strdup(display_name) : NULL;
     obt_display = d = XOpenDisplay(n);
     if (d) {
-        gint junk;
-        (void)junk;
+        gint junk, major, minor;
+        (void)junk, (void)major, (void)minor;
 
         if (fcntl(ConnectionNumber(d), F_SETFD, 1) == -1)
             g_message("Failed to set display as close-on-exec");
@@ -67,12 +67,14 @@ gboolean obt_display_open(const char *display_name)
 
         /* read what extensions are present */
 #ifdef XKB
+        major = XkbMajorVersion;
+        minor = XkbMinorVersion;
         obt_display_extension_xkb =
             XkbQueryExtension(d, &junk,
                               &obt_display_extension_xkb_basep, &junk,
-                              NULL, NULL);
+                              &major, &minor);
         if (!obt_display_extension_xkb)
-            g_message("XKB extension is not present on the server");
+            g_message("XKB extension is not present on the server or too old");
 #endif
 
 #ifdef SHAPE
@@ -117,7 +119,7 @@ gboolean obt_display_open(const char *display_name)
     return obt_display != NULL;
 }
 
-void obt_display_close()
+void obt_display_close(void)
 {
     obt_keyboard_shutdown();
     if (obt_display) XCloseDisplay(obt_display);
@@ -131,11 +133,11 @@ static gint xerror_handler(Display *d, XErrorEvent *e)
     XGetErrorText(d, e->error_code, errtxt, 127);
     if (!xerror_ignore) {
         if (e->error_code == BadWindow)
-            /*g_message(_("X Error: %s\n"), errtxt)*/;
+            /*g_debug(_("X Error: %s\n"), errtxt)*/;
         else
             g_error("X Error: %s", errtxt);
     } else
-        g_message("Ignoring XError code %d '%s'", e->error_code, errtxt);
+        g_debug("Ignoring XError code %d '%s'", e->error_code, errtxt);
 #else
     (void)d; (void)e;
 #endif