SOURCES: kdenetwork-branch.diff, kdepim-branch.diff, kdebase-branc...

arekm arekm at pld-linux.org
Sat Nov 18 01:34:27 CET 2006 

Author: arekm                        Date: Sat Nov 18 00:34:27 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   kdenetwork-branch.diff (1.17 -> 1.18) , kdepim-branch.diff (1.30 -> 1.31) , kdebase-branch.diff (1.44 -> 1.45) , kdelibs-branch.diff (1.42 -> 1.43) 

---- Diffs:

================================================================
Index: SOURCES/kdenetwork-branch.diff
diff -u SOURCES/kdenetwork-branch.diff:1.17 SOURCES/kdenetwork-branch.diff:1.18
--- SOURCES/kdenetwork-branch.diff:1.17	Sun Oct 29 19:19:23 2006
+++ SOURCES/kdenetwork-branch.diff	Sat Nov 18 01:34:21 2006
@@ -1,7 +1,7 @@
 Index: krfb/kinetd/eventsrc
 ===================================================================
---- krfb/kinetd/eventsrc	(.../tags/KDE/3.5.5/kdenetwork)	(revision 600145)
-+++ krfb/kinetd/eventsrc	(.../branches/KDE/3.5/kdenetwork)	(revision 600145)
+--- krfb/kinetd/eventsrc	(.../tags/KDE/3.5.5/kdenetwork)	(revision 605721)
++++ krfb/kinetd/eventsrc	(.../branches/KDE/3.5/kdenetwork)	(revision 605721)
 @@ -80,7 +80,7 @@
  Comment[es]=Recibida conexiĂłn entrante
  Comment[et]=Saadi sissetulev Ăźhendus
@@ -13,8 +13,8 @@
  Comment[gl]=RecibĂ­use unha conexiĂłn entrante
 Index: lanbrowsing/kcmlisa/kcmkiolan.desktop
 ===================================================================
---- lanbrowsing/kcmlisa/kcmkiolan.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 600145)
-+++ lanbrowsing/kcmlisa/kcmkiolan.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 600145)
+--- lanbrowsing/kcmlisa/kcmkiolan.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 605721)
++++ lanbrowsing/kcmlisa/kcmkiolan.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 605721)
 @@ -21,7 +21,6 @@
  Name[es]=Esclavo de LAN KIO
  Name[et]=KohtvĂľrgu KIO moodul
@@ -34,8 +34,8 @@
  Comment[ga]=CumraĂ­ocht lan: agus rlan:
 Index: lanbrowsing/kcmlisa/kcmlisa.desktop
 ===================================================================
---- lanbrowsing/kcmlisa/kcmlisa.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 600145)
-+++ lanbrowsing/kcmlisa/kcmlisa.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 600145)
+--- lanbrowsing/kcmlisa/kcmlisa.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 605721)
++++ lanbrowsing/kcmlisa/kcmlisa.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 605721)
 @@ -9,7 +9,6 @@
  X-KDE-FactoryName=lisa
  
@@ -55,8 +55,8 @@
  Comment[ga]=Cumraigh LISa
 Index: kdnssd/kdedmodule/dnssdwatcher.desktop
 ===================================================================
---- kdnssd/kdedmodule/dnssdwatcher.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 600145)
-+++ kdnssd/kdedmodule/dnssdwatcher.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 600145)
+--- kdnssd/kdedmodule/dnssdwatcher.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 605721)
++++ kdnssd/kdedmodule/dnssdwatcher.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 605721)
 @@ -51,7 +51,7 @@
  Comment[es]=Vigila los servicios DNS-SD y actualiza los listados de directorio
  Comment[et]=Jälgib DNS-SD teenuseid ja uuendab kataloogide nimekirju
@@ -68,8 +68,8 @@
  Comment[gl]=Deixa constancia dos servicios DNS-SD e anova as listaxes de directorios
 Index: kopete/plugins/nowlistening/nowlisteningplugin.cpp
 ===================================================================
