Changeset 9c77fbf for protocols

Timestamp:

2012-09-22T12:47:55Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

6bef211

Parents:

c6fc24a (diff), 11ec078 (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 mainline.

Location:

protocols

Files:

• msn/ns.c (modified) (2 diffs)
• msn/soap.c (modified) (1 diff)
• twitter/twitter_lib.c (modified) (13 diffs)

protocols/msn/ns.c

@@ -740 +740 @@
                 char *psm_text = NULL;
                 
-                ubx = xt_from_string( msg );
+                ubx = xt_from_string( msg, msglen );
                 if( ubx && strcmp( ubx->name, "Data" ) == 0 &&
                     ( psm = xt_find_node( ubx->children, "PSM" ) ) )
@@ -752 +752 @@
                 struct xt_node *adl, *d, *c;
                 
-                if( !( adl = xt_from_string( msg ) ) )
+                if( !( adl = xt_from_string( msg, msglen ) ) )
                         return 1;
                 

protocols/msn/soap.c

@@ -229 +229 @@
         if( payload )
         {
-                struct xt_node *xt = xt_from_string( payload );
+                struct xt_node *xt = xt_from_string( payload, 0 );
                 if( xt )
                         xt_print( xt );

protocols/twitter/twitter_lib.c

@@ -168 +168 @@
 {
         static char *ret = NULL;
-        struct xt_parser *xp = NULL;
-        struct xt_node *node, *err;
+        struct xt_node *root, *node, *err;
 
         g_free(ret);
@@ -175 +174 @@
 
         if (req->body_size > 0) {
-                xp = xt_new(NULL, NULL);
-                xt_feed(xp, req->reply_body, req->body_size);
+                root = xt_from_string(req->reply_body, req->body_size);
                 
-                for (node = xp->root; node; node = node->next)
+                for (node = root; node; node = node->next)
                         if ((err = xt_find_node(node->children, "error")) && err->text_len > 0) {
                                 ret = g_strdup_printf("%s (%s)", req->status_string, err->text);
@@ -184 +182 @@
                         }
 
-                xt_free(xp);
+                xt_free_node(root);
         }
 
@@ -256 +254 @@
 {
         struct im_connection *ic;
-        struct xt_parser *parser;
+        struct xt_node *parsed;
         struct twitter_xml_list *txl;
         struct twitter_data *td;
@@ -292 +290 @@
 
         // Parse the data.
-        parser = xt_new(NULL, txl);
-        xt_feed(parser, req->reply_body, req->body_size);
-        twitter_xt_get_friends_id_list(parser->root, txl);
-        xt_free(parser);
+        parsed = xt_from_string(req->reply_body, req->body_size);
+        twitter_xt_get_friends_id_list(parsed, txl);
+        xt_free_node(parsed);
 
         td->follow_ids = txl->list;
@@ -352 +349 @@
         struct im_connection *ic = req->data;
         struct twitter_data *td;
-        struct xt_parser *parser;
+        struct xt_node *parsed;
         struct twitter_xml_list *txl;
         GSList *l = NULL;
@@ -377 +374 @@
 
         // Parse the data.
-        parser = xt_new(NULL, txl);
-        xt_feed(parser, req->reply_body, req->body_size);
+        parsed = xt_from_string(req->reply_body, req->body_size);
 
         // Get the user list from the parsed xml feed.
-        twitter_xt_get_users(parser->root, txl);
-        xt_free(parser);
+        twitter_xt_get_users(parsed, txl);
+        xt_free_node(parsed);
 
         // Add the users as buddies.
@@ -739 +735 @@
 
         if (td->flags & TWITTER_DOING_TIMELINE) {
-                return;
+                if (++td->http_fails >= 5) {
+                        imcb_error(ic, "Fetch timeout (%d)", td->flags);
+                        imc_logout(ic, TRUE);
+                }
         }
 
@@ -886 +885 @@
         struct im_connection *ic = req->data;
         struct twitter_data *td;
-        struct xt_parser *parser;
+        struct xt_node *parsed;
         struct twitter_xml_list *txl;
 
@@ -913 +912 @@
 
         // Parse the data.
-        parser = xt_new(NULL, txl);
-        xt_feed(parser, req->reply_body, req->body_size);
+        parsed = xt_from_string(req->reply_body, req->body_size);
         // The root <statuses> node should hold the list of statuses <status>
-        twitter_xt_get_status_list(ic, parser->root, txl);
-        xt_free(parser);
+        twitter_xt_get_status_list(ic, parsed, txl);
+        xt_free_node(parsed);
 
         td->home_timeline_obj = txl;
@@ -934 +932 @@
         struct im_connection *ic = req->data;
         struct twitter_data *td;
-        struct xt_parser *parser;
+        struct xt_node *parsed;
         struct twitter_xml_list *txl;
 
@@ -961 +959 @@
 
         // Parse the data.
-        parser = xt_new(NULL, txl);
-        xt_feed(parser, req->reply_body, req->body_size);
+        parsed = xt_from_string(req->reply_body, req->body_size);
         // The root <statuses> node should hold the list of statuses <status>
-        twitter_xt_get_status_list(ic, parser->root, txl);
-        xt_free(parser);
+        twitter_xt_get_status_list(ic, parsed, txl);
+        xt_free_node(parsed);
 
         td->mentions_obj = txl;
@@ -999 +996 @@
 
         if (req->body_size > 0) {
-                struct xt_parser *xp = NULL;
-                struct xt_node *node;
-
-                xp = xt_new(NULL, NULL);
-                xt_feed(xp, req->reply_body, req->body_size);
-
-                if ((node = xt_find_node(xp->root, "status")) &&
+                struct xt_node *parsed, *node;
+
+                parsed = xt_from_string(req->reply_body, req->body_size);
+
+                if ((node = xt_find_node(parsed, "status")) &&
                     (node = xt_find_node(node->children, "id")) && node->text)
                         td->last_status_id = g_ascii_strtoull(node->text, NULL, 10);
 
-                xt_free(xp);
+                xt_free_node(parsed);
         }
 }