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

List:       kopete-devel
Subject:    Re: [Kopete-devel] Misc info re: 0.6 release and showstoppers
From:       Stefan Gehn <sgehn () gmx ! net>
Date:       2003-01-30 18:21:38
[Download RAW message or body]

Again me,

On Donnerstag Januar 30 2003 18:26, Stefan Gehn wrote:
> I'm trying to fix this on the ICQ-level, will post a diff to the lists when
> done.

Patch attached.
At least the MC is now getting the UIN as displayName(). Too bad when the 
nickname arrives from the icq-server the MC already refuses nickname updates 
from the Contact (but I think it was like that before).

Bye, Stefan aka mETz
-- 
sgehn_AT_gmx.net | ICQ#51123152 | Moege der Pinguin mit euch sein

["ICQ.nickname-on-new-contacts.patch" (text/x-diff)]

? ICQ.nickname-on-new-contacts.patch
Index: icqcontact.cpp
===================================================================
RCS file: /home/kde/kdenonbeta/kopete/protocols/icq_new/icqcontact.cpp,v
retrieving revision 1.88
diff -u -3 -p -r1.88 icqcontact.cpp
--- icqcontact.cpp	29 Jan 2003 21:33:03 -0000	1.88
+++ icqcontact.cpp	30 Jan 2003 18:14:00 -0000
@@ -624,14 +624,18 @@ void ICQContact::infoUpdated(int type)
 		kdDebug(14110) << "[ICQContact] infoUpdated() NO GROUP for " << displayName() << \
"(" << mUser->Uin << ")" << endl;  }
 */
+/*
 	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();
 	}
 	else if ( type == EVENT_SUBTYPE_AUTOREPLY )
Index: icqprotocol.cpp
===================================================================
RCS file: /home/kde/kdenonbeta/kopete/protocols/icq_new/icqprotocol.cpp,v
retrieving revision 1.93
diff -u -3 -p -r1.93 icqprotocol.cpp
--- icqprotocol.cpp	29 Jan 2003 21:33:03 -0000	1.93
+++ icqprotocol.cpp	30 Jan 2003 18:14:00 -0000
@@ -209,11 +209,10 @@ void ICQProtocol::deserializeContact( Ko
 bool ICQProtocol::addContactToMetaContact( const QString &contactId, const QString \
&displayName,  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 ] );
 	if( newContact )
 		parentContact->addContact( newContact );
@@ -384,7 +383,7 @@ void ICQProtocol::slotEvent(ICQEvent *e)
 							if (!mPrefs->rejNotOnList())
 							{
 								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)
 									c->newMessage(message);


_______________________________________________
Kopete-devel mailing list
Kopete-devel@mail.kde.org
http://mail.kde.org/mailman/listinfo/kopete-devel

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