aboutsummaryrefslogtreecommitdiffstats
path: root/protocols/nogaim.h
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2010-08-24 00:12:24 +0100
committerWilmer van der Gaast <wilmer@gaast.net>2010-08-24 00:12:24 +0100
commitbe999a5385ff4e9ac7416de4cca3288f18cee85c (patch)
treeddd6a6e256719c378e9748e0d96791e11844f659 /protocols/nogaim.h
parent237eadd361a7ed1d2a49180056d12b57f6f3cc0a (diff)
parenteb6df6a280c458546ebc57126e63a828674b4cd8 (diff)
First step in this merge. Mostly a bzr merge and then a cleanup of conflicts
and parts I want to/have to redo (because of ui-fix).
Diffstat (limited to 'protocols/nogaim.h')
-rw-r--r--protocols/nogaim.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/protocols/nogaim.h b/protocols/nogaim.h
index 693b5d16..cf6cdc30 100644
--- a/protocols/nogaim.h
+++ b/protocols/nogaim.h
@@ -67,6 +67,7 @@
#define OPT_LOCALBUDDY 0x00000020 /* For nicks local to one groupchat */
#define OPT_TYPING 0x00000100 /* Some pieces of code make assumptions */
#define OPT_THINKING 0x00000200 /* about these values... Stupid me! */
+#define OPT_NOOTR 0x00001000 /* protocol not suitable for OTR */
/* ok. now the fun begins. first we create a connection structure */
struct im_connection
@@ -141,6 +142,10 @@ struct prpl {
* - The user sees this name ie. when imcb_log() is used. */
const char *name;
void *data;
+ /* Maximum Message Size of this protocol.
+ * - Introduced for OTR, in order to fragment large protocol messages.
+ * - 0 means "unlimited". */
+ unsigned int mms;
/* Added this one to be able to add per-account settings, don't think
* it should be used for anything else. You are supposed to use the