Changeset 0f7eccff for protocols/jabber/jabber.h

Timestamp:

2015-05-31T00:11:20Z (9 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:

• protocols/jabber/jabber.h (modified) (4 diffs)

protocols/jabber/jabber.h

@@ -46 +46 @@
         JFLAG_XMLCONSOLE = 64,          /* If the user added an xmlconsole buddy. */
         JFLAG_STARTTLS_DONE = 128,      /* If a plaintext session was converted to TLS. */
+        JFLAG_GMAILNOTIFY = 256,        /* If gmail notification is enabled */
 
         JFLAG_GTALK =  0x100000,        /* Is Google Talk, as confirmed by iq discovery */
@@ -102 +103 @@
         const struct jabber_away_state *away_state;
         char *away_message;
+        guint64 gmail_time;
+        char *gmail_tid;
 
         md5_state_t cached_id_prefix;
@@ -224 +227 @@
 #define XMLNS_DELAY        "urn:xmpp:delay"                                      /* XEP-0203 */
 #define XMLNS_XDATA        "jabber:x:data"                                       /* XEP-0004 */
+#define XMLNS_GMAILNOTIFY  "google:mail:notify"                                  /* Not a XEP */
 #define XMLNS_CHATSTATES   "http://jabber.org/protocol/chatstates"               /* XEP-0085 */
 #define XMLNS_DISCO_INFO   "http://jabber.org/protocol/disco#info"               /* XEP-0030 */
@@ -312 +316 @@
 void jabber_error_free(struct jabber_error *err);
 gboolean jabber_set_me(struct im_connection *ic, const char *me);
+char *jabber_get_bare_jid(char *jid);
 
 extern const struct jabber_away_state jabber_away_state_list[];