---- kopete/plugins/nowlistening/nowlisteningplugin.cpp	(.../tags/KDE/3.5.5/kdenetwork)	(revision 600145)
-+++ kopete/plugins/nowlistening/nowlisteningplugin.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 600145)
+--- kopete/plugins/nowlistening/nowlisteningplugin.cpp	(.../tags/KDE/3.5.5/kdenetwork)	(revision 605721)
++++ kopete/plugins/nowlistening/nowlisteningplugin.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 605721)
 @@ -308,7 +308,7 @@
  				{
  					// Check for the now listening message in parenthesis, 
@@ -95,8 +95,8 @@
  					else
 Index: kopete/plugins/alias/kopete_alias.desktop
 ===================================================================
---- kopete/plugins/alias/kopete_alias.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 600145)
-+++ kopete/plugins/alias/kopete_alias.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 600145)
+--- kopete/plugins/alias/kopete_alias.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 605721)
++++ kopete/plugins/alias/kopete_alias.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 605721)
 @@ -24,7 +24,7 @@
  Name[cy]=Ffugenw
  Name[el]=Î‘Î˝Ď„ÎšĎƒĎ„ÎżÎšĎ‡ÎŻÎą
@@ -115,10 +115,45 @@
  Comment[fi]=Lisää uusia nimiä komennoille
  Comment[fr]=Ajoute des alias personnalisĂŠs Ă  des commandes
  Comment[gl]=Engadir alias persoĂĄis para comandos
+Index: kopete/plugins/alias/aliaspreferences.cpp
+===================================================================
+--- kopete/plugins/alias/aliaspreferences.cpp	(.../tags/KDE/3.5.5/kdenetwork)	(revision 605721)
++++ kopete/plugins/alias/aliaspreferences.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 605721)
+@@ -290,6 +290,19 @@
+ 
+ 	aliasMap.insert( alias, new AliasItem( preferencesDialog->aliasList, id, alias, command, p ) );
+ 
++	// count the number of arguments present in 'command'
++	QRegExp rx( "(%\\d+)" );
++	QStringList list;
++	int pos = 0;
++	while ( pos >= 0 ) {
++		pos = rx.search( command, pos );
++		if ( pos > -1 ) {
++			list += rx.cap( 1 );
++			pos  += rx.matchedLength();
++		}
++	}
++	int argc = list.count();
++
+ 	for( ProtocolList::ConstIterator it = p.begin(); it != p.end(); ++it )
+ 	{
+ 		Kopete::CommandHandler::commandHandler()->registerAlias(
+@@ -297,7 +310,9 @@
+ 			alias,
+ 			command,
+ 			QString::fromLatin1("Custom alias for %1").arg(command),
+-			Kopete::CommandHandler::UserAlias
++			Kopete::CommandHandler::UserAlias,
++			0,
++			argc
+ 		);
+ 
+ 		protocolMap.insert( QPair<Kopete::Protocol*,QString>( *it, alias ), true );
 Index: kopete/plugins/alias/kopete_alias_config.desktop
 ===================================================================
---- kopete/plugins/alias/kopete_alias_config.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 600145)
-+++ kopete/plugins/alias/kopete_alias_config.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 600145)
+--- kopete/plugins/alias/kopete_alias_config.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 605721)
++++ kopete/plugins/alias/kopete_alias_config.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 605721)
 @@ -20,7 +20,7 @@
  Name[cy]=Ffugenw
  Name[el]=Î‘Î˝Ď„ÎšĎƒĎ„ÎżÎšĎ‡ÎŻÎą
@@ -137,10 +172,38 @@
  Comment[fi]=Lisää uusia nimiä komennoille
  Comment[fr]=Ajoute des alias personnalisĂŠs Ă  des commandes
  Comment[gl]=Engadir alias persoĂĄis para comandos
