Changes in protocols/twitter/twitter.c [bb5ce4d1:7d53efb]

File:

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

protocols/twitter/twitter.c

@@ -27 +27 @@
 #include "twitter_http.h"
 #include "twitter_lib.h"
-#include "url.h"
 
 /**
@@ -71 +70 @@
         "http://api.twitter.com/oauth/request_token",
         "http://api.twitter.com/oauth/access_token",
-        "https://api.twitter.com/oauth/authorize",
+        "http://api.twitter.com/oauth/authorize",
         .consumer_key = "xsDNKJuNZYkZyMcu914uEA",
         .consumer_secret = "FCxqcr0pXKzsF9ajmP57S3VQ8V6Drk4o2QYtqMcOszo",
@@ -161 +160 @@
         set_t *s;
         
-        s = set_add( &acc->set, "base_url", TWITTER_API_URL, NULL, acc );
-        s->flags |= ACC_SET_OFFLINE_ONLY;
-        
         s = set_add( &acc->set, "message_length", "140", set_eval_int, acc );
         
@@ -179 +175 @@
 {
         struct im_connection *ic = imcb_new( acc );
-        struct twitter_data *td;
+        struct twitter_data *td = g_new0( struct twitter_data, 1 );
         char name[strlen(acc->user)+9];
-        url_t url;
-
-        if( !url_set( &url, set_getstr( &ic->acc->set, "base_url" ) ) ||
-            ( url.proto != PROTO_HTTP && url.proto != PROTO_HTTPS ) )
-        {
-                imcb_error( ic, "Incorrect API base URL: %s", set_getstr( &ic->acc->set, "base_url" ) );
-                imc_logout( ic, FALSE );
-                return;
-        }
-        
+
         twitter_connections = g_slist_append( twitter_connections, ic );
-        td = g_new0( struct twitter_data, 1 );
         ic->proto_data = td;
-        
-        td->url_ssl = url.proto == PROTO_HTTPS;
-        td->url_port = url.port;
-        td->url_host = g_strdup( url.host );
-        if( strcmp( url.file, "/" ) != 0 )
-                td->url_path = g_strdup( url.file );
-        else
-                td->url_path = g_strdup( "" );
+        ic->flags |= OPT_DOES_HTML;
         
         td->user = acc->user;
-        if( strstr( acc->pass, "oauth_token=" ) )
+        if( !set_getbool( &acc->set, "oauth" ) )
+                td->pass = g_strdup( acc->pass );
+        else if( strstr( acc->pass, "oauth_token=" ) )
                 td->oauth_info = oauth_from_string( acc->pass, &twitter_oauth );
+        td->home_timeline_id = 0;
         
         sprintf( name, "twitter_%s", acc->user );
@@ -211 +193 @@
         imcb_buddy_status( ic, name, OPT_LOGGED_IN, NULL, NULL );
         
-        if( td->oauth_info || !set_getbool( &acc->set, "oauth" ) )
+        if( td->pass || td->oauth_info )
                 twitter_main_loop_start( ic );
         else
@@ -286 +268 @@
 static void twitter_add_buddy( struct im_connection *ic, char *who, char *group )
 {
+        twitter_friendships_create_destroy(ic, who, 1);
 }
 
 static void twitter_remove_buddy( struct im_connection *ic, char *who, char *group )
 {
+        twitter_friendships_create_destroy(ic, who, 0);
 }