CVS commit by metz: changed debugging-statements, added proper KopeteContact::rename(), restricted password editfield to 8 chars (the max length of a icq-pw) M +6 -3 icqcontact.cpp 1.90 M +9 -3 icqprotocol.cpp 1.95 M +3 -0 ui/prflogintabwidget.ui 1.2 --- kdenonbeta/kopete/protocols/icq_new/icqcontact.cpp #1.89:1.90 @@ -823,5 +823,6 @@ void ICQContact::slotUpdateNickname(cons void ICQContact::slotDeletingGroup(const QString &groupName) { - kdDebug(14110) << k_funcinfo << "called." << endl; + kdDebug(14110) << k_funcinfo << "called for user " << displayName() << + "(" << uin() << ") [" << mUser->GrpId << "]" << endl; ICQUser *u = static_cast( protocol() )->engine()->getUser(mUser->Uin, false); @@ -842,7 +843,9 @@ void ICQContact::slotDeletingGroup(const } -void ICQContact::rename( const QString &/*newName*/ ) +void ICQContact::rename( const QString &newName ) { - // ignore stupid crap + kdDebug(14110) << k_funcinfo << "called. newName=" << newName << endl; + static_cast( protocol() )->engine()->renameUser(mUser, newName.local8Bit() ); +// setDisplayName(newName); } --- kdenonbeta/kopete/protocols/icq_new/icqprotocol.cpp #1.94:1.95 @@ -212,11 +212,17 @@ bool ICQProtocol::addContactToMetaContac //TODO: When Server-side groups are implemented, do not add group to server if //temporary contact! - kdDebug(14110) << k_funcinfo<< "[ICQProtocol] contactId=" << contactId << ", displayName=" << displayName << endl; + kdDebug(14110) << k_funcinfo<< "contactId=" << contactId << ", displayName=" << displayName << endl; ICQContact *newContact = static_cast( contacts()[ contactId ] ); if( newContact ) + { + kdDebug() << k_funcinfo << "adding already existing ICQContact to MetaContact" << endl; parentContact->addContact( newContact ); + } else + { + kdDebug() << k_funcinfo << "creating new ICQContact in MetaContact" << endl; newContact = new ICQContact( contactId, displayName, parentContact->groups().toStringList(), this, parentContact ); + } return (newContact != 0L); @@ -1008,5 +1014,5 @@ bool ICQProtocol::isAway(void) const void ICQProtocol::slotUpdatedSettings() { - kdDebug(14110) << "[ICQProtocol] slotUpdatedSettings()" << endl; +// kdDebug(14110) << k_funcinfo << "called." << endl; ICQUser *mySelf = myContact->mUser; @@ -1066,5 +1072,5 @@ void ICQProtocol::slotUpdatedSettings() mEngine->setSecurityInfo(mPrefs->auth(), mPrefs->webAware()); - kdDebug(14110) << "[ICQProtocol] END slotUpdatedSettings()" << endl; +// kdDebug(14110) << "[ICQProtocol] END slotUpdatedSettings()" << endl; emit settingsChanged(); } --- kdenonbeta/kopete/protocols/icq_new/ui/prflogintabwidget.ui #1.1:1.2 @@ -109,4 +109,7 @@ mPass + + 8 + Password