Changeset 537d9b9 for protocols/jabber/jabber.h

Timestamp:

2016-11-20T08:40:36Z (7 years ago)

Author:

dequis <dx@…>

Children:

3f44e43

Parents:

ba52ac5 (diff), 9f03c47 (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 master up to commit '9f03c47' into parson

File:

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

protocols/jabber/jabber.h

@@ -75 +75 @@
         JCFLAG_MESSAGE_SENT = 1,        /* Set this after sending the first message, so
                                            we can detect echoes/backlogs. */
+        JCFLAG_ALWAYS_USE_NICKS = 2,
 } jabber_chat_flags_t;
 
@@ -262 +263 @@
 void jabber_iq_version_send(struct im_connection *ic, struct jabber_buddy *bud, void *data);
 int jabber_iq_disco_server(struct im_connection *ic);
+int jabber_iq_disco_muc(struct im_connection *ic, const char *muc_server);
 
 /* si.c */
@@ -339 +341 @@
 int sasl_oauth2_get_refresh_token(struct im_connection *ic, const char *msg);
 int sasl_oauth2_refresh(struct im_connection *ic, const char *refresh_token);
+void sasl_oauth2_got_token(gpointer data, const char *access_token, const char *refresh_token, const char *error);
 
 extern const struct oauth2_service oauth2_service_google;
 
 /* conference.c */
-struct groupchat *jabber_chat_join(struct im_connection *ic, const char *room, const char *nick, const char *password);
+struct groupchat *jabber_chat_join(struct im_connection *ic, const char *room, const char *nick, const char *password,
+                                   gboolean always_use_nicks);
 struct groupchat *jabber_chat_with(struct im_connection *ic, char *who);
 struct groupchat *jabber_chat_by_jid(struct im_connection *ic, const char *name);