From: Enlightenment S. <no-...@en...> - 2011-03-22 21:25:00
|
Log: play nice with eina 1.0 Author: discomfitor Date: 2011-03-22 14:24:54 -0700 (Tue, 22 Mar 2011) New Revision: 57999 Trac: http://trac.enlightenment.org/e/changeset/57999 Modified: trunk/PROTO/azy/src/lib/azy_content_json.c trunk/PROTO/azy/src/lib/azy_content_xml.cpp Modified: trunk/PROTO/azy/src/lib/azy_content_json.c =================================================================== --- trunk/PROTO/azy/src/lib/azy_content_json.c 2011-03-22 19:46:28 UTC (rev 57998) +++ trunk/PROTO/azy/src/lib/azy_content_json.c 2011-03-22 21:24:54 UTC (rev 57999) @@ -344,16 +344,16 @@ if (msg) { +#if defined(eina_error_find) Eina_Error e; e = eina_error_find(msg); if (e) azy_content_error_faultcode_set(content, e, code); else +#endif azy_content_error_faultmsg_set(content, code, "%s", msg); } - else if (code && msg) - azy_content_error_faultmsg_set(content, code, "%s", msg); else azy_content_error_code_set(content, AZY_ERROR_RESPONSE_JSON_ERROR); Modified: trunk/PROTO/azy/src/lib/azy_content_xml.cpp =================================================================== --- trunk/PROTO/azy/src/lib/azy_content_xml.cpp 2011-03-22 19:46:28 UTC (rev 57998) +++ trunk/PROTO/azy/src/lib/azy_content_xml.cpp 2011-03-22 21:24:54 UTC (rev 57999) @@ -477,11 +477,14 @@ if (s) { +#if defined(eina_error_find) Eina_Error e; e = eina_error_find(s); if (e) azy_content_error_faultcode_set(content, e, c); - else azy_content_error_faultmsg_set(content, c, "%s", s); + else +#endif + azy_content_error_faultmsg_set(content, c, "%s", s); } else azy_content_error_faultmsg_set(content, c, "%s", ""); |