telepathy-qt: Update changes from Channel_Dispatcher_Future

[Dario Freddi]

Module: telepathy-qt
Branch: master
Commit: 6823281506d8e063e43e6ecd0ae071b48758f90c
URL:    http://cgit.freedesktop.org/telepathy/telepathy-qt/commit/?id=6823281506d8e063e43e6ecd0ae071b48758f90c

Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Jan 19 20:19:42 2014 +0100

Update changes from Channel_Dispatcher_Future

---

 TelepathyQt/channel-dispatcher.xml        |   14 ++++++++++++++
 TelepathyQt/contact-messenger.cpp         |    7 +++----
 TelepathyQt/future-channel-dispatcher.xml |   12 ------------
 tools/manager-file.py                     |    1 +
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/TelepathyQt/channel-dispatcher.xml b/TelepathyQt/channel-dispatcher.xml
index a1588a4..c2b4332 100644
--- a/TelepathyQt/channel-dispatcher.xml
+++ b/TelepathyQt/channel-dispatcher.xml
@@ -6,4 +6,18 @@
 
 <xi:include href="../spec/Channel_Dispatcher.xml"/>
 
+<xi:include href="../spec/Channel_Dispatcher_Interface_Messages1.xml"/>
+
+<tp:generic-types>
+  <tp:external-type name="Message_Part" type="a{sv}" from="Telepathy specification"/>
+  <tp:mapping name="Message_Part" array-name="Message_Part_List" array-depth="2">
+    <tp:member name="Key" type="s"/>
+    <tp:member name="Value" type="v"/>
+  </tp:mapping>
+</tp:generic-types>
+
+<xi:include href="../spec/generic-types.xml"/>
+<xi:include href="../spec/errors.xml"/>
+
+
 </tp:spec>
diff --git a/TelepathyQt/contact-messenger.cpp b/TelepathyQt/contact-messenger.cpp
index fdb5608..1f34f4b 100644
--- a/TelepathyQt/contact-messenger.cpp
+++ b/TelepathyQt/contact-messenger.cpp
@@ -55,22 +55,21 @@ struct TP_QT_NO_EXPORT ContactMessenger::Private
     AccountPtr account;
     QString contactIdentifier;
     SimpleTextObserverPtr observer;
-    TpFuture::Client::ChannelDispatcherInterfaceMessagesInterface *cdMessagesInterface;
+    Tp::Client::ChannelDispatcherInterfaceMessages1Interface *cdMessagesInterface;
 };
 
 PendingSendMessage *ContactMessenger::Private::sendMessage(const Message &message,
         MessageSendingFlags flags)
 {
     if (!cdMessagesInterface) {
-        cdMessagesInterface = new TpFuture::Client::ChannelDispatcherInterfaceMessagesInterface(
+        cdMessagesInterface = new Tp::Client::ChannelDispatcherInterfaceMessages1Interface(
                 account->dbusConnection(),
                 TP_QT_CHANNEL_DISPATCHER_BUS_NAME, TP_QT_CHANNEL_DISPATCHER_OBJECT_PATH, parent);
     }
 
     PendingSendMessage *op = new PendingSendMessage(ContactMessengerPtr(parent), message);
 
-    // TODO: is there a way to avoid this? Ideally TpFuture classes should use Tp types.
-    TpFuture::MessagePartList parts;
+    Tp::MessagePartList parts;
     foreach (const Tp::MessagePart &part, message.parts()) {
         parts << static_cast<QMap<QString, QDBusVariant> >(part);
     }
diff --git a/TelepathyQt/future-channel-dispatcher.xml b/TelepathyQt/future-channel-dispatcher.xml
index 0e7f67c..091637d 100644
--- a/TelepathyQt/future-channel-dispatcher.xml
+++ b/TelepathyQt/future-channel-dispatcher.xml
@@ -4,17 +4,5 @@
 
 <tp:title>Channel Dispatcher extensions from the future</tp:title>
 
-<xi:include href="../spec/Channel_Dispatcher_Interface_Messages.xml"/>
-
-<tp:generic-types>
-  <tp:external-type name="Message_Part" type="a{sv}" from="Telepathy specification"/>
-  <tp:mapping name="Message_Part" array-name="Message_Part_List" array-depth="2">
-    <tp:member name="Key" type="s"/>
-    <tp:member name="Value" type="v"/>
-  </tp:mapping>
-</tp:generic-types>
-
-<xi:include href="../spec/generic-types.xml"/>
-<xi:include href="../spec/errors.xml"/>
 
 </tp:spec>
diff --git a/tools/manager-file.py b/tools/manager-file.py
index 45f6404..d873014 100644
--- a/tools/manager-file.py
+++ b/tools/manager-file.py
@@ -25,6 +25,7 @@
 
 import re
 import sys
+import os
 
 _NOT_C_STR = re.compile(r'[^A-Za-z0-9_-]')