center the text and icon vertically

[chaz/openbox] / openbox / xerror.c

diff --git a/openbox/xerror.c b/openbox/xerror.c
index 3f112505c953fd267aa4a079ef30bc071ec32e2a..3de593b8f6765e11bb7a49a8258fa06c2729496d 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,27 +18,25 @@
 */
 
 #include "openbox.h"
+#include "gettext.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
     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);
-        }
+        gchar errtxt[128];
+
+        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;