diff options
| author | Sunghyun Kwon <sh0701.kwon@samsung.com> | 2013-05-10 17:32:17 +0900 |
|---|---|---|
| committer | Sunghyun Kwon <sh0701.kwon@samsung.com> | 2013-05-10 17:32:17 +0900 |
| commit | f50855f9c8e38868f5b55ffebe81d62950f0083b (patch) | |
| tree | cdadfc4423c2b2eccbce99d78fa750b7f559c448 | |
| parent | 586bda83d394be0967d8c07df6a1c49d59eaf882 (diff) | |
| download | email-service-f50855f9c8e38868f5b55ffebe81d62950f0083b.tar.gz email-service-f50855f9c8e38868f5b55ffebe81d62950f0083b.tar.bz2 email-service-f50855f9c8e38868f5b55ffebe81d62950f0083b.zip | |
Merged the tizen_2.1_smack to tizen_2.1submit/tizen_2.1/20130514.052458
| -rwxr-xr-x | CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | email-daemon/email-daemon-mail.c | 2 | ||||
| -rw-r--r-- | email-service.manifest | 4 | ||||
| -rw-r--r-- | email-service.rule | 1 | ||||
| -rwxr-xr-x | packaging/email-service.spec | 2 |
5 files changed, 8 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6110111..4e34ff1 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,7 +58,7 @@ INSTALL(FILES ${CMAKE_BINARY_DIR}/email-service.pc DESTINATION ${LIB_INSTALL_DIR # LICENSE file INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE.BSD DESTINATION /usr/share/license/email-service/LICENSE) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/email-service.rule DESTINATION /etc/smack/accesses2.d/) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/email-service.rule DESTINATION /opt/etc/smack/accesses.d/) INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/ DESTINATION /opt/usr/data/email/res/image FILES_MATCHING PATTERN "*.png") INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/ DESTINATION /opt/usr/data/email/res FILES_MATCHING PATTERN "*.sql") diff --git a/email-daemon/email-daemon-mail.c b/email-daemon/email-daemon-mail.c index f390266..4ed1b6a 100755 --- a/email-daemon/email-daemon-mail.c +++ b/email-daemon/email-daemon-mail.c @@ -1135,7 +1135,7 @@ INTERNAL_FUNC int emdaemon_update_mail(email_mail_data_t *input_mail_data, email event_data.event_param_data_4 = input_attachment_count; event_data.event_param_data_5 = input_from_eas; - if (!emcore_insert_event_for_sending_mails(&event_data, &handle, &err)) { + if (!emcore_insert_event(&event_data, &handle, &err)) { EM_DEBUG_EXCEPTION("emcore_insert_event_for_sending_mails failed [%d]", err); err = EMAIL_ERROR_NONE; goto FINISH_OFF; diff --git a/email-service.manifest b/email-service.manifest index 819b2ea..101e033 100644 --- a/email-service.manifest +++ b/email-service.manifest @@ -1,6 +1,10 @@ <manifest> <define> <domain name="email-service"/> + <provide> + <label name="email-service::read"/> + <label name="email-service::write"/> + </provide> <!-- <provide> <label name="email-service::db"/> diff --git a/email-service.rule b/email-service.rule index 34ccc87..61db117 100644 --- a/email-service.rule +++ b/email-service.rule @@ -1,6 +1,7 @@ email-service email-service::db rw email-service system::use_internet w email-service system::vconf arwxt +email-service data-provider-master rw system::use_internet email-service rwx webkit2-efl email-service rx diff --git a/packaging/email-service.spec b/packaging/email-service.spec index 3b5447c..4b2c6b3 100755 --- a/packaging/email-service.spec +++ b/packaging/email-service.spec @@ -204,7 +204,7 @@ systemctl daemon-reload /usr/share/dbus-1/services/email-service.service /usr/share/license/email-service/LICENSE -/etc/smack/accesses2.d/email-service.rule +/opt/etc/smack/accesses.d/email-service.rule %files devel %{_includedir}/email-service/*.h |