Merge from private.
authorSangkoo Kim <sangkoo.kim@samsung.com>
Thu, 25 Oct 2012 06:06:27 +0000 (15:06 +0900)
committerSangkoo Kim <sangkoo.kim@samsung.com>
Thu, 25 Oct 2012 17:10:43 +0000 (02:10 +0900)
commit2a2590470a124d7b951b930ec13300758dad1da1
treed1423de2caaab45be335a7c590e4098cbd37d343
parent169f6bb958dd91c7f7eaabdc193ca7269fc49d8c
Merge from private.

Change-Id: I430d3546541d8bd946aea5e15223ef52e82edf16
96 files changed:
CMakeLists.txt
framework/deliver-handler/MsgDeliverHandler.cpp
framework/plugin-manager/MsgPluginManager.cpp
framework/setting-handler/MsgSettingHandler.cpp
framework/storage-handler/MsgStorageFilter.cpp
framework/storage-handler/MsgStorageManager.cpp
framework/storage-handler/MsgStorageMessage.cpp
framework/storage-handler/MsgStorageMms.cpp
framework/storage-handler/MsgStorageUtil.cpp
framework/submit-handler/MsgSubmitHandler.cpp
framework/transaction-manager/MsgCmdHandlerFilter.cpp
framework/transaction-manager/MsgCmdHandlerStorage.cpp
framework/transaction-manager/MsgCmdHandlerTransport.cpp
framework/transaction-manager/MsgTransManager.cpp
include/common/MsgCmdTypes.h
include/common/MsgFilterTypes.h
include/common/MsgInternalTypes.h
include/common/MsgTypes.h
include/framework/MsgCmdHandler.h
include/framework/MsgStorageHandler.h
include/mapi/msg.h
include/mapi/msg_private.h
include/mapi/msg_storage.h
include/mapi/msg_types.h
include/msg_helper/MsgHelper.h
include/proxy/MsgHandle.h
include/proxy/MsgProxyListener.h
include/utils/MsgGconfWrapper.h
include/utils/MsgIpcSocket.h
include/utils/MsgNotificationWrapper.h
include/utils/MsgSqliteWrapper.h
include/utils/MsgTextConvert.h [moved from plugin/sms_plugin/include/SmsPluginTextConvert.h with 91% similarity]
include/utils/MsgUtilFunction.h
include/utils/MsgUtilStorage.h
mapi/msg_filter.cpp
mapi/msg_message.cpp
mapi/msg_mms.cpp
mapi/msg_storage.cpp
mapi/msg_svc.cpp
mms-plugin.manifest [new file with mode: 0755]
msg-service-tools.manifest [new file with mode: 0755]
msg-service.manifest [new file with mode: 0755]
packaging/msg-service.service [new file with mode: 0644]
packaging/msg-service.spec
plugin/mms_plugin/LanguagePack/MmsPluginWmLngLatinUni.cpp
plugin/mms_plugin/MmsPluginContentCodec.cpp
plugin/mms_plugin/MmsPluginDebug.cpp
plugin/mms_plugin/MmsPluginDecode.cpp
plugin/mms_plugin/MmsPluginDrm.cpp
plugin/mms_plugin/MmsPluginEncode.cpp
plugin/mms_plugin/MmsPluginEventHandler.cpp
plugin/mms_plugin/MmsPluginHttp.cpp
plugin/mms_plugin/MmsPluginInternal.cpp
plugin/mms_plugin/MmsPluginMessage.cpp
plugin/mms_plugin/MmsPluginSmil.cpp
plugin/mms_plugin/MmsPluginStorage.cpp
plugin/mms_plugin/MmsPluginUserAgent.cpp
plugin/mms_plugin/MmsPluginUtil.cpp [new file with mode: 0755]
plugin/mms_plugin/include/MmsPluginDebug.h
plugin/mms_plugin/include/MmsPluginMessage.h
plugin/mms_plugin/include/MmsPluginStorage.h
plugin/mms_plugin/include/MmsPluginUserAgent.h
plugin/mms_plugin/include/MmsPluginUtil.h [new file with mode: 0755]
plugin/sms_plugin/CMakeLists.txt
plugin/sms_plugin/SmsPluginCallback.cpp
plugin/sms_plugin/SmsPluginCbMsgHandler.cpp
plugin/sms_plugin/SmsPluginConcatHandler.cpp
plugin/sms_plugin/SmsPluginEventHandler.cpp
plugin/sms_plugin/SmsPluginMain.cpp
plugin/sms_plugin/SmsPluginParamCodec.cpp
plugin/sms_plugin/SmsPluginSatHandler.cpp
plugin/sms_plugin/SmsPluginSetting.cpp
plugin/sms_plugin/SmsPluginSimMsg.cpp
plugin/sms_plugin/SmsPluginStorage.cpp
plugin/sms_plugin/SmsPluginTransport.cpp
plugin/sms_plugin/SmsPluginWapPushHandler.cpp
plugin/sms_plugin/include/SmsPluginCallback.h
plugin/sms_plugin/include/SmsPluginCbMsgHandler.h
plugin/sms_plugin/include/SmsPluginConcatHandler.h
plugin/sms_plugin/include/SmsPluginEventHandler.h
plugin/sms_plugin/include/SmsPluginSetting.h
plugin/sms_plugin/include/SmsPluginTransport.h
plugin/sms_plugin/include/SmsPluginTypes.h
proxy/MsgHandleControl.cpp
proxy/MsgHandleFilter.cpp
proxy/MsgHandleStorage.cpp
proxy/MsgProxyListener.cpp
sms-plugin.manifest [new file with mode: 0755]
utils/MsgGconfWrapper.cpp
utils/MsgIpcSocket.cpp
utils/MsgNotificationWrapper.cpp
utils/MsgSpamFilter.cpp
utils/MsgTextConvert.cpp [moved from plugin/sms_plugin/SmsPluginTextConvert.cpp with 81% similarity]
utils/MsgUtilFile.cpp
utils/MsgUtilFunction.cpp
utils/MsgUtilStorage.cpp