Changeset 2f9027c

Timestamp:

2013-06-16T17:33:58Z (11 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

7e84168

Parents:

1a2c1c0

Message:

Fix cleanup failure on Twitter timeouts.

Location:

protocols/twitter

Files:

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

protocols/twitter/twitter.c

@@ -40 +40 @@
         // Check if we are still logged in...
         if (!g_slist_find(twitter_connections, ic))
-                return 0;
+                return FALSE;
 
         // Do stuff..
-        twitter_get_timeline(ic, -1);
-
-        // If we are still logged in run this function again after timeout.
-        return (ic->flags & OPT_LOGGED_IN) == OPT_LOGGED_IN;
+        return twitter_get_timeline(ic, -1) &&
+               ((ic->flags & OPT_LOGGED_IN) == OPT_LOGGED_IN);
 }
 

protocols/twitter/twitter_lib.c

@@ -900 +900 @@
  * Get the timeline with optionally mentions
  */
-void twitter_get_timeline(struct im_connection *ic, gint64 next_cursor)
+gboolean twitter_get_timeline(struct im_connection *ic, gint64 next_cursor)
 {
         struct twitter_data *td = ic->proto_data;
@@ -909 +909 @@
                         imcb_error(ic, "Fetch timeout (%d)", td->flags);
                         imc_logout(ic, TRUE);
+                        return FALSE;
                 }
         }
@@ -919 +920 @@
                 twitter_get_mentions(ic, next_cursor);
         }
+        
+        return TRUE;
 }
 

protocols/twitter/twitter_lib.h

@@ -82 +82 @@
 
 gboolean twitter_open_stream(struct im_connection *ic);
-void twitter_get_timeline(struct im_connection *ic, gint64 next_cursor);
+gboolean twitter_get_timeline(struct im_connection *ic, gint64 next_cursor);
 void twitter_get_friends_ids(struct im_connection *ic, gint64 next_cursor);
 void twitter_get_statuses_friends(struct im_connection *ic, gint64 next_cursor);