From 1bb2daff4235439520ef5bf820376d2bf1f6c916 Mon Sep 17 00:00:00 2001
From: ChunEon Park <hermet@hermet.pe.kr>
Date: Fri, 25 May 2012 10:15:27 +0000
Subject: [PATCH] ecore/ecore_x - Changed ecore_x_error_get() return type to
 Ecore_X_Error_Code from int

SVN revision: 71421
---
 legacy/ecore/ChangeLog                             | 6 +++++-
 legacy/ecore/src/lib/ecore_x/Ecore_X.h             | 8 +++++---
 legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_error.c | 2 +-
 legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c        | 2 +-
 legacy/ecore/src/lib/ecore_x/xlib/ecore_x_error.c  | 2 +-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/legacy/ecore/ChangeLog b/legacy/ecore/ChangeLog
index 482c0e728e..0869f30dd2 100644
--- a/legacy/ecore/ChangeLog
+++ b/legacy/ecore/ChangeLog
@@ -682,4 +682,8 @@
         timer around, quit mainloop, then start it again expecting the timer
         to keep ticking off. also happens to be an issuw with
         iterating the mainloop.
-        
+
+2012-05-25 ChunEon Park (Hermet)
+
+        * Changed ecore_x_error_get() return type to Ecore_X_Error_Code from
+        int 
diff --git a/legacy/ecore/src/lib/ecore_x/Ecore_X.h b/legacy/ecore/src/lib/ecore_x/Ecore_X.h
index 308bcc4186..1ca2020e17 100644
--- a/legacy/ecore/src/lib/ecore_x/Ecore_X.h
+++ b/legacy/ecore/src/lib/ecore_x/Ecore_X.h
@@ -1255,9 +1255,11 @@ EAPI void
 ecore_x_io_error_handler_set(void (*func)(void *data),
                              const void *data);
 EAPI int
- ecore_x_error_request_get(void);
-EAPI int
- ecore_x_error_code_get(void);
+ecore_x_error_request_get(void);
+
+EAPI Ecore_X_Error_Code
+ecore_x_error_code_get(void);
+
 EAPI Ecore_X_ID
 ecore_x_error_resource_id_get(void);
 
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_error.c b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_error.c
index fc329265d5..ef5d8244e7 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_error.c
+++ b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_error.c
@@ -58,7 +58,7 @@ ecore_x_error_request_get(void)
  *
  * Return the error code from the last X error
  */
-EAPI int
+EAPI Ecore_X_Error_Code
 ecore_x_error_code_get(void)
 {
    return _error_code;
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c
index 0a7b3c8b96..a47d4c011c 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c
@@ -1228,7 +1228,7 @@ static void
 _ecore_x_window_manage_error(void *data __UNUSED__)
 {
    if ((ecore_x_error_request_get() == X_ChangeWindowAttributes) &&
-       (ecore_x_error_code_get() == BadAccess))
+       (ecore_x_error_code_get() == ECORE_X_ERROR_CODE_BAD_ACCESS))
      _ecore_x_window_manage_failed = 1;
 }
 
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_error.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_error.c
index 11e9f20502..cc5a51540a 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_error.c
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_error.c
@@ -69,7 +69,7 @@ ecore_x_error_request_get(void)
  *
  * Return the error code from the last X error
  */
-EAPI int
+EAPI Ecore_X_Error_Code
 ecore_x_error_code_get(void)
 {
    return _error_code;