diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-01-14 12:33:04 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-01-14 12:33:04 +0000 |
| commit | de9201059a192b8195d7384b1461a751f0040c46 (patch) | |
| tree | 091584e36373d438103772cdd05ebd57c372a464 /protocols/JabberG/src/jabber_caps.h | |
| parent | efc262a863b12a8b0b12f2e356654f11010504f8 (diff) | |
fixes #11 (Own jabber capabilities should be reported objectively)
git-svn-id: http://svn.miranda-ng.org/main/trunk@7640 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_caps.h')
| -rw-r--r-- | protocols/JabberG/src/jabber_caps.h | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/protocols/JabberG/src/jabber_caps.h b/protocols/JabberG/src/jabber_caps.h index bd304e1afa..83c18a420d 100644 --- a/protocols/JabberG/src/jabber_caps.h +++ b/protocols/JabberG/src/jabber_caps.h @@ -161,14 +161,15 @@ typedef unsigned __int64 JabberCapsBits; JABBER_CAPS_BYTESTREAMS | JABBER_CAPS_IBB | JABBER_CAPS_OOB | JABBER_CAPS_CHATSTATES | JABBER_CAPS_AGENTS | JABBER_CAPS_BROWSE | \
JABBER_CAPS_VERSION | JABBER_CAPS_LAST_ACTIVITY | JABBER_CAPS_DATA_FORMS | JABBER_CAPS_MESSAGE_EVENTS | JABBER_CAPS_VCARD_TEMP | \
JABBER_CAPS_ENTITY_TIME | JABBER_CAPS_PING | JABBER_CAPS_PRIVACY_LISTS | JABBER_CAPS_MESSAGE_RECEIPTS | JABBER_CAPS_PRIVATE_STORAGE | \
- JABBER_CAPS_ATTENTION_0 | JABBER_CAPS_JINGLE | JABBER_CAPS_ROSTER_EXCHANGE | JABBER_CAPS_DIRECT_MUC_INVITE)
+ JABBER_CAPS_ATTENTION_0 | JABBER_CAPS_ROSTER_EXCHANGE | JABBER_CAPS_DIRECT_MUC_INVITE)
-#define JABBER_CAPS_MIRANDA_ALL (JABBER_CAPS_MIRANDA_PARTIAL | JABBER_CAPS_SECUREIM | JABBER_CAPS_MIROTR | JABBER_CAPS_NEWGPG | JABBER_CAPS_COMMANDS | \
+#define JABBER_CAPS_MIRANDA_ALL (JABBER_CAPS_MIRANDA_PARTIAL | JABBER_CAPS_COMMANDS | \
JABBER_CAPS_USER_MOOD_NOTIFY | JABBER_CAPS_USER_TUNE_NOTIFY | JABBER_CAPS_USER_ACTIVITY_NOTIFY | JABBER_CAPS_PLATFORMX86 | JABBER_CAPS_PLATFORMX64)
#define JABBER_EXT_SECUREIM "secureim"
#define JABBER_EXT_MIROTR "mirotr"
+#define JABBER_EXT_JINGLE "jingle"
#define JABBER_EXT_NEWGPG "new_gpg"
#define JABBER_EXT_COMMANDS "cmds"
#define JABBER_EXT_USER_MOOD "mood"
@@ -296,9 +297,20 @@ public: struct JabberFeatCapPair
{
- const TCHAR *szFeature;
+ LPCTSTR szFeature;
JabberCapsBits jcbCap;
- const TCHAR *tszDescription;
+ LPCTSTR tszDescription;
+};
+
+struct JabberFeatCapPairExt
+{
+ LPCTSTR szFeature;
+ JabberCapsBits jcbCap;
+ LPCSTR szService;
+
+ int Valid() const
+ { return (szService == NULL) ? true : ServiceExists(szService);
+ }
};
struct JabberFeatCapPairDynamic
@@ -309,7 +321,7 @@ struct JabberFeatCapPairDynamic TCHAR *szDescription;
};
-extern const JabberFeatCapPair g_JabberFeatCapPairs[];
-extern const JabberFeatCapPair g_JabberFeatCapPairsExt[];
+extern const JabberFeatCapPair g_JabberFeatCapPairs[];
+extern const JabberFeatCapPairExt g_JabberFeatCapPairsExt[];
#endif
|