Changeset f4b0911

Timestamp:

2010-05-01T14:10:32Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

3b878a1

Parents:

c2ecadc

Message:

Save the credentials again.

Files:

• lib/oauth.c (modified) (1 diff)
• lib/oauth.h (modified) (1 diff)
• protocols/twitter/twitter.c (modified) (2 diffs)

lib/oauth.c

@@ -425 +425 @@
         return ret ? g_string_free( ret, FALSE ) : NULL;
 }
+
+char *oauth_to_string( struct oauth_info *oi )
+{
+        GSList *params = NULL;
+        char *ret;
+        
+        oauth_params_add( &params, "oauth_token", oi->token );
+        oauth_params_add( &params, "oauth_token_secret", oi->token_secret );
+        ret = oauth_params_string( params );
+        oauth_params_free( &params );
+        
+        return ret;
+}
+
+struct oauth_info *oauth_from_string( char *in, struct oauth_service *sp )
+{
+        struct oauth_info *oi = g_new0( struct oauth_info, 1 );
+        GSList *params = NULL;
+        
+        oauth_params_parse( &params, in );
+        oi->token = g_strdup( oauth_params_get( &params, "oauth_token" ) );
+        oi->token_secret = g_strdup( oauth_params_get( &params, "oauth_token_secret" ) );
+        oauth_params_free( &params );
+        oi->sp = sp;
+        
+        return oi;
+}

lib/oauth.h

@@ -85 +85 @@
 /* Shouldn't normally be required unless the process is aborted by the user. */
 void oauth_info_free( struct oauth_info *info );
+
+/* Convert to and back from strings, for easier saving. */
+char *oauth_to_string( struct oauth_info *oi );
+struct oauth_info *oauth_from_string( char *in, struct oauth_service *sp );

protocols/twitter/twitter.c

@@ -124 +124 @@
                 /* IM mods didn't do this so far and it's ugly but I should
                    be able to get away with it... */
-                //g_free( ic->acc->pass );
-                //ic->acc->pass = g_strdup( info->access_token );
+                g_free( ic->acc->pass );
+                ic->acc->pass = oauth_to_string( info );
                 
                 twitter_main_loop_start( ic );
@@ -171 +171 @@
         if( !set_getbool( &acc->set, "oauth" ) )
                 td->pass = g_strdup( acc->pass );
-        //else if( strstr( acc->pass, "oauth_token=" ) )
-        //      td->oauth = 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;