Ranges of 0 width cannot intersect (Fixes bug #3717)

[chaz/openbox] / openbox / xerror.c

diff --git a/openbox/xerror.c b/openbox/xerror.c
index 25041fda3eb2b37ac4d5e8acd0ed8b91f9f85b4b..2657b8ea9c7f9d49a0f1a9a78e67a8d03e99cf63 100644 (file)
--- a/openbox/xerror.c
+++ b/openbox/xerror.c
@@ -1,7 +1,8 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    xerror.c for the Openbox window manager
-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2006        Mikael Magnusson
+   Copyright (c) 2003-2007   Dana Jansens
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,6 +18,9 @@
 */
 
 #include "openbox.h"
+#include "gettext.h"
+#include "debug.h"
+#include "xerror.h"
 #include <glib.h>
 #include <X11/Xlib.h>
 
@@ -25,23 +29,22 @@ gboolean xerror_occured = FALSE;
 
 gint xerror_handler(Display *d, XErrorEvent *e)
 {
-    xerror_occured = TRUE;
 #ifdef DEBUG
+    gchar errtxt[128];
+
+    XGetErrorText(d, e->error_code, errtxt, 127);
     if (!xerror_ignore) {
-        gchar errtxt[128];
-
-        /*if (e->error_code != BadWindow) */
-        {
-            XGetErrorText(d, e->error_code, errtxt, 127);
-            if (e->error_code == BadWindow)
-                /*g_warning("X Error: %s", errtxt)*/;
-            else
-                g_error("X Error: %s", errtxt);
-        }
-    }
+        if (e->error_code == BadWindow)
+            /*g_message(_("X Error: %s\n"), errtxt)*/;
+        else
+            g_error(_("X Error: %s"), errtxt);
+    } else
+        ob_debug("XError code %d '%s'\n", e->error_code, errtxt);
 #else
     (void)d; (void)e;
 #endif
+
+    xerror_occured = TRUE;
     return 0;
 }