[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-23 20:10:09
Message-ID: 20130523201009.4884BAC85D () svn ! kde ! org
[Download RAW message or body]

SVN commit 1356120 by pali:

Rename jabber define IRIS_HASH_ATTRIBUTE to IRIS_XEP_0115_HASH_ATTRIBUTE and fix \
clientVersion function


 M  +1 -1      CMakeLists.txt  
 M  +7 -7      jabbercapabilitiesmanager.cpp  


--- trunk/KDE/kdenetwork/kopete/protocols/jabber/CMakeLists.txt #1356119:1356120
@@ -1,7 +1,7 @@
 add_definitions(-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS -DIRIS_XMPP_JID_DEPRECATED)
 
 # if using patched libiris version, enable kopete features
-add_definitions(-DIRIS_FILE_TRANSFER_PREVIEW -DIRIS_SOCKET_ACCESS \
-DIRIS_HASH_ATTRIBUTE -DIRIS_XEP_0184_ID_ATTRIBUTE) \
+add_definitions(-DIRIS_FILE_TRANSFER_PREVIEW -DIRIS_SOCKET_ACCESS \
-DIRIS_XEP_0115_HASH_ATTRIBUTE -DIRIS_XEP_0184_ID_ATTRIBUTE)  
 add_subdirectory( icons ) 
 add_subdirectory( libiris ) 
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp \
#1356119:1356120 @@ -364,11 +364,10 @@
 		return;
 
 	QString node = status.capsNode(), version = status.capsVersion(), extensions = \
status.capsExt(); +	QString hash;
 
-#ifdef IRIS_HASH_ATTRIBUTE
-	QString hash = status.capsHash();
-#else
-	QString hash = QString();
+#ifdef IRIS_XEP_0115_HASH_ATTRIBUTE
+	hash = status.capsHash();
 #endif
 
 	Capabilities capabilities( node, version, extensions, hash );
@@ -636,10 +635,11 @@
 
 QString JabberCapabilitiesManager::clientVersion(const Jid& jid) const
 {
-	if (!capabilitiesEnabled(jid))
+#ifdef IRIS_XEP_0115_HASH_ATTRIBUTE
+	if (capabilitiesEnabled(jid) && d->jidCapabilitiesMap[jid.full()].hash().isEmpty())
+		return d->jidCapabilitiesMap[jid.full()].version();
+#endif
 		return QString();
-	else
-		return (d->jidCapabilitiesMap[jid.full()].hash().isEmpty() ? \
d->jidCapabilitiesMap[jid.full()].version() : QString());  }
 
 void JabberCapabilitiesManager::saveInformation()


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