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

List:       kde-commits
Subject:    branches/KDE/3.5/kdenetwork/kopete/kopete
From:       Tommi Rantala <tommi.rantala () cs ! helsinki ! fi>
Date:       2005-11-06 15:29:35
Message-ID: 1131290975.299715.26296.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 478347 by rantala:

Apply for KDE 3.5 also.

CCBUG: 115754 
 
Fix comma-separated list for the --autoconnect option, for example 

$ kopete --autoconnect EFNet --autoconnect Freenode,EUIrc 

connect accounts 'EFNet', 'Freenode' and 'EUIrc' instead of 'EFNet' 
and 'Freenode,EUIrc'. 



 M  +17 -5     kopeteapplication.cpp  


--- branches/KDE/3.5/kdenetwork/kopete/kopete/kopeteapplication.cpp #478346:478347
@@ -214,20 +214,32 @@
 	if ( args->isSet( "connect" )  && KopetePrefs::prefs()->autoConnect() )
 		Kopete::AccountManager::self()->connectAll();
 
-	QCStringList connectArgs = args->getOptionList( "autoconnect" );
-	for ( QCStringList::ConstIterator i = connectArgs.begin(); i != connectArgs.end(); ++i )
+
+	// Handle things like '--autoconnect foo,bar --autoconnect foobar'
+	QCStringList connectArgsC = args->getOptionList( "autoconnect" );
+	QStringList connectArgs;
+
+	for ( QCStringList::ConstIterator it = connectArgsC.begin(); it != connectArgsC.end(); ++it )
 	{
-		QString id = QString::fromLatin1( *i );
+		QStringList split = QStringList::split( ',', QString::fromLatin1( *it ) );
 
+		for ( QStringList::ConstIterator it2 = split.begin(); it2 != split.end(); ++it2 )
+		{
+			connectArgs.append( *it2 );
+		}
+	}
+	
+	for ( QStringList::ConstIterator i = connectArgs.begin(); i != connectArgs.end(); ++i )
+	{
 		QRegExp rx( QString::fromLatin1( "([^\\|]*)\\|\\|(.*)" ) );
-		rx.search( id );
+		rx.search( *i );
 		QString protocolId = rx.cap( 1 );
 		QString accountId = rx.cap( 2 );
 
 		if ( accountId.isEmpty() )
 		{
 			if ( protocolId.isEmpty() )
-				accountId = id;
+				accountId = *i;
 			else
 				continue;
 		}
[prev in list] [next in list] [prev in thread] [next in thread]