Changes in protocols/jabber/hipchat.c [830864d:40cfbc5]

File:

• protocols/jabber/hipchat.c (modified) (4 diffs)

protocols/jabber/hipchat.c

@@ -27 +27 @@
 {
         struct jabber_data *jd = ic->proto_data;
-        char *sep, *jid, *muc_host;
+        char *sep, *jid;
 
         jid = xt_find_attr(node, "jid");
-        muc_host = xt_find_attr(node, "muc_host");
 
         sep = strchr(jid, '/');
@@ -47 +46 @@
         jd->flags &= ~JFLAG_STREAM_RESTART;
 
-        if (!jabber_get_roster(ic)) {
-                return XT_ABORT;
-        }
-        if (!jabber_iq_disco_server(ic)) {
-                return XT_ABORT;
-        }
-        if (!jabber_get_hipchat_profile(ic)) {
-                return XT_ABORT;
-        }
-        if (!jabber_iq_disco_muc(ic, muc_host)) {
+        if (!jabber_get_roster(ic) ||
+            !jabber_iq_disco_server(ic) ||
+            !jabber_get_hipchat_profile(ic)) {
                 return XT_ABORT;
         }
@@ -85 +77 @@
         struct xt_node *query, *name_node;
 
-        //char *name;
-
         if (!(query = xt_find_node(node->children, "query"))) {
                 imcb_log(ic, "Warning: Received NULL profile packet");
@@ -102 +92 @@
 
 }
-
-int jabber_iq_disco_muc(struct im_connection *ic, char *muc_server)
-{
-        struct xt_node *node;
-        int st;
-
-        imcb_log(ic, "Fetching MUC list");
-
-        node = xt_new_node("query", NULL, NULL);
-        xt_add_attr(node, "xmlns", XMLNS_DISCO_ITEMS);
-        node = jabber_make_packet("iq", "get", muc_server, node);
-
-        jabber_cache_add(ic, node, jabber_parse_muc_list);
-        st = jabber_write_packet(ic, node);
-
-        return st;
-}
-
-xt_status jabber_parse_muc_list(struct im_connection *ic, struct xt_node *node, struct xt_node *orig)
-{
-        struct xt_node *query, *c;
-
-        if (!(query = xt_find_node(node->children, "query"))) {
-                imcb_log(ic, "Warning: Received NULL MUC list packet");
-                return XT_HANDLED;
-        }
-
-        c = query->children;
-        while ((c = xt_find_node(c, "item"))) {
-                struct xt_node *c2;
-                char *topic = NULL;
-                char *jid = xt_find_attr(c, "jid");
-                char *name = xt_find_attr(c, "name");
-
-                imcb_log(ic, "Debug: adding MUC to channel list: %s - '%s'", jid, name);
-
-                if ((c2 = xt_find_node_by_attr(c->children, "x", "xmlns", XMLNS_HIPCHAT_MUC)) &&
-                    (c2 = xt_find_node(c2->children, "topic"))) {
-                        topic = c2->text;
-                }
-
-                imcb_chat_placeholder_new(ic, jid, name, topic);
-                c = c->next;
-        }
-        return XT_HANDLED;
-
-}