X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fxerror.c;h=3de593b8f6765e11bb7a49a8258fa06c2729496d;hb=96fbc0c6229ff2f13a102da603339472c176bc0b;hp=25041fda3eb2b37ac4d5e8acd0ed8b91f9f85b4b;hpb=335e8acbfc5d2824f1fd2cb67a5add8e1ed40b06;p=chaz%2Fopenbox

diff --git a/openbox/xerror.c b/openbox/xerror.c
index 25041fda..3de593b8 100644
--- 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,7 @@
 */
 
 #include "openbox.h"
+#include "gettext.h"
 #include <glib.h>
 #include <X11/Xlib.h>
 
@@ -30,14 +32,11 @@ gint xerror_handler(Display *d, XErrorEvent *e)
     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);
-        }
+        XGetErrorText(d, e->error_code, errtxt, 127);
+        if (e->error_code == BadWindow)
+            /*g_message(_("X Error: %s\n"), errtxt)*/;
+        else
+            g_error(_("X Error: %s"), errtxt);
     }
 #else
     (void)d; (void)e;