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

List:       kde-commits
Subject:    kdenetwork/kopete/protocols/oscar
From:       Matt Rogers <mattr () kde ! org>
Date:       2005-01-27 5:20:02
Message-ID: 20050127052002.D4BD81CF2B () office ! kde ! org
[Download RAW message or body]

CVS commit by mattr: 

Make sure we set updated SSI items when getting the contact list from the
server and don't attempt to add contacts if we don't need to (i.e. we've
already deserialized them)


  M +8 -1      oscaraccount.cpp   1.164
  M +10 -0     aim/aimcontact.cpp   1.68
  M +1 -1      aim/aimcontact.h   1.25


--- kdenetwork/kopete/protocols/oscar/oscaraccount.cpp  #1.163:1.164
@@ -178,4 +178,11 @@ void OscarAccount::slotGotSSIList()
                 kdDebug( OSCAR_GEN_DEBUG ) << k_funcinfo << "Adding contact '" << ( \
*bit ).name() << "' to kopete list in group " <<  group->displayName() << endl;
+                OscarContact* oc = dynamic_cast<OscarContact*>( contacts()[( *bit \
).name()] ); +                if ( oc )
+                {
+                        Oscar::SSI item = ( *bit );
+                        oc->setSSIItem( item );
+                }
+                else
                 addContact( ( *bit ).name(), QString::null, group, \
Kopete::Account::DontChangeKABC );  }

--- kdenetwork/kopete/protocols/oscar/aim/aimcontact.cpp  #1.67:1.68
@@ -124,4 +124,14 @@ int AIMContact::warningLevel() const
 }
 
+void AIMContact::updateSSIItem()
+{
+        if ( m_ssiItem.type() != 0xFFFF && m_ssiItem.waitingAuth() == false &&
+             onlineStatus() == Kopete::OnlineStatus::Unknown )
+        {
+                //make sure they're offline
+                setOnlineStatus( static_cast<AIMProtocol*>( protocol() \
)->statusOffline ); +        }
+}
+
 void AIMContact::slotUserInfo()
 {

--- kdenetwork/kopete/protocols/oscar/aim/aimcontact.h  #1.24:1.25
@@ -54,5 +54,5 @@ public:
 
 public slots:
-        void updateSSIItem() {};
+        void updateSSIItem();
         void slotUserInfo();
         void userInfoUpdated( const QString& contact, const UserDetails& details );


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