Remove the contact dependency

Change-Id: Ifb3d578ba9111d0d672ee5e7473fadf45fb72dfc

diff --git a/email-api/CMakeLists.txt b/email-api/CMakeLists.txt
index eea919f..4697005 100755 (executable)
--- a/email-api/CMakeLists.txt
+++ b/email-api/CMakeLists.txt
@@ -41,7 +41,9 @@ INCLUDE_DIRECTORIES(
 )
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(api_pkgs REQUIRED glib-2.0 dlog dbus-1 vconf db-util contacts-service2 uw-imap-toolkit) 
+pkg_check_modules(api_pkgs REQUIRED glib-2.0 dlog dbus-1 vconf db-util uw-imap-toolkit) 
+
+#pkg_check_modules(api_pkgs REQUIRED glib-2.0 dlog dbus-1 vconf db-util contacts-service2 uw-imap-toolkit) 
 
 FOREACH(flag ${api_pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/email-common-use/CMakeLists.txt b/email-common-use/CMakeLists.txt
index 28b16ba..0f9ebe5 100755 (executable)
--- a/email-common-use/CMakeLists.txt
+++ b/email-common-use/CMakeLists.txt
@@ -28,7 +28,9 @@ INCLUDE_DIRECTORIES(
 )
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(common_pkgs REQUIRED glib-2.0 dlog dbus-1 vconf contacts-service2 uw-imap-toolkit security-server libtzplatform-config)
+pkg_check_modules(common_pkgs REQUIRED glib-2.0 dlog dbus-1 vconf uw-imap-toolkit security-server libtzplatform-config)
+
+#pkg_check_modules(common_pkgs REQUIRED glib-2.0 dlog dbus-1 vconf contacts-service2 uw-imap-toolkit security-server libtzplatform-config)
 
 FOREACH(flag ${common_pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/email-core/CMakeLists.txt b/email-core/CMakeLists.txt
index 42169c9..e07534a 100755 (executable)
--- a/email-core/CMakeLists.txt
+++ b/email-core/CMakeLists.txt
@@ -72,7 +72,9 @@ INCLUDE_DIRECTORIES(
 
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(storage_pkgs REQUIRED drm-client glib-2.0 dlog db-util openssl vconf secure-storage dbus-1 contacts-service2 libtzplatform-config)
+pkg_check_modules(storage_pkgs REQUIRED drm-client glib-2.0 dlog db-util openssl vconf secure-storage dbus-1 libtzplatform-config)
+
+#pkg_check_modules(storage_pkgs REQUIRED drm-client glib-2.0 dlog db-util openssl vconf secure-storage dbus-1 contacts-service2 libtzplatform-config)
 
 set(EXTRA_CFLAGS "")
 FOREACH(flag ${storage_pkgs_CFLAGS})
@@ -211,7 +213,10 @@ INCLUDE_DIRECTORIES(
 
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(core_pkgs REQUIRED glib-2.0 drm-client dlog dbus-1 gthread-2.0 uw-imap-toolkit vconf vconf-internal-keys contacts-service2 secure-storage openssl accounts-svc mm-player mm-session feedback alarm-service notification libcurl libxml-2.0 cert-svc cert-svc-vcore badge capi-appfw-application icu-i18n libtzplatform-config)
+pkg_check_modules(core_pkgs REQUIRED glib-2.0 drm-client dlog dbus-1 gthread-2.0 uw-imap-toolkit vconf vconf-internal-keys secure-storage openssl accounts-svc mm-player mm-session feedback alarm-service notification libcurl libxml-2.0 cert-svc cert-svc-vcore badge capi-appfw-application icu-i18n libtzplatform-config)
+
+
+#pkg_check_modules(core_pkgs REQUIRED glib-2.0 drm-client dlog dbus-1 gthread-2.0 uw-imap-toolkit vconf vconf-internal-keys contacts-service2 secure-storage openssl accounts-svc mm-player mm-session feedback alarm-service notification libcurl libxml-2.0 cert-svc cert-svc-vcore badge capi-appfw-application icu-i18n libtzplatform-config)
 
 set(EXTRA_CFLAGS "")
 FOREACH(flag ${core_pkgs_CFLAGS})

diff --git a/email-core/email-core-event.c b/email-core/email-core-event.c
index 74fc387..39659aa 100755 (executable)
--- a/email-core/email-core-event.c
+++ b/email-core/email-core-event.c
@@ -25,7 +25,7 @@
 #include <pthread.h>
 #include <vconf.h>
 #include <signal.h>
-#include <contacts.h>
+//#include <contacts.h>
 #include "c-client.h"
 #include "email-convert.h"
 #include "email-storage.h"

diff --git a/email-core/email-core-mail.c b/email-core/email-core-mail.c
index c27f48f..3c7eab1 100755 (executable)
--- a/email-core/email-core-mail.c
+++ b/email-core/email-core-mail.c
@@ -46,7 +46,7 @@
 #include <glib/gstdio.h>
 
 #include <vconf.h> 
-#include <contacts.h>
+//#include <contacts.h>
 
 #include "email-internal-types.h"
 #include "c-client.h"
@@ -1709,7 +1709,7 @@ INTERNAL_FUNC int emcore_get_mail_address_info_list(int mail_id, email_address_i
                goto FINISH_OFF;
        }       
        memset(p_address_info_list, 0x00, sizeof(email_address_info_list_t));   
-
+#if 0
        if ((contact_error = contacts_connect2 ()) != CONTACTS_ERROR_NONE) {
                EM_DEBUG_EXCEPTION("contacts_connect2 failed [%d]", contact_error);             
                err = EMAIL_ERROR_DB_FAILURE;
@@ -1727,7 +1727,7 @@ INTERNAL_FUNC int emcore_get_mail_address_info_list(int mail_id, email_address_i
 
        if ((contact_error = contacts_disconnect2 ()) != CONTACTS_ERROR_NONE)
                EM_DEBUG_EXCEPTION("contacts_connect2 failed [%d]", contact_error);
-
+#endif
        if (failed == false)
                ret = true;
 

diff --git a/email-core/email-core-utils.c b/email-core/email-core-utils.c
index a536b95..fc5ceb0 100755 (executable)
--- a/email-core/email-core-utils.c
+++ b/email-core/email-core-utils.c
@@ -3336,7 +3336,7 @@ FINISH_OFF:
        EM_DEBUG_FUNC_END("err[%d]", err);
        return err;
 }
-
+#if 0
 static int convert_contact_err_to_email_err(int contact_err)
 {
        int err = EMAIL_ERROR_NONE;
@@ -3370,7 +3370,7 @@ static int convert_contact_err_to_email_err(int contact_err)
        }
        return err;
 }
-
+#endif
 int emcore_get_mail_contact_info(email_mail_contact_info_t *contact_info, char *full_address, int *err_code)
 {
        EM_DEBUG_FUNC_BEGIN_SEC("contact_info[%p], full_address[%s], err_code[%p]", contact_info, full_address, err_code);
@@ -3388,7 +3388,7 @@ int emcore_get_mail_contact_info(email_mail_contact_info_t *contact_info, char *
        
        return ret;
 }
-
+#if 0
 int emcore_search_contact_info(const char *contact_uri, int address_property_id, char *address, int favorite_property_id, bool is_favorite, int limit, contacts_record_h *contacts_record)
 {
        EM_DEBUG_FUNC_BEGIN();
@@ -3505,12 +3505,13 @@ FINISH_OFF:
 
        return contact_err;
 }
-
+#endif
 int emcore_set_contacts_log(int account_id, char *email_address, char *subject, time_t date_time, email_action_t action)
 {
        EM_DEBUG_FUNC_BEGIN_SEC("account_id : [%d], address : [%p], subject : [%s], action : [%d], date_time : [%d]", account_id, email_address, subject, action, (int)date_time);
        
        int err = EMAIL_ERROR_NONE;
+#if 0
        int contacts_error = CONTACTS_ERROR_NONE;
        int person_id = 0;
        int action_type = 0;
@@ -3608,7 +3609,7 @@ FINISH_OFF:
                EM_DEBUG_EXCEPTION("Open connect service failed [%d]", contacts_error);
                err = convert_contact_err_to_email_err(contacts_error);
        }
-
+#endif
        EM_DEBUG_FUNC_END("err [%d]", err);
        return err;
 }
@@ -3669,6 +3670,7 @@ INTERNAL_FUNC int emcore_delete_contacts_log(int account_id)
        EM_DEBUG_FUNC_BEGIN("account_id [%d]", account_id);
 
        int err = EMAIL_ERROR_NONE;
+#if 0
        int contacts_error = CONTACTS_ERROR_NONE;
 
        if ((contacts_error = contacts_connect2()) != CONTACTS_ERROR_NONE) {
@@ -3689,7 +3691,7 @@ FINISH_OFF:
                EM_DEBUG_EXCEPTION("Open connect service failed [%d]", contacts_error);
                err = convert_contact_err_to_email_err(contacts_error);
        }
-
+#endif
        EM_DEBUG_FUNC_END("err [%d]", err);
        return err;
 }
@@ -3697,9 +3699,9 @@ FINISH_OFF:
 INTERNAL_FUNC int emcore_get_mail_display_name(char *email_address, char **contact_display_name, int *err_code)
 {
        EM_DEBUG_FUNC_BEGIN_SEC("contact_name_value[%s], contact_display_name[%p]", email_address, contact_display_name);
-
-       int contact_err = 0;
        int ret = false;
+#if 0
+       int contact_err = 0;
        char *display = NULL;
        /* Contact variable */
        contacts_record_h record = NULL;
@@ -3754,7 +3756,7 @@ FINISH_OFF:
 
        if (err_code != NULL)
                *err_code = convert_contact_err_to_email_err(contact_err);
-
+#endif
        return ret;
 }
 
@@ -3791,6 +3793,7 @@ INTERNAL_FUNC int emcore_check_blocking_mode(char *sender_address, int *blocking
 {
        EM_DEBUG_FUNC_BEGIN();
        int err = EMAIL_ERROR_NONE;
+#if 0
        int contact_error = 0;
        int person_id = 0;
        int allowed_contact_type = 0; /* 0 : NONE, 1 : All contacts, 2 : Favorites, 3 : Custom */
@@ -3895,7 +3898,7 @@ FINISH_OFF :
        contacts_disconnect2();
 
        err = convert_contact_err_to_email_err(contact_error);
-
+#endif
        EM_DEBUG_FUNC_END();
        return err;
 }

diff --git a/email-core/include/email-core-mail.h b/email-core/include/email-core-mail.h
index 5a48918..a6505a6 100755 (executable)
--- a/email-core/include/email-core-mail.h
+++ b/email-core/include/email-core-mail.h
@@ -33,7 +33,7 @@
 #define __EMAIL_CORE_MESSAGE_H__
 
 #include "email-storage.h"
-#include <contacts.h>
+//#include <contacts.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/email-daemon/CMakeLists.txt b/email-daemon/CMakeLists.txt
index 8f86d41..cf1f3ec 100755 (executable)
--- a/email-daemon/CMakeLists.txt
+++ b/email-daemon/CMakeLists.txt
@@ -47,10 +47,15 @@ INCLUDE_DIRECTORIES(
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(main_pkgs REQUIRED glib-2.0 dlog dbus-1 gthread-2.0 db-util 
-                               openssl uw-imap-toolkit vconf vconf-internal-keys contacts-service2 
+                               openssl uw-imap-toolkit vconf vconf-internal-keys 
                                alarm-service mm-player drm-client feedback msg-service 
                                libwbxml2 libsmack notification)
 
+#pkg_check_modules(main_pkgs REQUIRED glib-2.0 dlog dbus-1 gthread-2.0 db-util 
+#                              openssl uw-imap-toolkit vconf vconf-internal-keys contacts-service2 
+#                              alarm-service mm-player drm-client feedback msg-service 
+#                              libwbxml2 libsmack notification)
+
 FOREACH(flag ${main_pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)

diff --git a/email-daemon/email-daemon-account.c b/email-daemon/email-daemon-account.c
index 11c1088..6e7fe27 100755 (executable)
--- a/email-daemon/email-daemon-account.c
+++ b/email-daemon/email-daemon-account.c
@@ -40,7 +40,7 @@
 #include "email-debug-log.h"
 #include "email-daemon-account.h"
 #include "email-daemon-auto-poll.h"
-#include <contacts.h>
+//#include <contacts.h>
 #include "email-types.h"
 #include "email-core-account.h"
 #include "email-core-event.h"

diff --git a/email-daemon/email-daemon-event.c b/email-daemon/email-daemon-event.c
index 7b96345..c3575d8 100755 (executable)
--- a/email-daemon/email-daemon-event.c
+++ b/email-daemon/email-daemon-event.c
@@ -25,7 +25,7 @@
 #include <pthread.h>
 #include <vconf.h>
 #include <signal.h>
-#include <contacts.h>
+//#include <contacts.h>
 #include "c-client.h"
 #include "email-convert.h"
 #include "email-storage.h"

diff --git a/utilities/CMakeLists.txt b/utilities/CMakeLists.txt
index 2a04870..3826c96 100755 (executable)
--- a/utilities/CMakeLists.txt
+++ b/utilities/CMakeLists.txt
@@ -40,7 +40,9 @@ INCLUDE_DIRECTORIES(
 )
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(test_app_pkgs REQUIRED glib-2.0 gthread-2.0 vconf db-util uw-imap-toolkit contacts-service2 drm-client pmapi)
+pkg_check_modules(test_app_pkgs REQUIRED glib-2.0 gthread-2.0 vconf db-util uw-imap-toolkit drm-client pmapi)
+
+#pkg_check_modules(test_app_pkgs REQUIRED glib-2.0 gthread-2.0 vconf db-util uw-imap-toolkit contacts-service2 drm-client pmapi)
 
 FOREACH(flag ${test_app_pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")