Changeset 3353b5e

Timestamp:

2010-06-30T23:56:46Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e1f3f94

Parents:

52a2521 (diff), 8203da9 (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:

A few Twitter fixes from mainline.

Location:

protocols/twitter

Files:

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

protocols/twitter/twitter.c

@@ -269 +269 @@
                     td->oauth_info && td->oauth_info->token == NULL )
                 {
-                        if( !oauth_access_token( message, td->oauth_info ) )
+                        char pin[strlen(message)+1], *s;
+                        
+                        strcpy( pin, message );
+                        for( s = pin + sizeof( pin ) - 2; s > pin && isspace( *s ); s -- )
+                                *s = '\0';
+                        for( s = pin; *s && isspace( *s ); s ++ ) {}
+                        
+                        if( !oauth_access_token( s, td->oauth_info ) )
                         {
                                 imcb_error( ic, "OAuth error: %s", "Failed to send access token request" );

protocols/twitter/twitter_lib.c

@@ -42 +42 @@
 struct twitter_xml_list {
         int type;
-        int next_cursor;
+        gint64 next_cursor;
         GSList *list;
         gpointer data;
@@ -155 +155 @@
  * Get the friends ids.
  */
-void twitter_get_friends_ids(struct im_connection *ic, int next_cursor)
+void twitter_get_friends_ids(struct im_connection *ic, gint64 next_cursor)
 {
         // Primitive, but hey! It works...      
         char* args[2];
         args[0] = "cursor";
-        args[1] = g_strdup_printf ("%d", next_cursor);
+        args[1] = g_strdup_printf ("%lld", (long long) next_cursor);
         twitter_http(ic, TWITTER_FRIENDS_IDS_URL, twitter_http_get_friends_ids, ic, 0, args, 2);
 
@@ -171 +171 @@
 static xt_status twitter_xt_next_cursor( struct xt_node *node, struct twitter_xml_list *txl )
 {
-        // Do something with the cursor.
-        txl->next_cursor = node->text != NULL ? atoi(node->text) : -1;
+        char *end = NULL;
+        
+        if( node->text )
+                txl->next_cursor = g_ascii_strtoll( node->text, &end, 10 );
+        if( end == NULL )
+                txl->next_cursor = -1;
 
         return XT_HANDLED;
@@ -415 +419 @@
  * Get the timeline.
  */
-void twitter_get_home_timeline(struct im_connection *ic, int next_cursor)
+void twitter_get_home_timeline(struct im_connection *ic, gint64 next_cursor)
 {
         struct twitter_data *td = ic->proto_data;
@@ -421 +425 @@
         char* args[4];
         args[0] = "cursor";
-        args[1] = g_strdup_printf ("%d", next_cursor);
+        args[1] = g_strdup_printf ("%lld", (long long) next_cursor);
         if (td->home_timeline_id) {
                 args[2] = "since_id";
@@ -667 +671 @@
  * Get the friends.
  */
-void twitter_get_statuses_friends(struct im_connection *ic, int next_cursor)
+void twitter_get_statuses_friends(struct im_connection *ic, gint64 next_cursor)
 {
         char* args[2];
         args[0] = "cursor";
-        args[1] = g_strdup_printf ("%d", next_cursor);
+        args[1] = g_strdup_printf ("%lld", (long long) next_cursor);
 
         twitter_http(ic, TWITTER_SHOW_FRIENDS_URL, twitter_http_get_statuses_friends, ic, 0, args, 2);

protocols/twitter/twitter_lib.h

@@ -76 +76 @@
 #define TWITTER_BLOCKS_DESTROY_URL "/blocks/destroy/"
 
-void twitter_get_friends_ids(struct im_connection *ic, int next_cursor);
-void twitter_get_home_timeline(struct im_connection *ic, int next_cursor);
-void twitter_get_statuses_friends(struct im_connection *ic, int next_cursor);
+void twitter_get_friends_ids(struct im_connection *ic, gint64 next_cursor);
+void twitter_get_home_timeline(struct im_connection *ic, gint64 next_cursor);
+void twitter_get_statuses_friends(struct im_connection *ic, gint64 next_cursor);
 
 void twitter_post_status(struct im_connection *ic, char *msg);