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

List:       kde-commits
Subject:    branches/KDE/3.5/kdenetwork/kopete/protocols/groupwise
From:       Will Stephenson <lists () stevello ! free-online ! co ! uk>
Date:       2005-11-09 15:45:13
Message-ID: 1131551113.876770.12975.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 479188 by wstephens:

Fix problem where multiple non-contact list people in a group chat were not shown.  \
Fix reviewed by the GroupWise Revolutionary League.


 M  +8 -12     gwaccount.cpp  
 M  +7 -6      libgroupwise/tasks/joinconferencetask.cpp  


--- branches/KDE/3.5/kdenetwork/kopete/protocols/groupwise/gwaccount.cpp \
#479187:479188 @@ -1245,24 +1245,20 @@
 	// find each contact and add them to the GWMM, and tell them they are in the \
conference  for ( QValueList<QString>::ConstIterator it = participants.begin(); it != \
participants.end(); ++it )  {
+		//kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << " adding participant " << *it \
<< endl;  GroupWiseContact * c = contactForDN( *it );
-		if ( c )
-		{
-			sess->joined( c );
-		}
-		else
-			kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << " couldn't find a contact for \
participant DN: " << *it << endl; +		if ( !c )
+			c = createTemporaryContact( *it );
+		sess->joined( c );	
 	}
 	// add each invitee too
 	for ( QValueList<QString>::ConstIterator it = invitees.begin(); it != \
invitees.end(); ++it )  {
+		//kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << " adding invitee " << *it << \
endl;  GroupWiseContact * c = contactForDN( *it );
-		if ( c )
-		{
-			sess->addInvitee( c );
-		}
-		else
-			kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << " couldn't find a contact for \
invitee DN: " << *it << endl; +		if ( !c )
+			c = createTemporaryContact( *it );
+		sess->addInvitee( c );
 	}
 	sess->view( true )->raise( false );
 }
--- branches/KDE/3.5/kdenetwork/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp \
#479187:479188 @@ -107,7 +107,7 @@
 			if ( m_unknowns.empty() )	// ready to chat
 			{
 				client()->debug( "JoinConferenceTask::finished()" );
-				finished();	
+				finished();
 			}
 			else								// need to get some more details first
 			{
@@ -149,11 +149,12 @@
 		client()->debug( " - finished()" );
 		finished();
 	}
-	else
-	{
-		client()->debug( " - ERROR - we requested details for the list of chat \
participants/invitees, but the server did not send us all the details! - setting \
                finished() anyway, so the chat can take place." );
-		finished();
-	}
+// would be better to count the number of received details and listen to the \
getdetails task's error signal. +//	else
+//	{
+//		client()->debug( " - ERROR - we requested details for the list of chat \
participants/invitees, but the server did not send us all the details! - setting \
finished() anyway, so the chat can take place." ); +//		finished();
+//	}
 }
 
 QStringList JoinConferenceTask::participants() const


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