Ignore:
Timestamp:
2015-05-31T00:11:20Z (4 years ago)
Author:
dequis <dx@…>
Branches:
master
Children:
6e21525
Parents:
c42d991 (diff), f453a7f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'develop'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/jabber/jabber.h

    rc42d991 r0f7eccff  
    4646        JFLAG_XMLCONSOLE = 64,          /* If the user added an xmlconsole buddy. */
    4747        JFLAG_STARTTLS_DONE = 128,      /* If a plaintext session was converted to TLS. */
     48        JFLAG_GMAILNOTIFY = 256,        /* If gmail notification is enabled */
    4849
    4950        JFLAG_GTALK =  0x100000,        /* Is Google Talk, as confirmed by iq discovery */
     
    102103        const struct jabber_away_state *away_state;
    103104        char *away_message;
     105        guint64 gmail_time;
     106        char *gmail_tid;
    104107
    105108        md5_state_t cached_id_prefix;
     
    224227#define XMLNS_DELAY        "urn:xmpp:delay"                                      /* XEP-0203 */
    225228#define XMLNS_XDATA        "jabber:x:data"                                       /* XEP-0004 */
     229#define XMLNS_GMAILNOTIFY  "google:mail:notify"                                  /* Not a XEP */
    226230#define XMLNS_CHATSTATES   "http://jabber.org/protocol/chatstates"               /* XEP-0085 */
    227231#define XMLNS_DISCO_INFO   "http://jabber.org/protocol/disco#info"               /* XEP-0030 */
     
    312316void jabber_error_free(struct jabber_error *err);
    313317gboolean jabber_set_me(struct im_connection *ic, const char *me);
     318char *jabber_get_bare_jid(char *jid);
    314319
    315320extern const struct jabber_away_state jabber_away_state_list[];
Note: See TracChangeset for help on using the changeset viewer.