ecore - revert 71421 cause of posibility of abi break

thanks Vincent.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@71485 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/ChangeLog b/ChangeLog
index 795aa06..8fd05a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -683,11 +683,6 @@
         to keep ticking off. also happens to be an issue with
         iterating the mainloop.
 
-2012-05-25 ChunEon Park (Hermet)
-
-        * Changed ecore_x_error_get() return type to Ecore_X_Error_Code from
-        int 
-
 2012-05-25 Rob Bradford
 
         * Make ecore_{software_x11, software_x11_8, software_x11_16, wayland,

diff --git a/src/lib/ecore_x/Ecore_X.h b/src/lib/ecore_x/Ecore_X.h
index 1ca2020..308bcc4 100644 (file)
--- a/src/lib/ecore_x/Ecore_X.h
+++ b/src/lib/ecore_x/Ecore_X.h
@@ -1255,11 +1255,9 @@ EAPI void
 ecore_x_io_error_handler_set(void (*func)(void *data),
                              const void *data);
 EAPI int
-ecore_x_error_request_get(void);
-
-EAPI Ecore_X_Error_Code
-ecore_x_error_code_get(void);
-
+ ecore_x_error_request_get(void);
+EAPI int
+ ecore_x_error_code_get(void);
 EAPI Ecore_X_ID
 ecore_x_error_resource_id_get(void);
 

diff --git a/src/lib/ecore_x/xcb/ecore_xcb_error.c b/src/lib/ecore_x/xcb/ecore_xcb_error.c
index ef5d824..fc32926 100644 (file)
--- a/src/lib/ecore_x/xcb/ecore_xcb_error.c
+++ b/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 Ecore_X_Error_Code
+EAPI int
 ecore_x_error_code_get(void)
 {
    return _error_code;

diff --git a/src/lib/ecore_x/xlib/ecore_x.c b/src/lib/ecore_x/xlib/ecore_x.c
index af66472..96e49f1 100644 (file)
--- a/src/lib/ecore_x/xlib/ecore_x.c
+++ b/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() == ECORE_X_ERROR_CODE_BAD_ACCESS))
+       (ecore_x_error_code_get() == BadAccess))
      _ecore_x_window_manage_failed = 1;
 }
 

diff --git a/src/lib/ecore_x/xlib/ecore_x_error.c b/src/lib/ecore_x/xlib/ecore_x_error.c
index cc5a515..11e9f20 100644 (file)
--- a/src/lib/ecore_x/xlib/ecore_x_error.c
+++ b/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 Ecore_X_Error_Code
+EAPI int
 ecore_x_error_code_get(void)
 {
    return _error_code;