+Index: kopete/plugins/statistics/statisticsdialog.cpp
+===================================================================
+--- kopete/plugins/statistics/statisticsdialog.cpp	(.../tags/KDE/3.5.5/kdenetwork)	(revision 605721)
++++ kopete/plugins/statistics/statisticsdialog.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 605721)
+@@ -54,6 +54,7 @@
+ 	QHBox *hbox = new QHBox(this);
+ 	
+ 	generalHTMLPart = new KHTMLPart(hbox);
++        generalHTMLPart->setOnlyLocalReferences(true);
+ 	connect ( generalHTMLPart->browserExtension(), SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ),
+ 			  this, SLOT( slotOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) );
+ 	
+Index: kopete/plugins/cryptography/cryptographyplugin.cpp
+===================================================================
+--- kopete/plugins/cryptography/cryptographyplugin.cpp	(.../tags/KDE/3.5.5/kdenetwork)	(revision 605721)
++++ kopete/plugins/cryptography/cryptographyplugin.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 605721)
+@@ -58,8 +58,9 @@
+ 	if( !pluginStatic_ )
+ 		pluginStatic_=this;
+ 
+-	m_inboundHandler = new Kopete::SimpleMessageHandlerFactory( Kopete::Message::Inbound,
+-		Kopete::MessageHandlerFactory::InStageToSent, this, SLOT( slotIncomingMessage( Kopete::Message& ) ) );
++	m_inboundHandler = 0;
++/*	m_inboundHandler = new Kopete::SimpleMessageHandlerFactory( Kopete::Message::Inbound,
++		Kopete::MessageHandlerFactory::InStageToSent, this, SLOT( slotIncomingMessage( Kopete::Message& ) ) );*/
+ 	connect( Kopete::ChatSessionManager::self(),
+ 		SIGNAL( aboutToSend( Kopete::Message & ) ),
+ 		SLOT( slotOutgoingMessage( Kopete::Message & ) ) );
 Index: kopete/plugins/cryptography/kopete_cryptography_config.desktop
 ===================================================================
---- kopete/plugins/cryptography/kopete_cryptography_config.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 600145)
-+++ kopete/plugins/cryptography/kopete_cryptography_config.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 600145)
+--- kopete/plugins/cryptography/kopete_cryptography_config.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 605721)
++++ kopete/plugins/cryptography/kopete_cryptography_config.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 605721)
 @@ -78,7 +78,7 @@
  Comment[es]=Cifra mensajes usando PGP
  Comment[et]=SĂľnumite krĂźptimine PGP abil
@@ -152,8 +215,8 @@
  Comment[gl]=Encripta mensaxes con PGP
 Index: kopete/plugins/cryptography/kopete_cryptography.desktop
 ===================================================================
---- kopete/plugins/cryptography/kopete_cryptography.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 600145)
-+++ kopete/plugins/cryptography/kopete_cryptography.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 600145)
+--- kopete/plugins/cryptography/kopete_cryptography.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 605721)
++++ kopete/plugins/cryptography/kopete_cryptography.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 605721)
 @@ -82,7 +82,7 @@
  Comment[es]=Cifra y descifra mensajes con GPG
  Comment[et]=SĂľnumite krĂźptimine ja lahtikrĂźptimine GPG abil
@@ -165,8 +228,8 @@
  Comment[gl]=Encriptar e desencriptar mensaxes con GPG
 Index: kopete/plugins/netmeeting/kopete_netmeeting_config.desktop
 ===================================================================
---- kopete/plugins/netmeeting/kopete_netmeeting_config.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 600145)
-+++ kopete/plugins/netmeeting/kopete_netmeeting_config.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 600145)
+--- kopete/plugins/netmeeting/kopete_netmeeting_config.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 605721)
++++ kopete/plugins/netmeeting/kopete_netmeeting_config.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 605721)
 @@ -38,7 +38,7 @@
  Comment[es]=Voz y video con MSN Messenger
  Comment[et]=Audio ja video kasutamine MSN Messengeriga
@@ -178,8 +241,8 @@
  Comment[gl]=Voz e video con MSN Messenger
 Index: kopete/plugins/netmeeting/kopete_netmeeting.desktop
 ===================================================================
---- kopete/plugins/netmeeting/kopete_netmeeting.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 600145)
-+++ kopete/plugins/netmeeting/kopete_netmeeting.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 600145)
+--- kopete/plugins/netmeeting/kopete_netmeeting.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 605721)
++++ kopete/plugins/netmeeting/kopete_netmeeting.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 605721)
 @@ -42,7 +42,7 @@
  Comment[es]=Voz y video con MSN Messenger
  Comment[et]=Audio ja video kasutamine MSN Messengeriga
@@ -191,8 +254,8 @@
  Comment[gl]=Voz e video con MSN Messenger
 Index: kopete/plugins/texteffect/kopete_texteffect.desktop
 ===================================================================
