Fixed the prefix and return value of emcore_add_notification

diff --git a/email-common-use/include/email-internal-types.h b/email-common-use/include/email-internal-types.h
index c17da49..8bf9826 100755 (executable)
--- a/email-common-use/include/email-internal-types.h
+++ b/email-common-use/include/email-internal-types.h
@@ -116,7 +116,7 @@ extern "C"
 
 #define SHM_FILE_FOR_DB_LOCK                "/.email_shm_db_lock"
 
-#define NATIVE_EMAIL_APPLICATION_PKG        "com.samsung.email"
+#define NATIVE_EMAIL_APPLICATION_PKG        "org.tizen.email"
 
 #define IMAP_ID_OS                          "TIZEN"
 #define IMAP_ID_OS_VERSION                  "2.0b"

diff --git a/email-core/email-core-mailbox-sync.c b/email-core/email-core-mailbox-sync.c
index 024cdd5..00f71bc 100755 (executable)
--- a/email-core/email-core-mailbox-sync.c
+++ b/email-core/email-core-mailbox-sync.c
@@ -2951,7 +2951,7 @@ static int emcore_parse_plain_part_for_partial_body(char *header_start_string, c
 
 /*  Content-Type:  IMAGE/octet-stream; name = Default.png */
 /*  Content-Transfer-Encoding:  BASE64 */
-/*  Content-ID:  <4b0d6810b17291f9438783a8eb9d5228@com.samsung.slp.email> */
+/*  Content-ID:  <4b0d6810b17291f9438783a8eb9d5228@org.tizen.email> */
 /*  Content-Disposition:  inline; filename = Default.png */
 
 static int emcore_parse_image_part_for_partial_body(char *header_start_string, char *start_header, char *boundary_string, char *bufsendforparse, email_image_data *image_data, int body_size)

diff --git a/email-core/email-core-smtp.c b/email-core/email-core-smtp.c
index 85757a2..65cc3a7 100755 (executable)
--- a/email-core/email-core-smtp.c
+++ b/email-core/email-core-smtp.c
@@ -2235,7 +2235,7 @@ static int attach_part(BODY *body, const unsigned char *data, int data_len, char
 
                if (is_inline) {        
                        /*  CONTENT-ID */
-                       part->body.id = emcore_generate_content_id_string("com.samsung.slp.email", &error);
+                       part->body.id = emcore_generate_content_id_string("org.tizen.email", &error);
                        part->body.type = TYPEIMAGE;
                        /*  EM_SAFE_FREE(part->body.subtype); */
                        /*  part->body.subtype = EM_SAFE_STRDUP(content_sub_type); */

diff --git a/email-core/email-core-utils.c b/email-core/email-core-utils.c
index 016ed70..48e9b52 100755 (executable)
--- a/email-core/email-core-utils.c
+++ b/email-core/email-core-utils.c
@@ -78,7 +78,7 @@
 #define EMAIL_CH_SQUARE_BRACKET_E ']'
 #define EMAIL_CH_SPACE            ' '
 #define EMAIL_NOTI_ICON_PATH      EMAILPATH"/res/image/Q02_Notification_email.png"
-#define VCONF_KEY_UNREAD_MAIL_COUNT "db/badge/com.samsung.email"
+#define VCONF_KEY_UNREAD_MAIL_COUNT "db/badge/org.tizen.email"
 
 typedef struct  _em_transaction_info_type_t {
        int mail_id;
@@ -697,21 +697,21 @@ int emcore_display_unread_in_badge()
        badge_error_e badge_err = BADGE_ERROR_NONE;
        bool exist;
 
-       if((badge_err = badge_is_existing(" com.samsung.email ", &exist)) != BADGE_ERROR_NONE) {
+       if((badge_err = badge_is_existing(" org.tizen.email ", &exist)) != BADGE_ERROR_NONE) {
                EM_DEBUG_EXCEPTION("badge_is_existing failed [%d]", badge_err);
                err = EMAIL_ERROR_BADGE_API_FAILED;
                goto FINISH_OFF;
        }
        if (!exist) {
                /* create badge */
-               if((badge_err = badge_create("com.samsung.email", "/usr/bin/email-service")) != BADGE_ERROR_NONE) {
+               if((badge_err = badge_create("org.tizen.email", "/usr/bin/email-service")) != BADGE_ERROR_NONE) {
                        EM_DEBUG_EXCEPTION("badge_create failed [%d]", badge_err);
                        err = EMAIL_ERROR_BADGE_API_FAILED;
                        goto FINISH_OFF;
                }
        }
 
-       if((badge_err = badge_set_count("com.samsung.email", total_unread_count)) != BADGE_ERROR_NONE) {
+       if((badge_err = badge_set_count("org.tizen.email", total_unread_count)) != BADGE_ERROR_NONE) {
                EM_DEBUG_EXCEPTION("badge_set_count failed [%d]", badge_err);
                err = EMAIL_ERROR_BADGE_API_FAILED;
                goto FINISH_OFF;
@@ -841,7 +841,7 @@ FINISH_OFF:
 static int emcore_add_notification(int account_id, int mail_id, email_action_t action)
 {
        EM_DEBUG_FUNC_BEGIN();
-       int err = EMAIL_ERROR_NONE;
+       int ret = EMAIL_ERROR_NONE;
 
        EM_DEBUG_FUNC_END("ret [%d]", ret);
        return ret;     
@@ -870,7 +870,7 @@ INTERNAL_FUNC int emcore_show_user_message(int id, email_action_t action, int er
                        return false;
                }
 
-               if (!emcore_add_notification(mail_table_data->account_id, id, action)) {
+               if (emcore_add_notification(mail_table_data->account_id, id, action) != EMAIL_ERROR_NONE) {
                        EM_DEBUG_EXCEPTION("emcore_notification_set error");
 
                        if (!emstorage_free_mail(&mail_table_data, 1, NULL))
@@ -1572,7 +1572,7 @@ int emcore_update_notification_for_unread_mail(int account_id)
        }
 
        for (i = 0; i < account_count ; i++) {
-               if (!emcore_add_notification(p_account_tbl[i].account_id, 0, EMAIL_ACTION_NUM)) {
+               if (emcore_add_notification(p_account_tbl[i].account_id, 0, EMAIL_ACTION_NUM) != EMAIL_ERROR_NONE) {
                        EM_DEBUG_EXCEPTION("emcore_add_notification failed");
                        continue;
                }

diff --git a/email-daemon/email-daemon-auto-poll.c b/email-daemon/email-daemon-auto-poll.c
index 18028ce..044fe15 100755 (executable)
--- a/email-daemon/email-daemon-auto-poll.c
+++ b/email-daemon/email-daemon-auto-poll.c
@@ -301,7 +301,7 @@ static int _emdaemon_get_polling_account_and_timeinterval(alarm_id_t  alarm_id,
        return true;
 }
 
-#define AUTO_POLL_DESTINATION  "com.samsung.email-service"
+#define AUTO_POLL_DESTINATION  "org.tizen.email-service"
 static int _emdaemon_create_alarm(int alarm_interval, alarm_id_t *p_alarm_id)
 {
        EM_DEBUG_FUNC_BEGIN();

diff --git a/packaging/email-service.spec b/packaging/email-service.spec
index 5630f5c..430936f 100755 (executable)
--- a/packaging/email-service.spec
+++ b/packaging/email-service.spec
@@ -1,6 +1,6 @@
 Name:       email-service
 Summary:    E-mail Framework Middleware package
-Version:    0.10.11
+Version:    0.10.12
 Release:    1
 Group:      System/Libraries
 License:    TBD