Changeset 8b8def58 for protocols/twitter/twitter.c

Timestamp:

2010-06-24T09:14:34Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

41d415b

Parents:

7cd2e8a (diff), 38ff846 (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:

Merging a few revisions from mainline.

File:

• protocols/twitter/twitter.c (modified) (5 diffs)

protocols/twitter/twitter.c

@@ -40 +40 @@
                 return 0;
 
-        // If the user uses multiple private message windows we need to get the 
-        // users buddies.
-        if (g_strcasecmp(set_getstr(&ic->acc->set, "mode"), "many") == 0)
-                twitter_get_statuses_friends(ic, -1);
-
         // Do stuff..
         twitter_get_home_timeline(ic, -1);
@@ -56 +51 @@
         struct twitter_data *td = ic->proto_data;
         
-        imcb_log( ic, "Connecting to Twitter" );
+        imcb_log( ic, "Getting initial statuses" );
 
         // Run this once. After this queue the main loop function.
@@ -66 +61 @@
 }
 
+static void twitter_oauth_start( struct im_connection *ic );
+
+void twitter_login_finish( struct im_connection *ic )
+{
+        struct twitter_data *td = ic->proto_data;
+        
+        if( set_getbool( &ic->acc->set, "oauth" ) && !td->oauth_info )
+                twitter_oauth_start( ic );
+        else if( g_strcasecmp( set_getstr( &ic->acc->set, "mode" ), "one" ) != 0 &&
+                 !( td->flags & TWITTER_HAVE_FRIENDS ) )
+        {
+                imcb_log( ic, "Getting contact list" );
+                twitter_get_statuses_friends( ic, -1 );
+        }
+        else
+                twitter_main_loop_start( ic );
+}
 
 static const struct oauth_service twitter_oauth =
@@ -128 +140 @@
                 ic->acc->pass = oauth_to_string( info );
                 
-                twitter_main_loop_start( ic );
+                twitter_login_finish( ic );
         }
         
@@ -211 +223 @@
         imcb_buddy_status( ic, name, OPT_LOGGED_IN, NULL, NULL );
         
-        if( td->oauth_info || !set_getbool( &acc->set, "oauth" ) )
-                twitter_main_loop_start( ic );
-        else
-                twitter_oauth_start( ic );
+        imcb_log( ic, "Connecting" );
+        
+        twitter_login_finish( ic );
 }