---- kopete/plugins/texteffect/kopete_texteffect.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 600145)
-+++ kopete/plugins/texteffect/kopete_texteffect.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 600145)
+--- kopete/plugins/texteffect/kopete_texteffect.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 605721)
++++ kopete/plugins/texteffect/kopete_texteffect.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 605721)
 @@ -28,7 +28,7 @@
  Name[es]=Efecto de texto
  Name[et]=Tekstiefektid
@@ -204,8 +267,8 @@
  Name[ga]=MaisĂ­ocht TĂŠacs
 Index: kopete/plugins/texteffect/kopete_texteffect_config.desktop
 ===================================================================
---- kopete/plugins/texteffect/kopete_texteffect_config.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 600145)
-+++ kopete/plugins/texteffect/kopete_texteffect_config.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 600145)
+--- kopete/plugins/texteffect/kopete_texteffect_config.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 605721)
++++ kopete/plugins/texteffect/kopete_texteffect_config.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 605721)
 @@ -24,7 +24,7 @@
  Name[es]=Efecto de texto
  Name[et]=Tekstiefektid
@@ -215,10 +278,45 @@
  Name[fi]=Tekstitehoste
  Name[fr]=Effets de texte
  Name[ga]=MaisĂ­ocht TĂŠacs
+Index: kopete/plugins/history/converter.cpp
+===================================================================
+--- kopete/plugins/history/converter.cpp	(.../tags/KDE/3.5.5/kdenetwork)	(revision 605721)
++++ kopete/plugins/history/converter.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 605721)
+@@ -167,7 +167,7 @@
+ 
+ 								while ( strchr(cbuf, '\n') == NULL && !feof(f) )
+ 								{
+-									fgets( cbuf, 511, f );
++									fgets( cbuf, CBUFLENGTH, f );
+ 									buffer += QString::fromUtf8(cbuf);
+ 								}
+ 								msgBlock.append(buffer);
+Index: kopete/plugins/history/historydialog.cpp
+===================================================================
+--- kopete/plugins/history/historydialog.cpp	(.../tags/KDE/3.5.5/kdenetwork)	(revision 605721)
++++ kopete/plugins/history/historydialog.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 605721)
+@@ -146,6 +146,7 @@
+ 	mHtmlPart->setJavaEnabled(false);
+ 	mHtmlPart->setPluginsEnabled(false);
+ 	mHtmlPart->setMetaRefreshEnabled(false);
++        mHtmlPart->setOnlyLocalReferences(true);
+ 
+ 	mHtmlView = mHtmlPart->view();
+ 	mHtmlView->setMarginWidth(4);
+@@ -557,7 +558,8 @@
+ 			if (mSearch->dateSearchMap[mSearch->item->date()].contains(mSearch->item->metaContact()))
+ 				mSearch->item->setVisible(true);
+ 		}
+-		while(mSearch->item = static_cast<KListViewDateItem *>(mSearch->item->nextSibling()));
++		while((mSearch->item = static_cast<KListViewDateItem
++                            *>(mSearch->item->nextSibling())));
+ 		mMainWidget->searchButton->setText(i18n("&Search"));
+ 
+ 		delete mSearch;
 Index: kopete/plugins/history/kopete_history_config.desktop
 ===================================================================
---- kopete/plugins/history/kopete_history_config.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 600145)
-+++ kopete/plugins/history/kopete_history_config.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 600145)
+--- kopete/plugins/history/kopete_history_config.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 605721)
++++ kopete/plugins/history/kopete_history_config.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 605721)
 @@ -91,7 +91,7 @@
  Comment[es]=Plugin de Historia
  Comment[et]=Ajalooplugin
@@ -230,8 +328,8 @@
  Comment[ga]=BreiseĂĄn Staire
 Index: kopete/plugins/addbookmarks/kopete_addbookmarks.desktop
 ===================================================================
---- kopete/plugins/addbookmarks/kopete_addbookmarks.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 600145)
-+++ kopete/plugins/addbookmarks/kopete_addbookmarks.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 600145)
+--- kopete/plugins/addbookmarks/kopete_addbookmarks.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 605721)
++++ kopete/plugins/addbookmarks/kopete_addbookmarks.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 605721)
 @@ -70,7 +70,7 @@
  Comment[es]=Anota automĂĄticamente los enlaces de los mensajes entrantes
  Comment[et]=Sissetulevates sþnumites olevate viitade automaatne lisamine järjehoidjatesse
