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

diff --cc src/messaging/email_manager.cc
Simple merge

diff --cc src/messaging/email_manager.h
Simple merge

diff --cc src/messaging/messaging.gyp
index 272a075be8fe693b6f09da31851f2150b84577e4,443b094a7d0bb6aa7683f00eff4e4a6d06e34046..54f0507e4ece87f51f211ab24e2e78990d7bfbcd
--- 1/src/messaging/messaging.gyp
--- 2/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',

diff --cc src/messaging/messaging_api.js
Simple merge

diff --cc src/messaging/messaging_instance.cc
Simple merge

diff --cc src/messaging/messaging_util.cc
Simple merge