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

List:       kde-commits
Subject:    kdenonbeta/kopete/libkopete
From:       Jason Keirstead <jason () keirstead ! org>
Date:       2003-02-01 0:24:33
[Download RAW message or body]

CVS commit by brunes: 

Reverting this bugfix since it is causing crash on exit (much worse)


  M +1 -2      kopetecontact.cpp   1.78
  M +1 -5      kopetemetacontact.cpp   1.110


--- kdenonbeta/kopete/libkopete/kopetecontact.cpp  #1.77:1.78
@@ -316,4 +316,5 @@ void KopeteContact::setMetaContact( Kope
 {
         KopeteMetaContact *old = m_metaContact;
+        m_metaContact->removeContact( this );
         m->addContact( this );
 
@@ -327,6 +328,4 @@ void KopeteContact::setMetaContact( Kope
         m_metaContact = m;
 
-        old->removeContact( this );
-        
         // Reconnect signals to the new meta contact
         disconnect( old, SIGNAL( aboutToSave( KopeteMetaContact * ) ),

--- kdenonbeta/kopete/libkopete/kopetemetacontact.cpp  #1.109:1.110
@@ -195,8 +195,4 @@ void KopeteMetaContact::removeContact(Ko
                 emit contactRemoved(c);
         }
-        
-        if( m_contacts.count() == 0 )
-                KopeteContactList::contactList()->removeMetaContact( this );
-        else
                 updateOnlineStatus();
 }


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