From 47cb5550b2630c116130bfbde998d4274d56b653 Mon Sep 17 00:00:00 2001 From: Somin Kim Date: Tue, 15 Mar 2016 13:31:14 +0900 Subject: [PATCH] Changed EVENT_CONTACTS_DB_CHANGED to EVENT_CONTACTS Change-Id: I03feefaf118fca7bfa36075afd342d4a74d55d73 Signed-off-by: Somin Kim --- include/context_trigger.h | 18 +++++++++--------- include/context_trigger_types_internal.h | 2 +- src/context_trigger.cpp | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/context_trigger.h b/include/context_trigger.h index d219bd0..eebbe59 100644 --- a/include/context_trigger.h +++ b/include/context_trigger.h @@ -178,14 +178,6 @@ extern "C" { #define CONTEXT_TRIGGER_TYPE "Type" /** - * @brief The attribute key denoting "view". - * @details This can be used as left operands of context_trigger_rule_entry_add_comparison_string().@n - * See the programming guide to find available right operands. - * @since_tizen 3.0 - */ -#define CONTEXT_TRIGGER_VIEW "View" - -/** * @brief The attribute key denoting "event". * @details This can be used as left operands of context_trigger_rule_entry_add_comparison_string().@n * See the programming guide to find available right operands. @@ -508,6 +500,14 @@ extern "C" { #define CONTEXT_TRIGGER_PERSON "Person" /** + * @brief The attribute value denoting the "Changed" event. + * @details This can be used as right operands of context_trigger_rule_entry_add_comparison_string().@n + * See the programming guide to find the corresponding left operand attribute keys. + * @since_tizen 3.0 + */ +#define CONTEXT_TRIGGER_CHANGED "Changed" + +/** * @brief The attribute value denoting the "detected" event. * @details This can be used as right operands of context_trigger_rule_entry_add_comparison_string().@n * See the programming guide to find the corresponding left operand attribute keys. @@ -567,7 +567,7 @@ typedef enum { CONTEXT_TRIGGER_EVENT_CALL = 0x10300, /**< Call state changed @n Privilege: http://tizen.org/privilege/telephony */ CONTEXT_TRIGGER_EVENT_EMAIL, /**< Email sent/received */ CONTEXT_TRIGGER_EVENT_MESSAGE, /**< Message sent/received @n Privilege: http://tizen.org/privilege/message.read */ - CONTEXT_TRIGGER_EVENT_CONTACTS_DB_CHANGED, /**< Contacts db changed (Since Tizen 3.0) @n Privilege: http://tizen.org/privilege/contact.read */ + CONTEXT_TRIGGER_EVENT_CONTACTS, /**< Contacts changed (Since Tizen 3.0) @n Privilege: http://tizen.org/privilege/contact.read */ CONTEXT_TRIGGER_EVENT_ACTIVITY_STATIONARY = 0x10400, /**< 'Stationary' activity detected */ CONTEXT_TRIGGER_EVENT_ACTIVITY_WALKING, /**< 'Walking' activity detected */ CONTEXT_TRIGGER_EVENT_ACTIVITY_RUNNING, /**< 'Running' activity detected */ diff --git a/include/context_trigger_types_internal.h b/include/context_trigger_types_internal.h index d2389ca..89342b6 100644 --- a/include/context_trigger_types_internal.h +++ b/include/context_trigger_types_internal.h @@ -78,7 +78,7 @@ #define CT_EVENT_CALL "social/call" #define CT_EVENT_EMAIL "social/email" #define CT_EVENT_MESSAGE "social/message" -#define CT_EVENT_CONTACTS_DB_CHANGED "social/contacts" +#define CT_EVENT_CONTACTS "social/contacts" #define CT_EVENT_ACTIVITY_STATIONARY "activity/stationary" #define CT_EVENT_ACTIVITY_WALKING "activity/walking" #define CT_EVENT_ACTIVITY_RUNNING "activity/running" diff --git a/src/context_trigger.cpp b/src/context_trigger.cpp index 768a209..7af4e3f 100644 --- a/src/context_trigger.cpp +++ b/src/context_trigger.cpp @@ -1012,8 +1012,8 @@ std::string convert_event_to_string(context_trigger_event_e item) case CONTEXT_TRIGGER_EVENT_MESSAGE: str = CT_EVENT_MESSAGE; break; - case CONTEXT_TRIGGER_EVENT_CONTACTS_DB_CHANGED: - str = CT_EVENT_CONTACTS_DB_CHANGED; + case CONTEXT_TRIGGER_EVENT_CONTACTS: + str = CT_EVENT_CONTACTS; break; case CONTEXT_TRIGGER_EVENT_ACTIVITY_STATIONARY: str = CT_EVENT_ACTIVITY_STATIONARY; -- 2.7.4