X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fxerror.c;h=2657b8ea9c7f9d49a0f1a9a78e67a8d03e99cf63;hb=c38a756ae50616b1431e3137141189a5588654a0;hp=239a8ccbc98b07df9941b50c22edf92f2d3ccb40;hpb=f154f7b548e1c3ec668d07940905b37a4938bb09;p=chaz%2Fopenbox

diff --git a/openbox/xerror.c b/openbox/xerror.c
index 239a8ccb..2657b8ea 100644
--- a/openbox/xerror.c
+++ b/openbox/xerror.c
@@ -1,29 +1,50 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   xerror.c for the Openbox window manager
+   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
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #include "openbox.h"
+#include "gettext.h"
+#include "debug.h"
+#include "xerror.h"
 #include <glib.h>
 #include <X11/Xlib.h>
 
 static gboolean xerror_ignore = FALSE;
 gboolean xerror_occured = FALSE;
 
-int xerror_handler(Display *d, XErrorEvent *e)
+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) {
-	char 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;
 }