[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenonbeta/kopete/protocols/oscar
From:       Olivier Goffart <ogoffart () tiscalinet ! be>
Date:       2003-06-30 18:11:38
[Download RAW message or body]

CVS commit by ogoffart: 


it seems more significant, since contactDestroyed is called in ~KopeteContact

mETz: please check


  M +2 -9      oscarcontact.cpp   1.98
  M +0 -2      oscarcontact.h   1.52


--- kdenonbeta/kopete/protocols/oscar/oscarcontact.cpp  #1.97:1.98
@@ -123,8 +123,5 @@ void OscarContact::initSignals()
                 KopeteTransferManager::transferManager(), SIGNAL(refused(const \
                KopeteFileTransferInfo &)),
                 this, SLOT(slotTransferDenied(const KopeteFileTransferInfo &)));
-        // When the contact is being removed (whether from a group or not)
-        QObject::connect(
-                this, SIGNAL(contactDestroyed(KopeteContact *)),
-                this, SLOT(slotContactDestroyed(KopeteContact *)));
+
         // When a group in the contact list is being removed, we're notified
         QObject::connect(
@@ -138,4 +135,5 @@ OscarContact::~OscarContact()
 {
 //      kdDebug(14150) << k_funcinfo << "Called for '" << mName << "'" << endl;
+        slotDeleteContact();
 }
 
@@ -246,9 +244,4 @@ void OscarContact::slotDeleteContact()
         mAccount->engine()->sendDelBuddy(mListContact->screenname(),group->name());
         deleteLater();
-}
-
-void OscarContact::slotContactDestroyed(KopeteContact * /* contact */ )
-{
-        slotDeleteContact();
 }
 

--- kdenonbeta/kopete/protocols/oscar/oscarcontact.h  #1.51:1.52
@@ -182,6 +182,4 @@ class OscarContact : public KopeteContac
                 void slotTransferBegun(OscarConnection *con, const QString& file,
                         const unsigned long size, const QString &recipient);
-                /** Called when a contact is being destroyed */
-                void slotContactDestroyed( KopeteContact *c );
                 /** Called when a contact from the Kopete contact list has been \
removed */  void slotGroupRemoved( KopeteGroup * );


[prev in list] [next in list] [prev in thread] [next in thread]