Fixed the define

diff --git a/include/email.h b/include/email.h
index 52a84c718969000e96815b89a8dbcdd61e5dc28b..96d35a32dcb0ae929c69cdfd4e7d791067062423 100755 (executable)
--- a/include/email.h
+++ b/include/email.h
@@ -48,7 +48,7 @@ extern "C"
  * @return  0 on success, otherwise a negative error value.
  * @retval     #EMAIL_ERROR_NONE Successful
  * @retval     #EMAIL_ERROR_OUT_OF_MEMORY Out of memory
  * @return  0 on success, otherwise a negative error value.
  * @retval     #EMAIL_ERROR_NONE Successful
  * @retval     #EMAIL_ERROR_OUT_OF_MEMORY Out of memory

- * @retval     #EMAIL_ERROR_ACCOUNT_NOT_FOUND           Email account not found 
+ * @retval     #EMAIL_ERROR_ACCOUNT_NOT_FOUND           Email account not found

  *
  * @see email_destroy_message()
  */
  *
  * @see email_destroy_message()
  */

diff --git a/include/email_error.h b/include/email_error.h
index e7d4e5e2ba98ef230378d06e43a77a47ca8f1ebc..157886d4d55cf70ab06a471a696c193f21ae853d 100755 (executable)
--- a/include/email_error.h
+++ b/include/email_error.h
@@ -41,15 +41,15 @@ extern "C"
  */
 typedef enum
 {
  */
 typedef enum
 {

-       EMAIL_ERROR_NONE                    = TIZEN_ERROR_NONE,                       /**< Successful */
-       EMAIL_ERROR_OUT_OF_MEMORY           = TIZEN_ERROR_OUT_OF_MEMORY,                  /**< Memory cannot be allocated */
-       EMAIL_ERROR_INVALID_PARAMETER    = TIZEN_ERROR_INVALID_PARAMETER,                 /**< Invalid parameter */
+       EMAIL_ERROR_NONE                              = TIZEN_ERROR_NONE,                   /**< Successful */
+       EMAIL_ERROR_OUT_OF_MEMORY                     = TIZEN_ERROR_OUT_OF_MEMORY,          /**< Memory cannot be allocated */
+       EMAIL_ERROR_INVALID_PARAMETER                 = TIZEN_ERROR_INVALID_PARAMETER,      /**< Invalid parameter */

 
 

-       EMAIL_ERROR_SERVER_NOT_READY  = TIZEN_ERROR_MESSAGING_CLASS|0x200,                  /**< Server not ready */
+       EMAIL_ERROR_SERVER_NOT_READY                  = TIZEN_ERROR_MESSAGING_CLASS|0x200,  /**< Server not ready */

        EMAIL_ERROR_COMMUNICATION_WITH_SERVER_FAILED  = TIZEN_ERROR_MESSAGING_CLASS|0x201,  /**< Communication with server failed */
        EMAIL_ERROR_COMMUNICATION_WITH_SERVER_FAILED  = TIZEN_ERROR_MESSAGING_CLASS|0x201,  /**< Communication with server failed */

-       EMAIL_ERROR_OPERATION_FAILED = TIZEN_ERROR_MESSAGING_CLASS|0x202,  /**< Operation failed */
-       EMAIL_ERROR_ACCOUNT_NOT_FOUND     = TIZEN_ERROR_MESSAGING_CLASS|0x203,  /**< Email account not found */
-       EMAIL_ERROR_DB_FAILED     = TIZEN_ERROR_MESSAGING_CLASS|0x204,          /**< Email database failed */
+       EMAIL_ERROR_OPERATION_FAILED                  = TIZEN_ERROR_MESSAGING_CLASS|0x202,  /**< Operation failed */
+       EMAIL_ERROR_ACCOUNT_NOT_FOUND                 = TIZEN_ERROR_MESSAGING_CLASS|0x203,  /**< Email account not found */
+       EMAIL_ERROR_DB_FAILED                         = TIZEN_ERROR_MESSAGING_CLASS|0x204,  /**< Email database failed */

 } email_error_e;
 
 /**
 } email_error_e;
 
 /**

diff --git a/packaging/capi-messaging-email.spec b/packaging/capi-messaging-email.spec
index 6acca5b5e9a1690fdea8eccbaa3a82cd45feb8eb..b42dce05a7b20d6a27392d8f276f7dc3972cfa56 100755 (executable)
--- a/packaging/capi-messaging-email.spec
+++ b/packaging/capi-messaging-email.spec
@@ -1,6 +1,6 @@
 Name:       capi-messaging-email
 Summary:    Email library in Tizen Native API
 Name:       capi-messaging-email
 Summary:    Email library in Tizen Native API

-Version:    0.1.5
+Version:    0.1.6

 Release:    3
 Group:      TO_BE/FILLED_IN
 License:    TO BE FILLED IN
 Release:    3
 Group:      TO_BE/FILLED_IN
 License:    TO BE FILLED IN

diff --git a/src/email.c b/src/email.c
index 6ac7e96080252db2da59f2b69f797f158831586c..e879ce8ac79811540cdab9d768e716d0ea4b2802 100755 (executable)
--- a/src/email.c
+++ b/src/email.c
@@ -25,15 +25,13 @@
 #include <email-api-init.h>
 #include <email-api.h>
 
 #include <email-api-init.h>
 #include <email-api.h>
 

-#define EMAIL_API_ERROR_NONE               EMAIL_ERROR_NONE
-#define EMAIL_API_ERROR_OUT_OF_MEMORY      EMAIL_ERROR_OUT_OF_MEMORY
-#define EMAIL_API_ERROR_ACCOUNT_NOT_FOUND  EMAIL_ERROR_ACCOUNT_NOT_FOUND
-#define EMAIL_API_ERROR_OUT_OF_MEMORY      EMAIL_ERROR_OUT_OF_MEMORY
+#define EMAIL_API_ERROR_NONE                   1
+#define EMAIL_API_ERROR_OUT_OF_MEMORY          -1028
+#define EMAIL_API_ERROR_ACCOUNT_NOT_FOUND      -1014

 
 #undef EMAIL_ERROR_NONE
 #undef EMAIL_ERROR_OUT_OF_MEMORY
 #undef EMAIL_ERROR_ACCOUNT_NOT_FOUND
 
 #undef EMAIL_ERROR_NONE
 #undef EMAIL_ERROR_OUT_OF_MEMORY
 #undef EMAIL_ERROR_ACCOUNT_NOT_FOUND

-#undef EMAIL_ERROR_OUT_OF_MEMORY

 
 #include<email.h>
 #include<email_private.h>
 
 #include<email.h>
 #include<email_private.h>


@@ -113,7 +111,7 @@ int email_create_message(email_h *msg)
        //return error from F/W 
        //EMAIL_ERROR_INVALID_PARAM/EMAIL_API_ERROR_NONE/EMAIL_ERROR_DB_FAILURE/EMAIL_ERROR_ACCOUNT_NOT_FOUND/EMAIL_ERROR_OUT_OF_MEMORY
        int default_account_id = 0;
        //return error from F/W 
        //EMAIL_ERROR_INVALID_PARAM/EMAIL_API_ERROR_NONE/EMAIL_ERROR_DB_FAILURE/EMAIL_ERROR_ACCOUNT_NOT_FOUND/EMAIL_ERROR_OUT_OF_MEMORY
        int default_account_id = 0;

-       if ((ret = email_load_default_account_id(&default_account_id)) != EMAIL_ERROR_NONE) {
+       if ((ret = email_load_default_account_id(&default_account_id)) != EMAIL_API_ERROR_NONE) {

                LOGE("[%s] email_load_default_account_id failed : [%d]",__FUNCTION__, ret);
                return CONVERT_ERROR(ret);
        }
                LOGE("[%s] email_load_default_account_id failed : [%d]",__FUNCTION__, ret);
                return CONVERT_ERROR(ret);
        }


@@ -678,36 +676,36 @@ int _email_error_converter(int err, const char *func, int line)
 {
        switch(err) 
        {
 {
        switch(err) 
        {

-               case EMAIL_ERROR_INVALID_PARAM:
+               case EMAIL_ERROR_INVALID_PARAM :

                        LOGE("[%s:%d] INVALID_PARAM(0x%08x) : Error from Email F/W. ret: (0x%08x) ", func, line, EMAIL_ERROR_INVALID_PARAMETER, err);
                        return EMAIL_ERROR_INVALID_PARAMETER;
 
                        LOGE("[%s:%d] INVALID_PARAM(0x%08x) : Error from Email F/W. ret: (0x%08x) ", func, line, EMAIL_ERROR_INVALID_PARAMETER, err);
                        return EMAIL_ERROR_INVALID_PARAMETER;
 

-               case EMAIL_ERROR_DB_FAILURE:
+               case EMAIL_ERROR_DB_FAILURE :

                        LOGE("[%s:%d] DB_FAILURE(0x%08x) : Error from Email F/W. ret: (0x%08x) ", func, line, EMAIL_ERROR_DB_FAILED, err);
                        return EMAIL_ERROR_DB_FAILED;
 
                        LOGE("[%s:%d] DB_FAILURE(0x%08x) : Error from Email F/W. ret: (0x%08x) ", func, line, EMAIL_ERROR_DB_FAILED, err);
                        return EMAIL_ERROR_DB_FAILED;
 

-               case EMAIL_API_ERROR_ACCOUNT_NOT_FOUND:
+               case EMAIL_API_ERROR_ACCOUNT_NOT_FOUND :

                        LOGE("[%s:%d] ACCOUNT_NOT_FOUND(0x%08x) : Error from Email F/W. ret: (0x%08x) ", func, line, EMAIL_ERROR_ACCOUNT_NOT_FOUND,err);
                        return EMAIL_ERROR_ACCOUNT_NOT_FOUND;
 
                        LOGE("[%s:%d] ACCOUNT_NOT_FOUND(0x%08x) : Error from Email F/W. ret: (0x%08x) ", func, line, EMAIL_ERROR_ACCOUNT_NOT_FOUND,err);
                        return EMAIL_ERROR_ACCOUNT_NOT_FOUND;
 

-               case EMAIL_API_ERROR_OUT_OF_MEMORY:
+               case EMAIL_API_ERROR_OUT_OF_MEMORY :

                        LOGE("[%s:%d] OUT_OF_MEMORY(0x%08x) : Error from Email F/W. ret: (0x%08x) ", func, line, EMAIL_ERROR_OUT_OF_MEMORY,err);
                        return EMAIL_ERROR_OUT_OF_MEMORY;
                        
                // Tizen email F/W  is often using this error type when it gets a null value from server
                //It could be caused from server or IPC.
                        LOGE("[%s:%d] OUT_OF_MEMORY(0x%08x) : Error from Email F/W. ret: (0x%08x) ", func, line, EMAIL_ERROR_OUT_OF_MEMORY,err);
                        return EMAIL_ERROR_OUT_OF_MEMORY;
                        
                // Tizen email F/W  is often using this error type when it gets a null value from server
                //It could be caused from server or IPC.

-               case EMAIL_ERROR_NULL_VALUE:
+               case EMAIL_ERROR_NULL_VALUE :

                        LOGE("[%s:%d] NULL_VALUE(0x%08x) : Error from Email F/W. ret: (0x%08x) ", func, line, EMAIL_ERROR_COMMUNICATION_WITH_SERVER_FAILED,err);
                        return EMAIL_ERROR_COMMUNICATION_WITH_SERVER_FAILED;
 
                        LOGE("[%s:%d] NULL_VALUE(0x%08x) : Error from Email F/W. ret: (0x%08x) ", func, line, EMAIL_ERROR_COMMUNICATION_WITH_SERVER_FAILED,err);
                        return EMAIL_ERROR_COMMUNICATION_WITH_SERVER_FAILED;
 

-               case EMAIL_ERROR_IPC_SOCKET_FAILURE:
+               case EMAIL_ERROR_IPC_SOCKET_FAILURE :

                        LOGE("[%s:%d] IPC_SOCKET_FAILURE(0x%08x) : Error from Email F/W. ret: (0x%08x) ", func, line, EMAIL_ERROR_COMMUNICATION_WITH_SERVER_FAILED,err);
                        return EMAIL_ERROR_COMMUNICATION_WITH_SERVER_FAILED;
 
                        LOGE("[%s:%d] IPC_SOCKET_FAILURE(0x%08x) : Error from Email F/W. ret: (0x%08x) ", func, line, EMAIL_ERROR_COMMUNICATION_WITH_SERVER_FAILED,err);
                        return EMAIL_ERROR_COMMUNICATION_WITH_SERVER_FAILED;
 

-               case EMAIL_API_ERROR_NONE:
+               case EMAIL_API_ERROR_NONE :

                        return EMAIL_ERROR_NONE;
 
                        return EMAIL_ERROR_NONE;
 

-               default:
+               default :

                        LOGE("[%s:%d] OPERATION_FAILED(0x%08x) : Error from Email F/W. ret: (0x%08x) ", func, line, EMAIL_ERROR_OPERATION_FAILED,err);
                        return EMAIL_ERROR_OPERATION_FAILED;
 
                        LOGE("[%s:%d] OPERATION_FAILED(0x%08x) : Error from Email F/W. ret: (0x%08x) ", func, line, EMAIL_ERROR_OPERATION_FAILED,err);
                        return EMAIL_ERROR_OPERATION_FAILED;