@@ -241,10 +339,250 @@
  Comment[fi]=Lisää saapuvien viestien sisältämät linkit automaattisesti kirjanmerkkeihin
  Comment[fr]=Ajouter automatiquement un signet pour les liens prĂŠsents dans les messages rentrants
  Comment[gl]=Marcar automĂĄticamente as ligazĂłns nas mensaxes entrantes
+Index: kopete/plugins/addbookmarks/addbookmarksplugin.cpp
+===================================================================
+--- kopete/plugins/addbookmarks/addbookmarksplugin.cpp	(.../tags/KDE/3.5.5/kdenetwork)	(revision 605721)
++++ kopete/plugins/addbookmarks/addbookmarksplugin.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 605721)
+@@ -16,6 +16,7 @@
+ #include <qtextcodec.h>
+ #include <qregexp.h>
+ 
++#include "addbookmarksplugin.moc"
+ #include "addbookmarksplugin.h"
+ #include "kopetecontact.h"
+ #include "kopetechatsessionmanager.h"
+@@ -25,6 +26,19 @@
+ 
+ K_EXPORT_COMPONENT_FACTORY( kopete_addbookmarks, BookmarksPluginFactory( "kopete_addbookmarks" )  )
+ 
++
++static bool isURLInGroup(const KURL& url, const KBookmarkGroup& group)
++{
++	KBookmark bookmark = group.first();
++	
++	for( ; !bookmark.isNull() ; bookmark = group.next(bookmark) ){
++		if( !bookmark.isGroup() && !bookmark.isSeparator() )
++			if( url == bookmark.url() )
++				return true;
++	}
++	return false;
++}
++
+ BookmarksPlugin::BookmarksPlugin(QObject *parent, const char *name, const QStringList &/*args*/)
+  : Kopete::Plugin(BookmarksPluginFactory::instance(), parent, name)
+ {
+@@ -32,15 +46,6 @@
+ 	connect( Kopete::ChatSessionManager::self(), SIGNAL( aboutToDisplay( Kopete::Message & ) ), this, SLOT( slotBookmarkURLsInMessage( Kopete::Message & ) ) );
+ }
+ 
+-
+-BookmarksPlugin::~BookmarksPlugin()
+-{
+-}
+-
+-
+-#include "addbookmarksplugin.moc"
+-
+-
+ /*!
+     \fn BookmarksPlugin::slotBookmarkURLsInMessage(KopeteMessage & msg)
+  */
+@@ -54,14 +59,17 @@
+ 	URLsList = extractURLsFromString( msg.parsedBody() );
+ 	if (!URLsList->empty()) {
+ 		for( it = URLsList->begin() ; it != URLsList->end() ; ++it){
+-			if( msg.from()->metaContact() ) {
+-				addKopeteBookmark(*it, msg.from()->metaContact()->displayName() );
+-				//kdDebug (14501) << "name:" << msg.from()->metaContact()->displayName() << endl;
++			if ( m_settings.addBookmarksFromUnknownContacts() || !msg.from()->metaContact()->isTemporary() )
++			{
++				if ( msg.from()->metaContact() ) {
++					addKopeteBookmark(*it, msg.from()->metaContact()->displayName() );
++					//kdDebug (14501) << "name:" << msg.from()->metaContact()->displayName() << endl;
++				}
++				else {
++					addKopeteBookmark(*it, msg.from()->property(Kopete::Global::Properties::self()->nickName()).value().toString() );
++					//kdDebug (14501) << "name:" << msg.from()->property(Kopete::Global::Properties::self()->nickName()).value().toString() << endl;
++				}
+ 			}
+-			else {
+-				addKopeteBookmark(*it, msg.from()->property(Kopete::Global::Properties::self()->nickName()).value().toString() );
+-				//kdDebug (14501) << "name:" << msg.from()->property(Kopete::Global::Properties::self()->nickName()).value().toString() << endl;
+-			}
+ 		}
+ 	}
+ 	delete URLsList;
+@@ -71,7 +79,8 @@
+ {
+ 	QTextCodec *codec = getPageEncoding( data );
+ 	QString htmlpage = codec->toUnicode( data );
+-	QRegExp rx("<(?:title|TITLE)>([^<]*)</(?:title|TITLE)>");
++	QRegExp rx("<title>([^<]*){1,96}</title>");
++	rx.setCaseSensitive(false);
+ 	int pos = rx.search( htmlpage );
+ 	KBookmarkManager *mgr = KBookmarkManager::userBookmarksManager();
+ 	KBookmarkGroup group = getKopeteFolder();
+@@ -93,7 +102,7 @@
+ 	transfer->kill();
+ }
+ 
+-KURL::List* BookmarksPlugin::extractURLsFromString( QString text )
++KURL::List* BookmarksPlugin::extractURLsFromString( const QString& text )
+ {
+ 	KURL::List *list = new KURL::List;
+ 	QRegExp rx("<a href=\"[^\\s\"]+\"");
+@@ -110,17 +119,20 @@
+ 	return list;
+ }
+ 
+-void BookmarksPlugin::addKopeteBookmark( KURL url, QString sender )
++void BookmarksPlugin::addKopeteBookmark( const KURL& url, const QString& sender )
+ {
+ 	KBookmarkGroup group = getKopeteFolder();
+ 
+ 	if ( m_settings.useSubfolderForContact( sender ) ) {
+ 		group = getFolder( group, sender );
+ 	}
+-	if( !isURLInGroup( url, group ) ){
++	// either restrict to http(s) or to KProtocolInfo::protocolClass() == :internet
++	if( !isURLInGroup( url, group )
++		&& url.isValid() && url.protocol().startsWith("http") ) {
+ 		KIO::TransferJob *transfer;
+ 		// make asynchronous transfer to avoid GUI freezing due to overloaded web servers
+ 		transfer = KIO::get(url, false, false);
++		transfer->setInteractive(false);
+ 		connect ( transfer, SIGNAL ( data( KIO::Job *, const QByteArray & ) ),
+ 		this, SLOT ( slotAddKopeteBookmark( KIO::Job *, const QByteArray & ) ) );
+ 		m_map[transfer].url = url;
+@@ -132,23 +144,11 @@
+ {
+ 	KBookmarkManager *mgr = KBookmarkManager::userBookmarksManager();
+ 
+-	return getFolder( mgr->root(), "kopete" );
++	return getFolder( mgr->root(), QString::fromLatin1("kopete") );
+ }
+ 
+-bool BookmarksPlugin::isURLInGroup(KURL url, KBookmarkGroup group)
++KBookmarkGroup BookmarksPlugin::getFolder( KBookmarkGroup group, const QString& folder )
+ {
+-	KBookmark bookmark = group.first();
+-	
+-	for( ; !bookmark.isNull() ; bookmark = group.next(bookmark) ){
+-		if( !bookmark.isGroup() && !bookmark.isSeparator() )
+-			if( url == bookmark.url() )
+-				return true;
+-	}
+-	return false;
+-}
+-
+-KBookmarkGroup BookmarksPlugin::getFolder( KBookmarkGroup group, QString folder )
+-{
+ 	KBookmark bookmark;
+ 
+ 
+@@ -163,7 +163,7 @@
+ 	return group;
+ }
+ 
+-QTextCodec* BookmarksPlugin::getPageEncoding( QByteArray data )
++QTextCodec* BookmarksPlugin::getPageEncoding( const QByteArray& data )
+ {
+ 	QString temp = QString::fromLatin1(data);
+ 	QRegExp rx("<meta[^>]*(charset|CHARSET)\\s*=\\s*[^>]*>");
+Index: kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp
+===================================================================
+--- kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp	(.../tags/KDE/3.5.5/kdenetwork)	(revision 605721)
++++ kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 605721)
+@@ -31,6 +31,7 @@
+ 	KConfig * configfile = KGlobal::config();
+ 	m_isfolderforeachcontact = Always;
+ 	m_contactslist.clear();
++	m_addbookmarksfromunknowns = false;
+ 	if( configfile->getConfigState() == KConfigBase::NoAccess ){
+ 		kdDebug( 14501 ) << "load: failed to open config file for reading" << endl;
+ 		return;
+@@ -42,6 +43,7 @@
+ 	configfile->setGroup("Bookmarks Plugin");
+ 	m_isfolderforeachcontact = (UseSubfolders)configfile->readNumEntry( "UseSubfolderForEachContact", 0 );
+ 	m_contactslist = configfile->readListEntry( "ContactsList" );
++	m_addbookmarksfromunknowns = configfile->readBoolEntry( "AddBookmarksFromUnknownContacts" );
+ }
+ 
+ void BookmarksPrefsSettings::save()
+@@ -55,6 +57,7 @@
+ 	configfile->setGroup( "Bookmarks Plugin" );
+ 	configfile->writeEntry( "UseSubfolderForEachContact", (int)m_isfolderforeachcontact );
+ 	configfile->writeEntry( "ContactsList", m_contactslist );
++	configfile->writeEntry( "AddBookmarksFromUnknownContacts", m_addbookmarksfromunknowns );
+ 	configfile->sync();
+ }
+ 
+@@ -76,4 +79,9 @@
+ 	return false;
+ }
+ 
++void BookmarksPrefsSettings::setAddBookmarksFromUnknownContacts( bool addUntrusted )
++{
++    m_addbookmarksfromunknowns = addUntrusted;
++}
++
+ #include "addbookmarksprefssettings.moc"
+Index: kopete/plugins/addbookmarks/addbookmarkspreferences.cpp
+===================================================================
+--- kopete/plugins/addbookmarks/addbookmarkspreferences.cpp	(.../tags/KDE/3.5.5/kdenetwork)	(revision 605721)
++++ kopete/plugins/addbookmarks/addbookmarkspreferences.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 605721)
+@@ -15,6 +15,7 @@
+ #include <kgenericfactory.h>
+ #include <kopetepluginmanager.h>
+ #include <kopetecontactlist.h>
++#include <qcheckbox.h>
+ #include <qlayout.h>
+ #include <qbuttongroup.h>
+ #include <qlistbox.h>
+@@ -37,7 +38,9 @@
+ 	connect( p_dialog->onlySelectedButton, SIGNAL( toggled(bool) ), this, SLOT( slotSetStatusChanged() ));
+ 	connect( p_dialog->onlyNotSelectedButton, SIGNAL( toggled(bool) ), this, SLOT( slotSetStatusChanged() ));
+ 	connect( p_dialog->contactList, SIGNAL( selectionChanged() ), this, SLOT( slotSetStatusChanged() ));
+-	connect( this, SIGNAL(PreferencesChanged()), Kopete::PluginManager::self()->plugin("kopete_addbookmarks") , SLOT(slotReloadSettings()));
++	if(Kopete::PluginManager::self()->plugin("kopete_addbookmarks") )
++           connect( this, SIGNAL(PreferencesChanged()), Kopete::PluginManager::self()->plugin("kopete_addbookmarks") , SLOT(slotReloadSettings()));
++	connect( p_dialog->m_addUntrusted, SIGNAL( toggled(bool) ), this, SLOT( slotAddUntrustedChanged() ) );
+ }
+ 
+ 
+@@ -61,6 +64,7 @@
+ 		}
+ 		m_settings.setContactsList( list );
+ 	}
++	m_settings.setAddBookmarksFromUnknownContacts( p_dialog->m_addUntrusted->isChecked() );
+ 	m_settings.save();
+ 	emit PreferencesChanged(); 
+ 	emit KCModule::changed(false);
+@@ -76,6 +80,11 @@
+ 	emit KCModule::changed(true);
+ }
+ 
++void BookmarksPreferences::slotAddUntrustedChanged()
++{
++    emit KCModule::changed(true);
++}
++
+ void BookmarksPreferences::load()
+ {
+ 	QStringList list;
+@@ -84,7 +93,7 @@
+ 	
+ 	m_settings.load();
+ 	p_dialog->buttonGroup1->setButton(m_settings.isFolderForEachContact());
+-
++    p_dialog->m_addUntrusted->setChecked( m_settings.addBookmarksFromUnknownContacts() );
+ 	if( p_dialog->contactList->count() == 0 ){
+ 		QStringList contacts = Kopete::ContactList::self()->contacts();
+ 		contacts.sort();
 Index: kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop
 ===================================================================
---- kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 600145)
-+++ kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 600145)
+--- kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 605721)
++++ kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 605721)
 @@ -70,7 +70,7 @@
  Comment[es]=Anota automĂĄticamente los enlaces de los mensajes entrantes
  Comment[et]=Sissetulevates sþnumites olevate viitade automaatne lisamine järjehoidjatesse
