Changes in protocols/jabber/iq.c [7554702:b38f655]

File:

• protocols/jabber/iq.c (modified) (7 diffs)

protocols/jabber/iq.c

@@ -28 +28 @@
 static xt_status jabber_iq_display_vcard(struct im_connection *ic, struct xt_node *node, struct xt_node *orig);
 static xt_status jabber_gmail_handle_new(struct im_connection *ic, struct xt_node *node);
-static xt_status jabber_iq_carbons_response(struct im_connection *ic, struct xt_node *node, struct xt_node *orig);
 
 xt_status jabber_pkt_iq(struct xt_node *node, gpointer data)
@@ -53 +52 @@
                       (c = xt_find_node(node->children, "time"))) ||
                     !(s = xt_find_attr(c, "xmlns"))) {
-
-                        reply = jabber_make_error_packet(node, "service-unavailable", "cancel", NULL);
-                        st = jabber_write_packet(ic, reply);
-                        xt_free_node(reply);
-                        return st;
+                        /* Sigh. Who decided to suddenly invent new elements
+                           instead of just sticking with <query/>? */
+                        return XT_HANDLED;
                 }
 
@@ -121 +118 @@
                                                    XMLNS_BYTESTREAMS,
                                                    XMLNS_FILETRANSFER,
-                                                   XMLNS_CARBONS,
                                                    NULL };
                         const char **f;
@@ -138 +134 @@
                 } else {
                         xt_free_node(reply);
-                        reply = jabber_make_error_packet(node, "service-unavailable", "cancel", NULL);
+                        reply = jabber_make_error_packet(node, "feature-not-implemented", "cancel", NULL);
                         pack = 0;
                 }
@@ -389 +385 @@
         struct xt_node *response;
         struct jabber_data *jd = ic->proto_data;
-        
-        response = jabber_make_packet("iq", "result", jd->me, NULL);
+
+        response = jabber_make_packet("iq", "result", g_strdup_printf("%s@%s", jd->username, jd->server), NULL);
 
         jabber_cache_add(ic, response, NULL);
@@ -1008 +1004 @@
 {
         struct jabber_data *jd = ic->proto_data;
-        struct xt_node *query, *id;
-
-        if (!(query = xt_find_node(node->children, "query"))) {
-                return XT_HANDLED;
-        }
-
-        if (xt_find_node_by_attr(query->children, "feature", "var", XMLNS_CARBONS) &&
-            set_getbool(&ic->acc->set, "carbons")) {
-
-                struct xt_node *enable, *iq;
-
-                enable = xt_new_node("enable", NULL, NULL);
-                xt_add_attr(enable, "xmlns", XMLNS_CARBONS);
-                iq = jabber_make_packet("iq", "set", NULL, enable);
-
-                jabber_cache_add(ic, iq, jabber_iq_carbons_response);
-                jabber_write_packet(ic, iq);
-        }
-
-        if ((id = xt_find_node(query->children, "identity"))) {
+        struct xt_node *id;
+
+        if ((id = xt_find_path(node, "query/identity"))) {
                 char *cat, *type, *name;
 
@@ -1044 +1023 @@
         return XT_HANDLED;
 }
-
-static xt_status jabber_iq_carbons_response(struct im_connection *ic,
-                                            struct xt_node *node, struct xt_node *orig)
-{
-        struct jabber_error *err;
-
-        if ((err = jabber_error_parse(xt_find_node(node->children, "error"), XMLNS_STANZA_ERROR))) {
-                imcb_error(ic, "Error enabling carbons: %s%s%s",
-                           err->code, err->text ? ": " : "", err->text ? err->text : "");
-                jabber_error_free(err);
-        } else {
-                imcb_log(ic, "Carbons enabled");
-        }
-
-        return XT_HANDLED;
-}