X-Git-Url: http://git.maemo.org/git/?p=vicar;a=blobdiff_plain;f=src%2Fvicar-telepathy%2Fcpp%2Fconnectioninterfacerequestsadaptor.cpp;h=a6642838adc005027b3b28137c1c204bda418df8;hp=3742f9333747e058ee22f94d34cc274a6724b51a;hb=2beca638f4ba146e25320c9c07cc1f29d0b2bba2;hpb=38440679f13b8dc528a9aff93cbf4935011fdb22

diff --git a/src/vicar-telepathy/cpp/connectioninterfacerequestsadaptor.cpp b/src/vicar-telepathy/cpp/connectioninterfacerequestsadaptor.cpp
index 3742f93..a664283 100644
--- a/src/vicar-telepathy/cpp/connectioninterfacerequestsadaptor.cpp
+++ b/src/vicar-telepathy/cpp/connectioninterfacerequestsadaptor.cpp
@@ -16,6 +16,7 @@
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 #include <QtCore/QVariant>
+#include <QDebug>
 
 /*
  * Implementation of adaptor class ConnectionInterfaceRequestsAdaptor
@@ -48,12 +49,22 @@ org::freedesktop::Telepathy::RequestableChannelClassList ConnectionInterfaceRequ
 QDBusObjectPath ConnectionInterfaceRequestsAdaptor::CreateChannel(const QVariantMap &request, QVariantMap &channel_properties)
 {
     // handle method call org.freedesktop.Telepathy.Connection.Interface.Requests.CreateChannel
+<<<<<<< HEAD
+    //This method should return a Channel object path
+    return static_cast<Connection *>(parent())->CreateChannel(request, channel_properties);
+=======
     //return static_cast<YourObjectType *>(parent())->CreateChannel(request, channel_properties);
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
 }
 
 bool ConnectionInterfaceRequestsAdaptor::EnsureChannel(const QVariantMap &request, QDBusObjectPath &channel_object, QVariantMap &channel_properties)
 {
     // handle method call org.freedesktop.Telepathy.Connection.Interface.Requests.EnsureChannel
+<<<<<<< HEAD
+    //This method should return a Channel object path
+    return static_cast<Connection *>(parent())->EnsureChannel(request, channel_object, channel_properties);
+=======
     //return static_cast<YourObjectType *>(parent())->EnsureChannel(request, channel_object, channel_properties);
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
 }