Changes in protocols/jabber/jabber.h [0e4c3dd:5ebff60]

File:

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

protocols/jabber/jabber.h

@@ -77 +77 @@
 } jabber_chat_flags_t;
 
-typedef enum {
-        JSUB_NONE = 0,
-        JSUB_GTALK,
-        JSUB_FACEBOOK,
-        JSUB_HIPCHAT,
-} jabber_subproto_t;
-
-typedef struct {
-        const char *name;
-        jabber_subproto_t id;
-        const struct oauth2_service *oauth2_service;
-        const char *server;
-} jabber_subproto_desc_t;
-
 struct jabber_data {
         struct im_connection *ic;
@@ -102 +88 @@
         struct xt_parser *xt;
         jabber_flags_t flags;
-        jabber_subproto_t subproto;
 
         char *username;         /* USERNAME@server */
@@ -250 +235 @@
 #define XMLNS_IBB          "http://jabber.org/protocol/ibb"                      /* XEP-0047 */
 
-/* Hipchat protocol extensions*/
-#define XMLNS_HIPCHAT         "http://hipchat.com"
-#define XMLNS_HIPCHAT_PROFILE "http://hipchat.com/protocol/profile"
-#define XMLNS_HIPCHAT_MUC     "http://hipchat.com/protocol/muc#room"
-
 /* jabber.c */
 void jabber_connect(struct im_connection *ic);
@@ -264 +244 @@
 int jabber_get_roster(struct im_connection *ic);
 int jabber_get_vcard(struct im_connection *ic, char *bare_jid);
-int jabber_iq_disco_muc(struct im_connection *ic, char *muc_server);
 int jabber_add_to_roster(struct im_connection *ic, const char *handle, const char *name, const char *group);
 int jabber_remove_from_roster(struct im_connection *ic, char *handle);
@@ -270 +249 @@
 xt_status jabber_iq_query_server(struct im_connection *ic, char *jid, char *xmlns);
 void jabber_iq_version_send(struct im_connection *ic, struct jabber_buddy *bud, void *data);
-int jabber_iq_disco_server(struct im_connection *ic);
 
 /* si.c */
@@ -328 +306 @@
 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[];
@@ -364 +341 @@
 void jabber_chat_invite(struct groupchat *c, char *who, char *message);
 
-/* hipchat.c */
-int jabber_get_hipchat_profile(struct im_connection *ic);
-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);
-xt_status jabber_parse_muc_list(struct im_connection *ic, struct xt_node *node, struct xt_node *orig);
-
 #endif