Changeset 3fbce97 for protocols/jabber/jabber.h

Timestamp:

2016-09-24T20:14:34Z (8 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

ba52ac5

Parents:

63cad66 (diff), 82cb190 (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 'master' into parson

File:

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

protocols/jabber/jabber.h

@@ -50 +50 @@
         JFLAG_GTALK =  0x100000,        /* Is Google Talk, as confirmed by iq discovery */
         JFLAG_HIPCHAT = 0x200000,       /* Is hipchat, because prpl->name says so */
-
-        JFLAG_SASL_FB = 0x10000,        /* Trying Facebook authentication. */
 } jabber_flags_t;
 
@@ -113 +111 @@
         GSList *streamhosts;
         int have_streamhosts;
+
+        char *muc_host;
 };
 
@@ -228 +228 @@
 #define XMLNS_XDATA        "jabber:x:data"                                       /* XEP-0004 */
 #define XMLNS_GMAILNOTIFY  "google:mail:notify"                                  /* Not a XEP */
+#define XMLNS_CARBONS      "urn:xmpp:carbons:2"                                  /* XEP-0280 */
+#define XMLNS_FORWARDING   "urn:xmpp:forward:0"                                  /* XEP-0297 */
+#define XMLNS_HINTS        "urn:xmpp:hints"                                      /* XEP-0334 */
 #define XMLNS_CHATSTATES   "http://jabber.org/protocol/chatstates"               /* XEP-0085 */
 #define XMLNS_DISCO_INFO   "http://jabber.org/protocol/disco#info"               /* XEP-0030 */
@@ -338 +341 @@
 
 extern const struct oauth2_service oauth2_service_google;
-extern const struct oauth2_service oauth2_service_facebook;
 
 /* conference.c */
@@ -356 +358 @@
 xt_status jabber_parse_hipchat_profile(struct im_connection *ic, struct xt_node *node, struct xt_node *orig);
 xt_status hipchat_handle_success(struct im_connection *ic, struct xt_node *node);
+char *hipchat_make_channel_slug(const char *name);
+char *hipchat_guess_channel_name(struct im_connection *ic, const char *name);
 
 #endif