Modified the indent

Change-Id: I58375a94142bfd49e168fa9f50fd240353fd5fab

diff --git a/email-common-use/email-convert.c b/email-common-use/email-convert.c
index 8299cd5..3dc30b5 100755 (executable)
--- a/email-common-use/email-convert.c
+++ b/email-common-use/email-convert.c
@@ -700,7 +700,7 @@ static char *convert_format(char *fmt)
        char *converted_fmt = NULL;
 
        string_size = strlen(fmt);
-       converted_fmt = em_malloc(string_size);
+       converted_fmt = em_malloc(string_size + 1);
        if (converted_fmt == NULL) {
                EM_DEBUG_EXCEPTION("em_malloc failed");
                return NULL;
@@ -778,7 +778,7 @@ INTERNAL_FUNC char* em_convert_account_to_byte_stream(email_account_t* account,
                return NULL;
        }
 
-       tn = tpl_map(EMAIL_ACCOUNT_FMT, account, &tb, &(account->user_data_length));
+       tn = tpl_map(converted_fmt, account, &tb, &(account->user_data_length));
        if (!tn) {
                EM_SAFE_FREE(converted_fmt);
                EM_DEBUG_EXCEPTION("tpl_map failed");

diff --git a/email-core/CMakeLists.txt b/email-core/CMakeLists.txt
index 9b5aa74..765e6f6 100755 (executable)
--- a/email-core/CMakeLists.txt
+++ b/email-core/CMakeLists.txt
@@ -234,7 +234,7 @@ INCLUDE_DIRECTORIES(
 INCLUDE(FindPkgConfig)
 SET(PKG_MODULES glib-2.0 dlog dbus-1 gthread-2.0 key-manager
                        uw-imap-toolkit vconf vconf-internal-keys contacts-service2 
-                       openssl accounts-svc alarm-service notification libcurl libxml-2.0 feedback
+                       openssl accounts-svc alarm-service notification libcurl libxml-2.0 
                        cert-svc cert-svc-vcore badge capi-appfw-application icu-i18n gmime-2.6 storage)
 
 pkg_check_modules(core_pkgs REQUIRED ${PKG_MODULES})

diff --git a/email-core/email-core-utils.c b/email-core/email-core-utils.c
index f2573f4..2c2f66d 100755 (executable)
--- a/email-core/email-core-utils.c
+++ b/email-core/email-core-utils.c
@@ -57,7 +57,6 @@
 #include <drm_client_types.h>
 #include <drm_client.h>
 #endif /* __FEATURE_USE_DRM_API__ */
-#include <feedback.h>
 #include <storage.h>
 #include <bundle.h>
 #include <curl/curl.h>

diff --git a/email-core/include/email-core-mail.h b/email-core/include/email-core-mail.h
index 73c1b69..52b41d1 100755 (executable)
--- a/email-core/include/email-core-mail.h
+++ b/email-core/include/email-core-mail.h
@@ -340,7 +340,6 @@ INTERNAL_FUNC int   emcore_sync_flag_with_server(char *multi_user_name, int mail
 INTERNAL_FUNC int   emcore_sync_seen_flag_with_server(char *multi_user_name, int mail_ids[], int num, int event_handle, int *err_code);
 
 INTERNAL_FUNC int   emcore_set_flags_field(char *multi_user_name, int account_id, int mail_ids[], int num, email_flags_field_type field_type, int value, int *err_code);
-INTERNAL_FUNC char* emcore_convert_mutf7_to_utf8(char *mailbox_name); 
 INTERNAL_FUNC int   emcore_convert_string_to_structure(const char *encoded_string, void **struct_var, email_convert_struct_type_e type);
 INTERNAL_FUNC int   emcore_save_mail_file(char *multi_user_name, int account_id, int mail_id, int attachment_id, char *src_file_path, char *file_name, char *full_path, char *virtual_path, int *err_code);
 

diff --git a/email-core/include/email-core-utils.h b/email-core/include/email-core-utils.h
index b9c5cb8..e78a144 100755 (executable)
--- a/email-core/include/email-core-utils.h
+++ b/email-core/include/email-core-utils.h
@@ -238,6 +238,7 @@ INTERNAL_FUNC char *__em_get_month_in_string(int month);
 INTERNAL_FUNC int emcore_make_date_string_for_search(time_t input_time, char *output_date_string);
 INTERNAL_FUNC int emcore_make_uid_range_string(emcore_uid_list *uid_list, int total, char **output_uid_range_string);
 
+INTERNAL_FUNC char* emcore_convert_mutf7_to_utf8(char *mailbox_name); 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */

diff --git a/email-daemon/email-daemon-etc.c b/email-daemon/email-daemon-etc.c
index e4a98fc..63a626d 100755 (executable)
--- a/email-daemon/email-daemon-etc.c
+++ b/email-daemon/email-daemon-etc.c
@@ -463,7 +463,6 @@ INTERNAL_FUNC int emdaemon_finalize_sync(char *multi_user_name, int account_id,
                        EM_DEBUG_LOG("The email app is topmost");
                } else {
 
-
                        if ((err = emcore_add_notification(multi_user_name, account_id, 0, unread_mail_count, vip_unread_mail_count, 1, EMAIL_ERROR_NONE, NOTIFICATION_DISPLAY_APP_ALL)) != EMAIL_ERROR_NONE)
                                EM_DEBUG_EXCEPTION("emcore_add_notification failed : [%d]", err);
 

diff --git a/packaging/email-service.spec b/packaging/email-service.spec
index 7af7c9f..7502a58 100755 (executable)
--- a/packaging/email-service.spec
+++ b/packaging/email-service.spec
@@ -45,7 +45,6 @@ BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(cert-svc)
 BuildRequires:  pkgconfig(cert-svc-vcore)
 BuildRequires:  pkgconfig(badge)
-BuildRequires:  pkgconfig(feedback)
 BuildRequires:  pkgconfig(capi-appfw-application)
 BuildRequires:  pkgconfig(libwbxml2)
 BuildRequires:  pkgconfig(msg-service)