Changeset 93cc86f

Timestamp:

2011-03-08T06:24:34Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

7add7ec

Parents:

9e9140b

Message:

Twitter: Warn the user if the OAuth username and the configured username
don't match. This is not a real problem but can be confusing if you don't
expect it.

Files:

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

lib/oauth.c

@@ -229 +229 @@
                 g_free( info->token );
                 g_free( info->token_secret );
+                oauth_params_free( &info->params );
                 g_free( info );
         }
@@ -354 +355 @@
         if( req->status_code == 200 )
         {
-                GSList *params = NULL;
-                
-                oauth_params_parse( &params, req->reply_body );
-                st->token = g_strdup( oauth_params_get( &params, "oauth_token" ) );
-                st->token_secret = g_strdup( oauth_params_get( &params, "oauth_token_secret" ) );
-                oauth_params_free( &params );
+                oauth_params_parse( &st->params, req->reply_body );
+                st->token = g_strdup( oauth_params_get( &st->params, "oauth_token" ) );
+                st->token_secret = g_strdup( oauth_params_get( &st->params, "oauth_token_secret" ) );
         }
         
@@ -370 +368 @@
                 g_free( st->request_token );
                 st->request_token = NULL;
+                oauth_params_free( &st->params );
         }
 }

lib/oauth.h

@@ -52 +52 @@
         char *token;
         char *token_secret;
+        GSList *params;
 };
 
@@ -89 +90 @@
 char *oauth_to_string( struct oauth_info *oi );
 struct oauth_info *oauth_from_string( char *in, const struct oauth_service *sp );
+
+/* For reading misc. data. */
+const char *oauth_params_get( GSList **params, const char *key );

protocols/twitter/twitter.c

@@ -149 +149 @@
                         return FALSE;
                 }
+                else
+                {
+                        const char *sn = oauth_params_get( &info->params, "screen_name" );
+                        
+                        if( sn != NULL && ic->acc->prpl->handle_cmp( sn, ic->acc->user ) != 0 )
+                        {
+                                imcb_log( ic, "Warning: You logged in via OAuth as %s "
+                                          "instead of %s.", sn, ic->acc->user );
+                        }
+                }
                 
                 /* IM mods didn't do this so far and it's ugly but I should