[Pkg-kde-commits] rev 2443 - trunk/packages/kdenetwork/debian/patches

[Christopher Martin]

Author: chrsmrtn
Date: 2005-11-30 13:45:19 +0000 (Wed, 30 Nov 2005)
New Revision: 2443

Added:
   trunk/packages/kdenetwork/debian/patches/01_kdenetwork_branch_r484288.diff
Removed:
   trunk/packages/kdenetwork/debian/patches/01_kdenetwork_branch_r481006.diff
Log:
branch update for kdenetwork.


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

Added: trunk/packages/kdenetwork/debian/patches/01_kdenetwork_branch_r484288.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/01_kdenetwork_branch_r484288.diff	2005-11-30 13:43:55 UTC (rev 2442)
+++ trunk/packages/kdenetwork/debian/patches/01_kdenetwork_branch_r484288.diff	2005-11-30 13:45:19 UTC (rev 2443)
@@ -0,0 +1,101 @@
+#DPATCHLEVEL=0
+--- kopete/protocols/oscar/liboscar/localcontactlisttask.cpp	(.../tags/KDE/3.5.0/kdenetwork)	(revision 484288)
++++ kopete/protocols/oscar/liboscar/localcontactlisttask.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 484288)
+@@ -29,6 +29,8 @@
+ 
+ using namespace Oscar;
+ 
++#define PACKET_SIZE_LIMIT 8000
++
+ LocalContactListTask::LocalContactListTask(Task* parent): Task(parent)
+ {
+ }
+@@ -52,10 +54,24 @@
+ 		QValueList<Oscar::SSI>::const_iterator cEnd = contactList.constEnd();
+ 		for ( QValueList<Oscar::SSI>::const_iterator it = contactList.constBegin(); it != cEnd; ++it )
+ 		{
+-			kdDebug( OSCAR_RAW_DEBUG ) << "Adding contact " << ( *it ).name() << " to CLI_BUDDYLIST_ADD packet" << endl;
+-			buffer->addBUIN( ( *it ).name().latin1() );
++			if ( ( buffer->length() + ( *it ).name().length() ) 
++				< PACKET_SIZE_LIMIT )
++			{
++				kdDebug( OSCAR_RAW_DEBUG ) << "Adding contact " << ( *it ).name() << " to CLI_BUDDYLIST_ADD packet" << endl;
++				buffer->addBUIN( ( *it ).name().latin1() );
++			}
++			else
++			{
++				kdDebug( OSCAR_RAW_DEBUG ) << "CLI_BUDDYLIST_ADD packet is full. Transmitting the packet" << endl;
++				Transfer* t = createTransfer( f, s, buffer );
++				send( t );
++
++				buffer = new Buffer();
++				kdDebug( OSCAR_RAW_DEBUG ) << "Adding contact " << ( *it ).name() << " to CLI_BUDDYLIST_ADD packet" << endl;
++				buffer->addBUIN( ( *it ).name().latin1() );
++			}
+ 		}
+-		
++	
+ 		Transfer* t = createTransfer( f, s, buffer );
+ 		send( t );
+ 	}
+--- kopete/protocols/irc/ircprotocol.cpp	(.../tags/KDE/3.5.0/kdenetwork)	(revision 484288)
++++ kopete/protocols/irc/ircprotocol.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 484288)
+@@ -1185,10 +1185,8 @@
+ 	QValueList<IRCHost*>::iterator pos = selectedNetwork->hosts.find( selectedHost );
+ 	if( *pos != selectedNetwork->hosts.back() )
+ 	{
+-		QValueList<IRCHost*>::iterator nextPos = pos;
+-		nextPos++;
+-		selectedNetwork->hosts.insert( nextPos, selectedHost );
+-		selectedNetwork->hosts.remove( pos );
++		QValueList<IRCHost*>::iterator nextPos = selectedNetwork->hosts.remove( pos );
++		selectedNetwork->hosts.insert( ++nextPos, selectedHost );
+ 	}
+ 
+ 	unsigned int currentPos = netConf->hostList->currentItem();
+--- kopete/protocols/msn/msncontact.cpp	(.../tags/KDE/3.5.0/kdenetwork)	(revision 484288)
++++ kopete/protocols/msn/msncontact.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 484288)
+@@ -695,7 +695,8 @@
+ 
+ 	KConfig *config = KGlobal::config();
+ 	config->setGroup( "MSN" );
+-	if ( config->readNumEntry( "DownloadPicture", 2 ) >= 2 && !obj.isEmpty() )
++	if ( config->readNumEntry( "DownloadPicture", 2 ) >= 2 && !obj.isEmpty() 
++			 && account()->myself()->onlineStatus().status() != Kopete::OnlineStatus::Invisible )
+ 		manager(Kopete::Contact::CanCreate); //create the manager which will download the photo automatically.
+ }
+ 
+--- kopete/protocols/msn/msnchatsession.cpp	(.../tags/KDE/3.5.0/kdenetwork)	(revision 484288)
++++ kopete/protocols/msn/msnchatsession.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 484288)
+@@ -524,7 +524,7 @@
+ 			if( !c->object().isEmpty() )
+ 				m_chatService->requestDisplayPicture();
+ 		}
+-		else
++		else if(myself()->onlineStatus().isDefinitelyOnline()  && myself()->onlineStatus().status() != Kopete::OnlineStatus::Invisible )
+ 			startChatSession();
+ 	}
+ 	else
+--- kopete/libkopete/ui/kopetelistview.cpp	(.../tags/KDE/3.5.0/kdenetwork)	(revision 484288)
++++ kopete/libkopete/ui/kopetelistview.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 484288)
+@@ -185,7 +185,8 @@
+ 	  scrollAutoHide(false),
+ 	  scrollHide(false),
+ 	  mouseNavigationOffset(20),
+-	  mouseNavigation(false) {}
++	  mouseNavigation(false),
++	  pressedControl( QStyle::SC_None ) {}
+ };
+ 
+ ListView::ListView( QWidget *parent, const char *name )
+--- filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp	(.../tags/KDE/3.5.0/kdenetwork)	(revision 484288)
++++ filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 484288)
+@@ -69,6 +69,8 @@
+             "smb.conf|Samba conf. File\n"
+             "*|All Files",0,i18n("Get smb.conf Location"));
+ 
++  if (smbConf.isEmpty())
++		  return;
+   if ( ! QFileInfo(smbConf).isReadable() ) {
+     KMessageBox::sorry(this,i18n("<qt>The file <i>%1</i> could not be read.</qt>").arg(smbConf),i18n("Could Not Read File"));
+     return;