BaseConnectionContactsInterface: BaseConnection added as private member.

Contacts interface is closely related to BaseConnection.
Added member is needed for BaseConnectionContactsInterface::getContactByID().

(The same story happend with another mandatory Connection interface:
BaseConnectionRequestsInterface::ensureChannel() requires BaseConnection ptr.)

Author: Kaffeine

TelepathyQt/base-connection.cpp

@@ -927,13 +927,15 @@ void BaseConnectionRequestsInterface::createChannel(const QVariantMap &request,
 // Conn.I.Contacts
 // The BaseConnectionContactsInterface code is fully or partially generated by the TelepathyQt-Generator.
 struct TP_QT_NO_EXPORT BaseConnectionContactsInterface::Private {
-    Private(BaseConnectionContactsInterface *parent)
-        : adaptee(new BaseConnectionContactsInterface::Adaptee(parent))
+    Private(BaseConnectionContactsInterface *parent, BaseConnection *connection)
+        : connection(connection),
+          adaptee(new BaseConnectionContactsInterface::Adaptee(parent))
     {
     }
 
     QStringList contactAttributeInterfaces;
     GetContactAttributesCallback getContactAttributesCB;
+    BaseConnection *connection;
     BaseConnectionContactsInterface::Adaptee *adaptee;
 };
 
@@ -975,9 +977,9 @@ void BaseConnectionContactsInterface::Adaptee::getContactAttributes(const Tp::UI
 /**
  * Class constructor.
  */
-BaseConnectionContactsInterface::BaseConnectionContactsInterface()
+BaseConnectionContactsInterface::BaseConnectionContactsInterface(BaseConnection *connection)
     : AbstractConnectionInterface(TP_QT_IFACE_CONNECTION_INTERFACE_CONTACTS),
-      mPriv(new Private(this))
+      mPriv(new Private(this, connection))
 {
 }
 

TelepathyQt/base-connection.h

@@ -199,15 +199,15 @@ class TP_QT_EXPORT BaseConnectionContactsInterface : public AbstractConnectionIn
     Q_DISABLE_COPY(BaseConnectionContactsInterface)
 
 public:
-    static BaseConnectionContactsInterfacePtr create()
+    static BaseConnectionContactsInterfacePtr create(BaseConnection *connection)
     {
-        return BaseConnectionContactsInterfacePtr(new BaseConnectionContactsInterface());
+        return BaseConnectionContactsInterfacePtr(new BaseConnectionContactsInterface(connection));
     }
     template<typename BaseConnectionContactsInterfaceSubclass>
-    static SharedPtr<BaseConnectionContactsInterfaceSubclass> create()
+    static SharedPtr<BaseConnectionContactsInterfaceSubclass> create(BaseConnection *connection)
     {
         return SharedPtr<BaseConnectionContactsInterfaceSubclass>(
-                new BaseConnectionContactsInterfaceSubclass());
+                new BaseConnectionContactsInterfaceSubclass(connection));
     }
 
     virtual ~BaseConnectionContactsInterface();
@@ -222,7 +222,7 @@ class TP_QT_EXPORT BaseConnectionContactsInterface : public AbstractConnectionIn
     Tp::ContactAttributesMap getContactAttributes(const Tp::UIntList &handles, const QStringList &interfaces, DBusError *error);
 
 protected:
-    BaseConnectionContactsInterface();
+    BaseConnectionContactsInterface(BaseConnection *connection);
 
 private:
     void createAdaptor();