From: Jerzy Pabich <j.pabich@samsung.com>
Date: Sat, 20 Dec 2014 13:32:43 +0000 (+0900)
Subject: Merge "[Messaging] sendMessage functionality for email messages" into devel/master
X-Git-Tag: submit/tizen_tv/20150603.064601~1^2~767
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d6b0d300f8ff04457ce974679e65e771336e406c;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git

Merge "[Messaging] sendMessage functionality for email messages" into devel/master
---

d6b0d300f8ff04457ce974679e65e771336e406c
diff --cc src/messaging/messaging.gyp
index 272a075b,443b094a..54f0507e
--- a/src/messaging/messaging.gyp
+++ b/src/messaging/messaging.gyp
@@@ -66,24 -58,12 +66,24 @@@
          #'DBus/MessageProxy.h',
          'DBus/Proxy.cpp',
          'DBus/Proxy.h',
-         #'DBus/SendProxy.cpp',
-         #'DBus/SendProxy.h',
+         'DBus/SendProxy.cpp',
+         'DBus/SendProxy.h',
          'DBus/SyncProxy.cpp',
          'DBus/SyncProxy.h',
 -        'message_callback_user_data.cc',
 -        'message_callback_user_data.h'
 +        'MsgCommon/Any.cpp',
 +        'MsgCommon/Any.h',
 +        'MsgCommon/AbstractFilter.cpp',
 +        'MsgCommon/AbstractFilter.h',
 +        'MsgCommon/SortMode.cpp',
 +        'MsgCommon/SortMode.h',
 +        'MsgCommon/AttributeFilter.cpp',
 +        'MsgCommon/AttributeFilter.h',
 +        'MsgCommon/AttributeRangeFilter.cpp',
 +        'MsgCommon/AttributeRangeFilter.h',
 +        'MsgCommon/CompositeFilter.cpp',
 +        'MsgCommon/CompositeFilter.h',
 +        'MsgCommon/FilterIterator.cpp',
 +        'MsgCommon/FilterIterator.h',
        ],
        'includes': [
          '../common/pkg-config.gypi',