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

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/protocols/jabber
From:       Pali Rohár <pali.rohar () gmail ! com>
Date:       2013-05-18 17:42:15
Message-ID: 20130518174215.1EF98AC87A () svn ! kde ! org
[Download RAW message or body]

SVN commit 1355312 by pali:

In jabber protocol disable iris jingle, file transfer preview and hash attribute \
because libiris does not support it


 M  +8 -1      jabbercapabilitiesmanager.cpp  
 M  +10 -1     jabberclient.cpp  
 M  +9 -2      jabberfiletransfer.cpp  


--- trunk/KDE/kdenetwork/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp \
#1355311:1355312 @@ -363,7 +363,14 @@
 	if( jid.compare(account->client()->jid(), false) )
 		return;
 
-	QString node = status.capsNode(), version = status.capsVersion(), extensions = \
status.capsExt(), hash = status.capsHash(); +	QString node = status.capsNode(), \
version = status.capsVersion(), extensions = status.capsExt(); +
+#ifdef IRIS_HASH_ATTRIBUTE
+	QString hash = status.capsHash();
+#else
+	QString hash = QString();
+#endif
+
 	Capabilities capabilities( node, version, extensions, hash );
 	
 	// Check if the capabilities was really updated(i.e the content is different)
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/jabberclient.cpp #1355311:1355312
@@ -32,9 +32,14 @@
 
 #include <bsocket.h>
 #include <filetransfer.h>
-#include <jinglesessionmanager.h>
 #include <xmpp_tasks.h>
 
+#ifdef IRIS_JINGLE
+#ifdef JINGLE_SUPPORT
+#include <jinglesessionmanager.h>
+#endif
+#endif
+
 #include "privacymanager.h"
 
 #define JABBER_PENALTY_TIME	2
@@ -720,6 +725,7 @@
 	/*if (jingleEnabled())
 	{*/
 
+#ifdef IRIS_JINGLE
 #ifdef JINGLE_SUPPORT
 		d->jabberClient->setJingleEnabled(true);
 		
@@ -731,6 +737,7 @@
 #else
 		d->jabberClient->setJingleEnabled(false);
 #endif
+#endif
 	/*}*/
 
 	/* This should only be done here to connect the signals, otherwise it is a
@@ -1108,6 +1115,7 @@
 
 void JabberClient::slotCSConnected ()
 {
+#ifdef IRIS_SOCKET_ACCESS
 	Kopete::SocketTimeoutWatcher* timeoutWatcher = 0;
 
 	ByteStream *irisByteStream = d->jabberClientConnector->stream ();
@@ -1116,6 +1124,7 @@
 
 	if ( timeoutWatcher )
 		QObject::connect( timeoutWatcher, SIGNAL(errorInt(int)), this, \
SLOT(slotCSError(int)) ); +#endif
 }
 
 void JabberClient::slotRosterRequestFinished ( bool success, int /*statusCode*/, \
                const QString &/*statusString*/ )
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/jabberfiletransfer.cpp \
#1355311:1355312 @@ -71,6 +71,7 @@
 
 	initializeVariables ();
 	
+#ifdef IRIS_FILE_TRANSFER_PREVIEW
 	QPixmap preview;
 	if(!mXMPPTransfer->preview().isEmpty())
 	{
@@ -83,6 +84,7 @@
 																				  mXMPPTransfer->description () ,
 																				QString(),
 																				  preview);
+#endif
 
 }
 
@@ -124,10 +126,15 @@
 	}
 
 	  
-	if(canOpen)
+	if(canOpen) {
+#ifdef IRIS_FILE_TRANSFER_PREVIEW
 		mXMPPTransfer->sendFile ( XMPP::Jid ( contact->fullAddress () ), \
                KUrl(file).fileName (), mLocalFile.size (), "" , preview);
-	else
+#else
+		mXMPPTransfer->sendFile ( XMPP::Jid ( contact->fullAddress () ), \
KUrl(file).fileName (), mLocalFile.size (), ""); +#endif
+	} else {
 		mKopeteTransfer->slotError ( KIO::ERR_CANNOT_OPEN_FOR_READING, file );
+	}
 
 }
 


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