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

List:       kde-commits
Subject:    branches/KDE/3.5/kdenetwork/kopete/protocols/groupwise/libgroupwise/tasks
From:       Will Stephenson <wstephenson () kde ! org>
Date:       2007-11-29 20:00:07
Message-ID: 1196366407.757955.20735.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 743073 by wstephens:

Don't fail to connect if the contact list is entirely empty.


 M  +20 -22    logintask.cpp  


--- branches/KDE/3.5/kdenetwork/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp \
#743072:743073 @@ -75,30 +75,28 @@
 	// CREATE CONTACT LIST
 	// locate contact list
 	Field::MultiField * contactList = loginResponseFields.findMultiField( \
                NM_A_FA_CONTACT_LIST );
-	if ( !contactList )
+	if ( contactList )
 	{
-		setError( Protocol );
-		return true;
+		Field::FieldList contactListFields = contactList->fields();
+		Field::MultiField * container;
+		// read folders
+		for ( Field::FieldListIterator it = contactListFields.find( NM_A_FA_FOLDER );
+				it != contactListFields.end();
+				it = contactListFields.find( ++it, NM_A_FA_FOLDER ) )
+		{
+			container = static_cast<Field::MultiField *>( *it );
+			extractFolder( container );
+		}
+
+		// read contacts
+		for ( Field::FieldListIterator it = contactListFields.find( NM_A_FA_CONTACT );
+				it != contactListFields.end();
+				it = contactListFields.find( ++it, NM_A_FA_CONTACT ) )
+		{
+			container = static_cast<Field::MultiField *>( *it );
+			extractContact( container );
+		}
 	}
-	Field::FieldList contactListFields = contactList->fields();
-	Field::MultiField * container;
-	// read folders
-	for ( Field::FieldListIterator it = contactListFields.find( NM_A_FA_FOLDER );
-		  it != contactListFields.end();
-		  it = contactListFields.find( ++it, NM_A_FA_FOLDER ) )
-	{
-		container = static_cast<Field::MultiField *>( *it );
-		extractFolder( container );
-	}
-		  
-	// read contacts
-	for ( Field::FieldListIterator it = contactListFields.find( NM_A_FA_CONTACT );
-		  it != contactListFields.end();
-		  it = contactListFields.find( ++it, NM_A_FA_CONTACT ) )
-	{
-		container = static_cast<Field::MultiField *>( *it );
-		extractContact( container );
-	}
 
 	extractKeepalivePeriod( loginResponseFields );
 


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