From 173e7b2435e274c3d565bbfced2f9e34be76f1e6 Mon Sep 17 00:00:00 2001 From: Gukhwan Cho Date: Tue, 7 Jul 2015 15:48:18 +0900 Subject: [PATCH] remove duplicated img path definition Change-Id: Id4d5d524dbdced6d2023fad31a0d3d4747ec11a2 Signed-off-by: Gukhwan Cho --- common/ctsvc_vcard.c | 2 +- native/ctsvc_db_plugin_company_helper.c | 1 + native/ctsvc_db_plugin_company_helper.h | 2 -- native/ctsvc_db_plugin_group.c | 1 + native/ctsvc_db_plugin_group_helper.c | 1 + native/ctsvc_db_plugin_group_helper.h | 2 -- 6 files changed, 4 insertions(+), 5 deletions(-) diff --git a/common/ctsvc_vcard.c b/common/ctsvc_vcard.c index 87dd2a3..0ec19b6 100644 --- a/common/ctsvc_vcard.c +++ b/common/ctsvc_vcard.c @@ -41,12 +41,12 @@ #include "ctsvc_record.h" #include "ctsvc_list.h" #include "ctsvc_localize_utils.h" +#include "ctsvc_notify.h" #define DEFAULT_ADDRESS_BOOK_ID 0 #define SMART_STRDUP(src) (src && *src)?strdup(src):NULL #define CTSVC_VCARD_PHOTO_MAX_SIZE 1024*1024 -#define CTSVC_VCARD_IMAGE_LOCATION tzplatform_mkpath(TZ_USER_DATA,"contacts-svc/img/vcard") #define CTSVC_VCARD_APPEND_STR(buf, buf_size, len, str) do { \ if ((len = __ctsvc_vcard_append_str(buf, buf_size, len, str, false)) < 0) { \ diff --git a/native/ctsvc_db_plugin_company_helper.c b/native/ctsvc_db_plugin_company_helper.c index 5dcb09b..71e9f11 100644 --- a/native/ctsvc_db_plugin_company_helper.c +++ b/native/ctsvc_db_plugin_company_helper.c @@ -31,6 +31,7 @@ #include "ctsvc_record.h" #include "ctsvc_notification.h" #include "ctsvc_db_access_control.h" +#include "ctsvc_notify.h" static int __ctsvc_company_bind_stmt(cts_stmt stmt, ctsvc_company_s *company, int start_cnt) { diff --git a/native/ctsvc_db_plugin_company_helper.h b/native/ctsvc_db_plugin_company_helper.h index 6839237..87aa97f 100644 --- a/native/ctsvc_db_plugin_company_helper.h +++ b/native/ctsvc_db_plugin_company_helper.h @@ -24,8 +24,6 @@ #include "ctsvc_sqlite.h" #include -#define CTS_LOGO_IMAGE_LOCATION tzplatform_mkpath(TZ_USER_DATA,"contacts-svc/img/logo") - int ctsvc_db_company_insert(contacts_record_h record, int contact_id, bool is_my_profile, int *id); int ctsvc_db_company_update(contacts_record_h record, int contact_id, bool is_my_profile); int ctsvc_db_company_delete(int id, bool is_my_profile); diff --git a/native/ctsvc_db_plugin_group.c b/native/ctsvc_db_plugin_group.c index ba81ba4..cd6f829 100644 --- a/native/ctsvc_db_plugin_group.c +++ b/native/ctsvc_db_plugin_group.c @@ -31,6 +31,7 @@ #include "ctsvc_notification.h" #include "ctsvc_db_access_control.h" #include "ctsvc_db_plugin_group_helper.h" +#include "ctsvc_notify.h" static int __ctsvc_db_group_insert_record( contacts_record_h record, int *id ); static int __ctsvc_db_group_get_record( int id, contacts_record_h* out_record ); diff --git a/native/ctsvc_db_plugin_group_helper.c b/native/ctsvc_db_plugin_group_helper.c index 9a5a552..e3bd15b 100644 --- a/native/ctsvc_db_plugin_group_helper.c +++ b/native/ctsvc_db_plugin_group_helper.c @@ -26,6 +26,7 @@ #include "ctsvc_sqlite.h" #include "ctsvc_utils.h" #include "ctsvc_db_plugin_group_helper.h" +#include "ctsvc_notify.h" // Whenever deleting group, this function will be called // in order to deleting group image file diff --git a/native/ctsvc_db_plugin_group_helper.h b/native/ctsvc_db_plugin_group_helper.h index 2eb99d3..787716a 100644 --- a/native/ctsvc_db_plugin_group_helper.h +++ b/native/ctsvc_db_plugin_group_helper.h @@ -24,8 +24,6 @@ #include "ctsvc_sqlite.h" #include -#define CTS_GROUP_IMAGE_LOCATION tzplatform_mkpath(TZ_USER_DATA,"contacts-svc/img/group") - void ctsvc_db_group_delete_callback(sqlite3_context *context, int argc, sqlite3_value ** argv); #endif // __CTSVC_DB_PLUGIN_GROUP_HELPER_H__ -- 2.7.4