[EGIT] [e16/e16] master 08/11: Tweak error handler API.

[Kim Woelders]

kwo pushed a commit to branch master.

http://git.enlightenment.org/e16/e16.git/commit/?id=9cc77c09c38878fff91f193faa70da6d8e0afb91

commit 9cc77c09c38878fff91f193faa70da6d8e0afb91
Author: Kim Woelders <k...@woelders.dk>
Date:   Sat Dec 28 21:57:54 2013 +0100

    Tweak error handler API.
---
 src/events.c | 8 ++++----
 src/events.h | 2 +-
 src/x.c      | 2 +-
 src/xwin.h   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/events.c b/src/events.c
index b89201b..b7a104c 100644
--- a/src/events.c
+++ b/src/events.c
@@ -380,9 +380,9 @@ EventsGetExtensionName(int req)
 }
 
 void
-EventShowError(const XErrorEvent * ev)
+EventShowError(const XEvent * evp)
 {
-   Display            *dpy = disp;
+   const XErrorEvent  *ev = &evp->xerror;
    char                buf[64], buf1[64];
 
    if (ev->request_code < 128)
@@ -390,8 +390,8 @@ EventShowError(const XErrorEvent * ev)
    else
       Esnprintf(buf, sizeof(buf), "%s.%d",
                EventsGetExtensionName(ev->request_code), ev->minor_code);
-   XGetErrorDatabaseText(dpy, "XRequest", buf, "", buf1, sizeof(buf1));
-   XGetErrorText(dpy, ev->error_code, buf, sizeof(buf));
+   XGetErrorDatabaseText(disp, "XRequest", buf, "", buf1, sizeof(buf1));
+   XGetErrorText(disp, ev->error_code, buf, sizeof(buf));
    Eprintf("*** ERROR: xid=%#lx req=%i/%i err=%i: %s: %s\n",
           ev->resourceid, ev->request_code, ev->minor_code,
           ev->error_code, buf1, buf);
diff --git a/src/events.h b/src/events.h
index 78bf660..f484db2 100644
--- a/src/events.h
+++ b/src/events.h
@@ -41,7 +41,7 @@
 void                EventsInit(void);
 void                EventsMain(void);
 void                EventShow(const XEvent * ev);
-void                EventShowError(const XErrorEvent * ev);
+void                EventShowError(const XEvent * ev);
 
 typedef struct _EventFdDesc EventFdDesc;
 typedef void        (EventFdHandler) (void);
diff --git a/src/x.c b/src/x.c
index f48a4ef..6635a44 100644
--- a/src/x.c
+++ b/src/x.c
@@ -1794,7 +1794,7 @@ static int
 _HandleXError(Display * dpy __UNUSED__, XErrorEvent * ev)
 {
    if (EDebug(1) && EXErrorFunc)
-      EXErrorFunc(ev);
+      EXErrorFunc((XEvent *) ev);
 
    Dpy.last_error_code = ev->error_code;
 
diff --git a/src/xwin.h b/src/xwin.h
index 38606e6..f6f5bef 100644
--- a/src/xwin.h
+++ b/src/xwin.h
@@ -54,7 +54,7 @@ int                 EDisplayOpen(const char *dstr, int scr);
 void                EDisplayClose(void);
 void                EDisplayDisconnect(void);
 
-typedef void        (EXErrorHandler) (const XErrorEvent *);
+typedef void        (EXErrorHandler) (const XEvent *);
 typedef void        (EXIOErrorHandler) (void);
 void                EDisplaySetErrorHandlers(EXErrorHandler * error,
                                             EXIOErrorHandler * fatal);

--