diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-03-17 15:15:19 +0000 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-03-17 15:15:19 +0000 |
| commit | e8c8d00ea43c204ee276bde7fb663a0f0249790f (patch) | |
| tree | a98fdef3c5885eb2eac2ba047e244b3fd3c0f800 /protocols/jabber/jabber.h | |
| parent | 1c3008ac0b2b29f7e14ec9b874af3277c511c7a4 (diff) | |
| parent | f9928cb319c2879a56b7280f09723b26035982d0 (diff) | |
Merging mainline.
Diffstat (limited to 'protocols/jabber/jabber.h')
| -rw-r--r-- | protocols/jabber/jabber.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/protocols/jabber/jabber.h b/protocols/jabber/jabber.h index 898c4978..3e520a08 100644 --- a/protocols/jabber/jabber.h +++ b/protocols/jabber/jabber.h @@ -39,12 +39,13 @@ typedef enum JFLAG_AUTHENTICATED = 2, /* Set when we're successfully authenticatd. */ JFLAG_STREAM_RESTART = 4, /* Set when we want to restart the stream (after SASL or TLS). */ - JFLAG_WAIT_SESSION = 8, /* Set if we sent a <session> tag and need a reply + JFLAG_WANT_SESSION = 8, /* Set if the server wants a <session/> tag before we continue. */ - JFLAG_WAIT_BIND = 16, /* ... for <bind> tag. */ + JFLAG_WANT_BIND = 16, /* ... for <bind> tag. */ JFLAG_WANT_TYPING = 32, /* Set if we ever sent a typing notification, this activates all XEP-85 related code. */ JFLAG_XMLCONSOLE = 64, /* If the user added an xmlconsole buddy. */ + JFLAG_STARTTLS_DONE = 128, /* If a plaintext session was converted to TLS. */ } jabber_flags_t; typedef enum @@ -91,7 +92,7 @@ struct jabber_data /* After changing one of these two (or the priority setting), call presence_send_update() to inform the server about the changes. */ - struct jabber_away_state *away_state; + const struct jabber_away_state *away_state; char *away_message; md5_state_t cached_id_prefix; |