Changeset 18dbb20 for protocols

Timestamp:

2010-04-27T22:42:07Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

0bff877

Parents:

ee84bdb

Message:

Valgrind cleanup.

File:

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

protocols/twitter/twitter.c

@@ -66 +66 @@
 }
 
-static void twitter_oauth_callback( struct oauth_info *info );
+static gboolean twitter_oauth_callback( struct oauth_info *info );
 
 static void twitter_oauth_start( struct im_connection *ic )
 {
+        struct twitter_data *td = ic->proto_data;
+        
         imcb_log( ic, "Requesting OAuth request token" );
 
-        oauth_request_token( TWITTER_OAUTH_REQUEST_TOKEN, twitter_oauth_callback, ic );
-}
-
-static void twitter_oauth_callback( struct oauth_info *info )
+        td->oauth_info = oauth_request_token(
+                TWITTER_OAUTH_REQUEST_TOKEN, twitter_oauth_callback, ic );
+}
+
+static gboolean twitter_oauth_callback( struct oauth_info *info )
 {
         struct im_connection *ic = info->data;
-        struct twitter_data *td = ic->proto_data;
-        
+        struct twitter_data *td;
+        
+        if( !g_slist_find( twitter_connections, ic ) )
+                return FALSE;
+        
+        td = ic->proto_data;
         if( info->stage == OAUTH_REQUEST_TOKEN )
         {
@@ -88 +95 @@
                         imcb_error( ic, "OAuth error: %s", info->http->status_string );
                         imc_logout( ic, TRUE );
-                        return;
+                        return FALSE;
                 }
-                
-                td->oauth_info = info;
                 
                 sprintf( name, "twitter_%s", ic->acc->user );
@@ -106 +111 @@
                         imcb_error( ic, "OAuth error: %s", info->http->status_string );
                         imc_logout( ic, TRUE );
-                        return;
+                        return FALSE;
                 }
                 
@@ -118 +123 @@
                 twitter_main_loop_start( ic );
         }
+        
+        return TRUE;
 }
 
@@ -188 +195 @@
         if( td )
         {
+                oauth_info_free( td->oauth_info );
+                
                 g_free( td->pass );
                 g_free( td->oauth );
@@ -206 +215 @@
             g_strcasecmp(who + 8, ic->acc->user) == 0)
         {
-                if( set_getbool( &ic->acc->set, "oauth" ) && td->oauth == NULL )
+                if( set_getbool( &ic->acc->set, "oauth" ) && td->oauth_info )
+                {
                         oauth_access_token( TWITTER_OAUTH_ACCESS_TOKEN, message, td->oauth_info );
+                        td->oauth_info = NULL;
+                }
                 else
                         twitter_post_status(ic, message);