From 36ef2857c30dea683d61b30eb4aaec423201a66d Mon Sep 17 00:00:00 2001 From: Thilo Cestonaro Date: Wed, 8 Jul 2009 20:59:07 +0200 Subject: [PATCH] add iq:version Feature stuff --- source/iris/src/xmpp/xmpp-im/xmpp_features.cpp | 49 ++++++++++++++++++++++------------- work/iris/src/xmpp/xmpp-im/xmpp_features.h | 2 + 2 files changed, 33 insertions(+), 18 deletions(-) diff --git a/src/xmpp/xmpp-im/xmpp_features.cpp b/src/xmpp/xmpp-im/xmpp_features.cpp index 3fa4d2d..ad53e9d 100644 --- source/iris/src/xmpp/xmpp-im/xmpp_features.cpp +++ work/iris/src/xmpp/xmpp-im/xmpp_features.cpp @@ -138,6 +138,15 @@ bool Features::isGateway() const return test(ns); } +#define FID_QUERYVERSION "jabber:iq:version" +bool Features::hasVersion() const +{ + QStringList ns; + ns << FID_QUERYVERSION; + + return test(ns); +} + #define FID_DISCO "http://jabber.org/protocol/disco" bool Features::canDisco() const { @@ -178,34 +187,36 @@ public: FeatureName() : QObject(QCoreApplication::instance()) { - id2s[FID_Invalid] = tr("ERROR: Incorrect usage of Features class"); - id2s[FID_None] = tr("None"); - id2s[FID_Register] = tr("Register"); - id2s[FID_Search] = tr("Search"); - id2s[FID_Groupchat] = tr("Groupchat"); - id2s[FID_Gateway] = tr("Gateway"); - id2s[FID_Disco] = tr("Service Discovery"); - id2s[FID_VCard] = tr("VCard"); - id2s[FID_AHCommand] = tr("Execute command"); + id2s[FID_Invalid] = tr("ERROR: Incorrect usage of Features class"); + id2s[FID_None] = tr("None"); + id2s[FID_Register] = tr("Register"); + id2s[FID_Search] = tr("Search"); + id2s[FID_Groupchat] = tr("Groupchat"); + id2s[FID_Gateway] = tr("Gateway"); + id2s[FID_Disco] = tr("Service Discovery"); + id2s[FID_VCard] = tr("VCard"); + id2s[FID_AHCommand] = tr("Execute command"); + id2s[FID_QueryVersion] = tr("Query version"); // custom Psi actions - id2s[FID_Add] = tr("Add to roster"); + id2s[FID_Add] = tr("Add to roster"); // compute reverse map //QMap::Iterator it = id2s.begin(); //for ( ; it != id2s.end(); ++it) // s2id[it.data()] = it.key(); - id2f[FID_Register] = FID_REGISTER; - id2f[FID_Search] = FID_SEARCH; - id2f[FID_Groupchat] = FID_GROUPCHAT; - id2f[FID_Gateway] = FID_GATEWAY; - id2f[FID_Disco] = FID_DISCO; - id2f[FID_VCard] = FID_VCARD; - id2f[FID_AHCommand] = FID_AHCOMMAND; + id2f[FID_Register] = FID_REGISTER; + id2f[FID_Search] = FID_SEARCH; + id2f[FID_Groupchat] = FID_GROUPCHAT; + id2f[FID_Gateway] = FID_GATEWAY; + id2f[FID_Disco] = FID_DISCO; + id2f[FID_VCard] = FID_VCARD; + id2f[FID_AHCommand] = FID_AHCOMMAND; + id2f[FID_QueryVersion] = FID_QUERYVERSION; // custom Psi actions - id2f[FID_Add] = FID_ADD; + id2f[FID_Add] = FID_ADD; } //QMap s2id; @@ -235,6 +246,8 @@ long Features::id() const return FID_AHCommand; else if ( test(QStringList(FID_ADD)) ) return FID_Add; + else if ( hasVersion() ) + return FID_QueryVersion; return FID_None; } diff --git a/src/xmpp/xmpp-im/xmpp_features.h b/src/xmpp/xmpp-im/xmpp_features.h index 9c2f406..623414f 100644 --- source/iris/src/xmpp/xmpp-im/xmpp_features.h +++ work/iris/src/xmpp/xmpp-im/xmpp_features.h @@ -49,6 +49,7 @@ namespace XMPP bool canChatState() const; bool canCommand() const; bool isGateway() const; + bool hasVersion() const; bool haveVCard() const; enum FeatureID { @@ -61,6 +62,7 @@ namespace XMPP FID_Gateway, FID_VCard, FID_AHCommand, + FID_QueryVersion, // private Psi actions FID_Add -- 1.6.2.5