From: Kyeonghun Lee <kh9090.lee@samsung.com>
Date: Tue, 31 May 2016 05:56:54 +0000 (+0900)
Subject: apply new system-event defines
X-Git-Tag: submit/tizen/20160603.061107~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F80%2F72180%2F1;p=platform%2Fcore%2Fmessaging%2Fmsg-service.git

apply new system-event defines

Change-Id: I1257a919c6a44dd26b04e3c35eb796cca414179f
Signed-off-by: Kyeonghun Lee <kh9090.lee@samsung.com>
---

diff --git a/include/common/MsgInternalTypes.h b/include/common/MsgInternalTypes.h
index 8526dfa..ebc78a0 100755
--- a/include/common/MsgInternalTypes.h
+++ b/include/common/MsgInternalTypes.h
@@ -191,12 +191,6 @@
 #define MSG_TELEPHONY_SMS_FEATURE	"http://tizen.org/feature/network.telephony.sms"
 #define MSG_TELEPHONY_MMS_FEATURE	"http://tizen.org/feature/network.telephony.mms"
 
-/*below defines will be removed */
-#define SYS_EVENT_OUTGOING_MSG "tizen.system.event.outgoing_msg"
-#define EVT_VAL_MMS "mms"
-#define EVT_KEY_OUT_MSG_ID "msg_id"
-#define EVT_KEY_OUT_MSG_TYPE "msg_type"
-
 /*==================================================================================================
                                          TYPES
 ==================================================================================================*/
diff --git a/manager/src/msg-manager.cpp b/manager/src/msg-manager.cpp
index 588d7f6..0bb8fc2 100644
--- a/manager/src/msg-manager.cpp
+++ b/manager/src/msg-manager.cpp
@@ -43,13 +43,6 @@ extern "C"
 #include "msg-manager-sound.h"
 #include "msg-manager-util.h"
 
-/*==================================================================================================
-                                     DEFINES
-==================================================================================================*/
-/* below defines will be removed */
-#define EVENT_KEY_OUT_MSG_TYPE "msg_type"
-#define EVENT_KEY_OUT_MSG_ID "msg_id"
-
 /*==================================================================================================
                                      VARIABLES
 ==================================================================================================*/
diff --git a/plugin/sms_cdma_plugin/SmsCdmaPluginEventHandler.cpp b/plugin/sms_cdma_plugin/SmsCdmaPluginEventHandler.cpp
index 2320e11..5b0411f 100755
--- a/plugin/sms_cdma_plugin/SmsCdmaPluginEventHandler.cpp
+++ b/plugin/sms_cdma_plugin/SmsCdmaPluginEventHandler.cpp
@@ -465,9 +465,9 @@ void SmsPluginEventHandler::handleSentStatus(msg_network_status_t NetStatus)
 				b = bundle_create();
 				if (b) {
 					if (sentInfo.reqInfo.msgInfo.msgType.mainType == MSG_SMS_TYPE)
-						bundle_add_str(b, EVT_KEY_OUT_MSG_TYPE, EVT_VAL_SMS);
+						bundle_add_str(b, EVT_KEY_OUT_MSG_TYPE, EVT_VAL_OUT_MSG_SMS);
 					else
-						bundle_add_str(b, EVT_KEY_OUT_MSG_TYPE, EVT_VAL_MMS);
+						bundle_add_str(b, EVT_KEY_OUT_MSG_TYPE, EVT_VAL_OUT_MSG_MMS);
 
 					char msgId[MSG_EVENT_MSG_ID_LEN] = {0, };
 					snprintf(msgId, sizeof(msgId), "%u", sentInfo.reqInfo.msgInfo.msgId);
diff --git a/plugin/sms_plugin/SmsPluginEventHandler.cpp b/plugin/sms_plugin/SmsPluginEventHandler.cpp
index 616d1b9..dda8132 100755
--- a/plugin/sms_plugin/SmsPluginEventHandler.cpp
+++ b/plugin/sms_plugin/SmsPluginEventHandler.cpp
@@ -103,9 +103,9 @@ void SmsPluginEventHandler::handleSentStatus(msg_network_status_t NetStatus)
 				b = bundle_create();
 				if (b) {
 					if (sentInfo.reqInfo.msgInfo.msgType.mainType == MSG_SMS_TYPE)
-						bundle_add_str(b, EVT_KEY_OUT_MSG_TYPE, EVT_VAL_SMS);
+						bundle_add_str(b, EVT_KEY_OUT_MSG_TYPE, EVT_VAL_OUT_MSG_SMS);
 					else
-						bundle_add_str(b, EVT_KEY_OUT_MSG_TYPE, EVT_VAL_MMS);
+						bundle_add_str(b, EVT_KEY_OUT_MSG_TYPE, EVT_VAL_OUT_MSG_MMS);
 
 					char msgId[MSG_EVENT_MSG_ID_LEN] = {0, };
 					snprintf(msgId, sizeof(msgId), "%u", sentInfo.reqInfo.msgInfo.msgId);