[Telepathy-commits] [telepathy-qt4/master] Revert "Channel: Add contact param to groupSelfContactChanged signal."

[Olli Salli]

This reverts commit 1c99d0be2dafcde0f7634cde73991443af9910fb.

Conflicts:

	TelepathyQt4/Client/channel.cpp
---
 TelepathyQt4/Client/channel.cpp |    8 +++-----
 TelepathyQt4/Client/channel.h   |    2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/TelepathyQt4/Client/channel.cpp b/TelepathyQt4/Client/channel.cpp
index 62987a5..69a9322 100644
--- a/TelepathyQt4/Client/channel.cpp
+++ b/TelepathyQt4/Client/channel.cpp
@@ -835,7 +835,7 @@ void Channel::Private::updateContacts(const QList<QSharedPointer<Contact> > &con
     currentGroupMembersChangedInfo = 0;
 
     if (selfContactUpdated) {
-        emit parent->groupSelfContactChanged(groupSelfContact);
+        emit parent->groupSelfContactChanged();
     }
 
     processMembersChanged();
@@ -1635,11 +1635,9 @@ QSharedPointer<Contact> Channel::groupSelfContact() const
  */
 
 /**
- * \fn void groupSelfContactChanged(const QSharedPointer<Contact> &contact)
+ * \fn void groupSelfContactChanged()
  *
  * Emitted when the value returned by groupSelfContact() changes.
- *
- * \param contact The self contact.
  */
 
 //@}
@@ -2055,7 +2053,7 @@ void Channel::gotContacts(PendingOperation *op)
                 pending->invalidHandles().contains(mPriv->groupSelfHandle)) {
                 warning() << "Unable to retrieve self contact";
                 mPriv->groupSelfContact.clear();
-                emit groupSelfContactChanged(mPriv->groupSelfContact);
+                emit groupSelfContactChanged();
             }
         }
     } else {
diff --git a/TelepathyQt4/Client/channel.h b/TelepathyQt4/Client/channel.h
index a8b5afa..c8227f2 100644
--- a/TelepathyQt4/Client/channel.h
+++ b/TelepathyQt4/Client/channel.h
@@ -164,7 +164,7 @@ Q_SIGNALS:
     void groupHandleOwnersChanged(const HandleOwnerMap &owners,
             const Telepathy::UIntList &added, const Telepathy::UIntList &removed);
 
-    void groupSelfContactChanged(const QSharedPointer<Contact> &contact);
+    void groupSelfContactChanged();
 
 public:
     template <class Interface>
-- 
1.5.6.5