rev 3413 - trunk/packages/kdenetwork/debian/patches

Christopher Martin chrsmrtn at costa.debian.org
Wed Mar 29 18:35:57 UTC 2006


Author: chrsmrtn
Date: 2006-03-29 18:35:56 +0000 (Wed, 29 Mar 2006)
New Revision: 3413

Added:
   trunk/packages/kdenetwork/debian/patches/01_kdenetwork_branch_r524074.diff
Removed:
   trunk/packages/kdenetwork/debian/patches/01_kdenetwork_branch_r502708.diff
   trunk/packages/kdenetwork/debian/patches/01_kdenetwork_branch_r504660.diff
Log:
kdenetwork branch pull updates.


Deleted: trunk/packages/kdenetwork/debian/patches/01_kdenetwork_branch_r502708.diff

Deleted: trunk/packages/kdenetwork/debian/patches/01_kdenetwork_branch_r504660.diff

Added: trunk/packages/kdenetwork/debian/patches/01_kdenetwork_branch_r524074.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/01_kdenetwork_branch_r524074.diff	2006-03-29 18:30:12 UTC (rev 3412)
+++ trunk/packages/kdenetwork/debian/patches/01_kdenetwork_branch_r524074.diff	2006-03-29 18:35:56 UTC (rev 3413)
@@ -0,0 +1,205 @@
+#DPATCHLEVEL=0
+--- kopete/plugins/history/historydialog.cpp	(.../tags/KDE/3.5.2/kdenetwork)	(revision 524074)
++++ kopete/plugins/history/historydialog.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 524074)
+@@ -490,7 +490,7 @@
+ 
+ 				QFile file(mLogger->getFileName(*it, mSearch->item->date()));
+ 				file.open(IO_ReadOnly);
+-				if (!&file)
++				if (!file.isOpen())
+ 				{
+ 					continue;
+ 				}
+@@ -529,7 +529,7 @@
+ 			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;
+--- kopete/protocols/groupwise/gwaccount.cpp	(.../tags/KDE/3.5.2/kdenetwork)	(revision 524074)
++++ kopete/protocols/groupwise/gwaccount.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 524074)
+@@ -939,7 +939,7 @@
+ 		<< ", givenname" << details.givenName
+ 		<< ", status" << details.status
+ 		<< endl;
+-	if ( details.cn.lower() == accountId().lower() )
++	if ( details.cn.lower() == accountId().lower().section('@', 0, 0) )
+ 	{
+ 		kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << " - got our details in contact list, updating them" << endl;
+ 		GroupWiseContact * detailsOwner= static_cast<GroupWiseContact *>( myself() );
+--- kopete/protocols/oscar/liboscar/closeconnectiontask.cpp	(.../tags/KDE/3.5.2/kdenetwork)	(revision 524074)
++++ kopete/protocols/oscar/liboscar/closeconnectiontask.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 524074)
+@@ -112,6 +112,16 @@
+ 		}
+ 		
+ 		tlvList.clear();
++		
++		if ( m_bosHost.isEmpty() )
++		{
++			kdWarning(OSCAR_RAW_DEBUG) << k_funcinfo << "Empty host address!" << endl;
++			
++			Oscar::SNAC s = { 0, 0, 0, 0 };
++			client()->fatalTaskError( s, 0 );
++			return true;
++		}
++		
+ 		kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "We should reconnect to server '" 
+ 			<< m_bosHost << "' on port " << m_bosPort << endl;
+ 		setSuccess( errorNum, errorReason );
+--- kopete/protocols/oscar/liboscar/client.cpp	(.../tags/KDE/3.5.2/kdenetwork)	(revision 524074)
++++ kopete/protocols/oscar/liboscar/client.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 524074)
+@@ -89,7 +89,6 @@
+ 	SSIAuthTask* ssiAuthTask;
+ 	ICQUserInfoRequestTask* icqInfoTask;
+ 	UserInfoTask* userInfoTask;
+-	CloseConnectionTask* closeConnectionTask;
+ 	TypingNotifyTask * typingNotifyTask;
+ 	//Managers
+ 	SSIManager* ssiManager;
+@@ -132,7 +131,6 @@
+ 	d->ssiAuthTask = 0L;
+ 	d->icqInfoTask = 0L;
+ 	d->userInfoTask = 0L;
+-	d->closeConnectionTask = 0L;
+ 	d->stage = ClientPrivate::StageOne;
+ 	d->typingNotifyTask = 0L;
+ 	d->awayMsgRequestTimer = new QTimer();
+@@ -340,7 +338,7 @@
+ {
+ 	//create a new connection and set it up
+ 	Connection* c = createConnection( d->host, QString::number( d->port ) );
+-	d->closeConnectionTask = new CloseConnectionTask( c->rootTask() );
++	new CloseConnectionTask( c->rootTask() );
+ 
+ 	//create the new login task
+ 	m_loginTaskTwo = new StageTwoLoginTask( c->rootTask() );
+@@ -1090,7 +1088,6 @@
+ 	delete d->ssiAuthTask;
+ 	delete d->icqInfoTask;
+ 	delete d->userInfoTask;
+-	delete d->closeConnectionTask;
+ 	delete d->typingNotifyTask;
+ 
+ 	d->errorTask = 0;
+@@ -1100,7 +1097,6 @@
+ 	d->ssiAuthTask = 0;
+ 	d->icqInfoTask = 0;
+ 	d->userInfoTask = 0;
+-	d->closeConnectionTask = 0;
+ 	d->typingNotifyTask = 0;
+ }
+ 
+--- kopete/protocols/oscar/oscaraccount.cpp	(.../tags/KDE/3.5.2/kdenetwork)	(revision 524074)
++++ kopete/protocols/oscar/oscaraccount.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 524074)
+@@ -620,6 +620,9 @@
+ 		                        Kopete::UI::Global::mainWidget() );
+ 		switch ( code )
+ 		{
++		case 0x0000:
++			logOff( Kopete::Account::Unknown );
++			break;
+ 		case 0x0004:
+ 		case 0x0005:
+ 			logOff( Kopete::Account::BadPassword );
+--- kopete/protocols/irc/libkirc/kircengine_commands.cpp	(.../tags/KDE/3.5.2/kdenetwork)	(revision 524074)
++++ kopete/protocols/irc/libkirc/kircengine_commands.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 524074)
+@@ -275,20 +275,20 @@
+ 		QString user = m.arg(0);
+ 		QString message = m.suffix();
+ 		const QTextCodec *codec = codecForNick( user );
+-		if (codec != defaultCodec)
+-			msg.decodeAgain( codec );
+-
++		if (codec != defaultCodec) {
++			m.decodeAgain( codec );
++			message = m.suffix();
++		}
+ 		if (Entity::isChannel(user))
+-			emit incomingMessage(msg.nickFromPrefix(), Kopete::Message::unescape(msg.arg(0)), message );
++			emit incomingMessage(m.nickFromPrefix(), Kopete::Message::unescape(m.arg(0)), message );
+ 		else
+-			emit incomingPrivMessage(msg.nickFromPrefix(), Kopete::Message::unescape(msg.arg(0)), message );
+-
++			emit incomingPrivMessage(m.nickFromPrefix(), Kopete::Message::unescape(m.arg(0)), message );
+ //		emit receivedMessage(PrivateMessage, msg.entityFrom(), msg.entityTo(), message);
+ 	}
+ 
+-	if( msg.hasCtcpMessage() )
++	if( m.hasCtcpMessage() )
+ 	{
+-		invokeCtcpCommandOfMessage(m_ctcpQueries, msg);
++		invokeCtcpCommandOfMessage(m_ctcpQueries, m);
+ 	}
+ }
+ 
+--- kopete/protocols/irc/ui/irceditaccountwidget.cpp	(.../tags/KDE/3.5.2/kdenetwork)	(revision 524074)
++++ kopete/protocols/irc/ui/irceditaccountwidget.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 524074)
+@@ -51,8 +51,8 @@
+ {
+ 	mProtocol = proto;
+ 
+-	// iso latin 1
+-	int currentCodec = 4;
++	// default charset/encoding for new accounts: utf-8, see http://www.iana.org/assignments/character-sets
++	int currentCodec = 106;
+ 
+ 	if( account() )
+ 	{
+--- kopete/libkopete/kopeteversion.h	(.../tags/KDE/3.5.2/kdenetwork)	(revision 524074)
++++ kopete/libkopete/kopeteversion.h	(.../branches/KDE/3.5/kdenetwork)	(revision 524074)
+@@ -14,10 +14,10 @@
+ #ifndef _KOPETE_VERSION_H_
+ #define _KOPETE_VERSION_H_
+ 
+-#define KOPETE_VERSION_STRING "0.11.1"
++#define KOPETE_VERSION_STRING "0.11.2"
+ #define KOPETE_VERSION_MAJOR 0
+ #define KOPETE_VERSION_MINOR 11
+-#define KOPETE_VERSION_RELEASE 1
++#define KOPETE_VERSION_RELEASE 2
+ #define KOPETE_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c))
+ 
+ #define KOPETE_VERSION \
+--- kdict/kdict.desktop	(.../tags/KDE/3.5.2/kdenetwork)	(revision 524074)
++++ kdict/kdict.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 524074)
+@@ -77,6 +77,7 @@
+ GenericName[ar]=قاموس على الإنترنت
+ GenericName[bg]=Мрежови речник
+ GenericName[bn]=অনলাইন অভিধান
++GenericName[br]=Geriaoueg enlinenn
+ GenericName[bs]=Online rječnik
+ GenericName[ca]=Diccionari en línia
+ GenericName[cs]=Online slovník
+--- wifi/kcmwifi/configcrypto.ui	(.../tags/KDE/3.5.2/kdenetwork)	(revision 524074)
++++ wifi/kcmwifi/configcrypto.ui	(.../branches/KDE/3.5/kdenetwork)	(revision 524074)
+@@ -231,7 +231,7 @@
+                         <cstring>rb_openMode</cstring>
+                     </property>
+                     <property name="text">
+-                        <string>Open</string>
++                        <string>Ope&amp;n</string>
+                     </property>
+                     <property name="toolTip" stdset="0">
+                         <string>Makes the card accept encrypted and unencrypted packets.</string>
+--- wifi/interface_wireless_wirelessextensions.cpp	(.../tags/KDE/3.5.2/kdenetwork)	(revision 524074)
++++ wifi/interface_wireless_wirelessextensions.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 524074)
+@@ -609,6 +609,16 @@
+           networks->setText ( cellcount - 1, 2, quality );
+         }
+ 
++      if ( !ignoreRemainingBits && data.contains ( "wpa_ie" ) )
++	{
++	  networks->setText ( cellcount - 1, 3, QString ( "WPA" ) );
++	}
++      
++      if ( !ignoreRemainingBits && data.contains ( "rsn_ie" ) )
++        {
++          networks->setText ( cellcount - 1, 3, QString ( "WPA2" ) );
++        }
++      
+     }
+ }
+ 




More information about the pkg-kde-commits mailing list