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

List:       kde-commits
Subject:    kdenonbeta/kopete/protocols/icq_new
From:       Stefan Gehn <sgehn () gmx ! net>
Date:       2003-01-30 20:34:30
[Download RAW message or body]

CVS commit by metz: 

Don't understand how naming should work between kopetecontact and kopetemetacontact, \
I just change icq to set the uin as MC-displayname, nothing more.


  M +5 -1      icqcontact.cpp   1.89
  M +4 -5      icqprotocol.cpp   1.94


--- kdenonbeta/kopete/protocols/icq_new/icqcontact.cpp  #1.88:1.89
@@ -625,12 +625,16 @@ void ICQContact::infoUpdated(int type)
         }
 */
+/*
         if ( QString(mUser->Alias.c_str()).isEmpty() && \
!QString(mUser->Nick.c_str()).isEmpty() )  {
                 setDisplayName(QString::fromLocal8Bit(mUser->Nick.c_str()));
         }
-
+*/
         if ( type == EVENT_SUBTYPE_FULLINFO )
         {
                 kdDebug(14110) << k_funcinfo << "Got FULL info about '" << \
displayName() << "'(" << uin() << ") [" << mUser->GrpId << "]" << endl; +             \
QString newNick = QString::fromLocal8Bit(mUser->Nick.c_str()); +                if ( \
displayName() != newNick ) // contact changed his nickname +                        \
setDisplayName(newNick);  emit updatedInfoFull();
         }

--- kdenonbeta/kopete/protocols/icq_new/icqprotocol.cpp  #1.93:1.94
@@ -210,8 +210,7 @@ bool ICQProtocol::addContactToMetaContac
                 KopeteMetaContact *parentContact )
 {
-        //NOTE: When Server-side groups are implimented, do not add group to server \
if +        //TODO: When Server-side groups are implemented, do not add group to \
server if  //temporary contact!
-        
-        kdDebug(14110) << "[ICQProtocol] addContactToMetaContact for UIN: " << \
contactId << endl; +        kdDebug(14110) << k_funcinfo<< "[ICQProtocol] contactId=" \
<< contactId << ", displayName=" << displayName << endl;  
         ICQContact *newContact = static_cast<ICQContact*>( contacts()[ contactId ] \
); @@ -385,5 +384,5 @@ void ICQProtocol::slotEvent(ICQEvent *e)
                                                         {
                                                                 kdDebug(14110) << \
                "[ICQProtocol] Normal/URL/Web/Email Message from UNKNOWN (" << uin << \
                ")" << endl;
-                                                                addContact( \
QString::number(uin), QString::null, 0L, QString::null, true); //add a temporary \
contact +                                                                addContact( \
QString::number(uin), QString::number(uin), 0L, QString::null, true); //add a \
                temporary contact
                                                                 c = \
static_cast<ICQContact*>( contacts()[ QString::number( uin ) ] ); // try again  if \
(c)


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