Changeset 6eca2eb

Timestamp:

2011-04-18T14:14:08Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

2423c93

Parents:

6cc36ef

Message:

Try to show better Twitter error messages. Sadly this doesn't always work
since Twitter can't seem to make up their mind on the formatting of their
error responses, sometimes using XML and sometimes plain text.

Location:

protocols/twitter

Files:

• twitter.c (modified) (2 diffs)
• twitter.h (modified) (1 diff)
• twitter_lib.c (modified) (3 diffs)

protocols/twitter/twitter.c

@@ -151 +151 @@
                 if( info->request_token == NULL )
                 {
-                        imcb_error( ic, "OAuth error: %s", info->http->status_string );
+                        imcb_error( ic, "OAuth error: %s", twitter_parse_error( info->http ) );
                         imc_logout( ic, TRUE );
                         return FALSE;
@@ -167 +167 @@
                 if( info->token == NULL || info->token_secret == NULL )
                 {
-                        imcb_error( ic, "OAuth error: %s", info->http->status_string );
+                        imcb_error( ic, "OAuth error: %s", twitter_parse_error( info->http ) );
                         imc_logout( ic, TRUE );
                         return FALSE;

protocols/twitter/twitter.h

@@ -85 +85 @@
 void twitter_login_finish( struct im_connection *ic );
 
+struct http_request;
+char *twitter_parse_error( struct http_request *req );
+
 #endif //_TWITTER_H

protocols/twitter/twitter_lib.c

@@ -142 +142 @@
 /* Warning: May return a malloc()ed value, which will be free()d on the next
    call. Only for short-term use. */
-static char *twitter_parse_error(struct http_request *req)
+char *twitter_parse_error(struct http_request *req)
 {
         static char *ret = NULL;
@@ -161 +161 @@
                 {
                         ret = g_strdup_printf("%s (%s)", req->status_string, node->text);
-                        xt_free(xp);
-                        return ret;
                 }
                 
@@ -168 +166 @@
         }
         
-        return req->status_string;
+        return ret ? ret : req->status_string;
 }