Changes in protocols/jabber/jabber.h [e14b47b8:96f954d]

File:

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

protocols/jabber/jabber.h

@@ -47 +47 @@
         JFLAG_XMLCONSOLE = 64,          /* If the user added an xmlconsole buddy. */
         JFLAG_STARTTLS_DONE = 128,      /* If a plaintext session was converted to TLS. */
-        
-        JFLAG_SASL_FB = 0x10000,        /* Trying Facebook authentication. */
 } jabber_flags_t;
 
@@ -94 +92 @@
         char *username;         /* USERNAME@server */
         char *server;           /* username@SERVER -=> server/domain, not hostname */
-        char *me;               /* bare jid */
-        
-        const struct oauth2_service *oauth2_service;
-        char *oauth2_access_token;
         
         /* After changing one of these two (or the priority setting), call
@@ -238 +232 @@
 #define XMLNS_IBB          "http://jabber.org/protocol/ibb"                      /* XEP-0047 */
 
-/* jabber.c */
-void jabber_connect( struct im_connection *ic );
-
 /* iq.c */
 xt_status jabber_pkt_iq( struct xt_node *node, gpointer data );
@@ -309 +300 @@
 struct jabber_error *jabber_error_parse( struct xt_node *node, char *xmlns );
 void jabber_error_free( struct jabber_error *err );
-gboolean jabber_set_me( struct im_connection *ic, const char *me );
 
 extern const struct jabber_away_state jabber_away_state_list[];
@@ -317 +307 @@
 int jabber_write( struct im_connection *ic, char *buf, int len );
 gboolean jabber_connected_plain( gpointer data, gint source, b_input_condition cond );
-gboolean jabber_connected_ssl( gpointer data, void *source, b_input_condition cond );
+gboolean jabber_connected_ssl( gpointer data, int returncode, void *source, b_input_condition cond );
 gboolean jabber_start_stream( struct im_connection *ic );
 void jabber_end_stream( struct im_connection *ic );
@@ -326 +316 @@
 xt_status sasl_pkt_result( struct xt_node *node, gpointer data );
 gboolean sasl_supported( struct im_connection *ic );
-void sasl_oauth2_init( struct im_connection *ic );
-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 );
-
-extern const struct oauth2_service oauth2_service_google;
-extern const struct oauth2_service oauth2_service_facebook;
-extern const struct oauth2_service oauth2_service_mslive;
 
 /* conference.c */