@@ -254,10 +592,156 @@
  Comment[fi]=Lisää saapuvien viestien sisältämät linkit automaattisesti kirjanmerkkeihin
  Comment[fr]=Ajouter automatiquement un signet pour les liens prĂŠsents dans les messages rentrants
  Comment[gl]=Marcar automĂĄticamente as ligazĂłns nas mensaxes entrantes
+Index: kopete/plugins/addbookmarks/addbookmarksplugin.h
+===================================================================
+--- kopete/plugins/addbookmarks/addbookmarksplugin.h	(.../tags/KDE/3.5.5/kdenetwork)	(revision 605721)
++++ kopete/plugins/addbookmarks/addbookmarksplugin.h	(.../branches/KDE/3.5/kdenetwork)	(revision 605721)
+@@ -30,28 +30,23 @@
+ public:
+     BookmarksPlugin(QObject *parent, const char *name, const QStringList &args);
+ 
+-    ~BookmarksPlugin();
+-    
+ private:
+     typedef struct S_URLANDNAME{
+ 		KURL url;
+ 		QString sender;
+     } URLandName;
+     typedef QMap<KIO::TransferJob*,URLandName> JobsToURLsMap;
+-    
+     JobsToURLsMap m_map;
+     BookmarksPrefsSettings m_settings;
+-    
+-    void addKopeteBookmark( KURL url, QString sender );
+-    KURL::List* extractURLsFromString( QString text );
++    void addKopeteBookmark( const KURL& url, const QString& sender );
++    KURL::List* extractURLsFromString( const QString& text );
+     KBookmarkGroup getKopeteFolder();
+-    KBookmarkGroup getFolder( KBookmarkGroup group, QString folder );
+-    bool isURLInGroup( KURL url, KBookmarkGroup group );
+-    QTextCodec* getPageEncoding( QByteArray data );
++    KBookmarkGroup getFolder( KBookmarkGroup group, const QString& folder );
++    QTextCodec* getPageEncoding( const QByteArray& data );
+ public slots:
+     void slotBookmarkURLsInMessage(Kopete::Message & msg);
+     void slotReloadSettings();
+-    
++
+ private slots:
+     void slotAddKopeteBookmark( KIO::Job *transfer, const QByteArray &data );
+ };
+Index: kopete/plugins/addbookmarks/addbookmarksprefssettings.h
+===================================================================
+--- kopete/plugins/addbookmarks/addbookmarksprefssettings.h	(.../tags/KDE/3.5.5/kdenetwork)	(revision 605721)
++++ kopete/plugins/addbookmarks/addbookmarksprefssettings.h	(.../branches/KDE/3.5/kdenetwork)	(revision 605721)
+@@ -35,9 +35,12 @@
+     bool useSubfolderForContact( QString nickname );
+     QStringList getContactsList() {return m_contactslist;}
+     void setContactsList(QStringList list) {m_contactslist = list;}
++    bool addBookmarksFromUnknownContacts() { return m_addbookmarksfromunknowns; };
++    void setAddBookmarksFromUnknownContacts( bool );
+     
+ private:
+     bool m_folderPerContact;
++    bool m_addbookmarksfromunknowns;
+     UseSubfolders m_isfolderforeachcontact;
+     QStringList m_contactslist;
+ 
+Index: kopete/plugins/addbookmarks/addbookmarkspreferences.h
+===================================================================
+--- kopete/plugins/addbookmarks/addbookmarkspreferences.h	(.../tags/KDE/3.5.5/kdenetwork)	(revision 605721)
++++ kopete/plugins/addbookmarks/addbookmarkspreferences.h	(.../branches/KDE/3.5/kdenetwork)	(revision 605721)
+@@ -39,7 +39,7 @@
+ 
+ private slots:
+     void slotSetStatusChanged();
+-           
++    void slotAddUntrustedChanged();
+ };
+ 
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kdenetwork-branch.diff?r1=1.17&r2=1.18&f=u
    http://cvs.pld-linux.org/SOURCES/kdepim-branch.diff?r1=1.30&r2=1.31&f=u
    http://cvs.pld-linux.org/SOURCES/kdebase-branch.diff?r1=1.44&r2=1.45&f=u
    http://cvs.pld-linux.org/SOURCES/kdelibs-branch.diff?r1=1.42&r2=1.43&f=u

More information about the pld-cvs-commit mailing list