adium/adium

Fix Twitter account creation.
adium-1.6
2013-03-21, Frank Dowsett
4c8a9ac739cc
Parents 55fda25d96ca
Children 41c3eb54cdc6
Fix Twitter account creation.
2 files changed, 5 insertions(+), 4 deletions(-)
  • +4 -3
    Plugins/Twitter Plugin/AITwitterAccountViewController.m
  • +1 -1
    Plugins/Twitter Plugin/STTwitter/STTwitterOAuth.m
    • --- a/Plugins/Twitter Plugin/AITwitterAccountViewController.m Thu Mar 21 14:06:17 2013 +0100
    +++ b/Plugins/Twitter Plugin/AITwitterAccountViewController.m Thu Mar 21 21:38:33 2013 -0400
    @@ -131,9 +131,10 @@
    };
    if ([textField_OAuthVerifier.stringValue isEqualToString:@""]) {
    - OAuthSetup = [STTwitterOAuth twitterServiceWithConsumerName:@"Adium"
    - consumerKey:[(AITwitterAccount *)account consumerKey]
    - consumerSecret:[(AITwitterAccount *)account secretKey]];
    + [OAuthSetup release];
    + OAuthSetup = [[STTwitterOAuth twitterServiceWithConsumerName:@"Adium"
    + consumerKey:[(AITwitterAccount *)account consumerKey]
    + consumerSecret:[(AITwitterAccount *)account secretKey]] retain];
    [OAuthSetup postTokenRequest:^(NSURL *url, NSString *oauthToken) {
    // We have a request token, ask user to authorize.
    [[NSWorkspace sharedWorkspace] openURL:url];
    --- a/Plugins/Twitter Plugin/STTwitter/STTwitterOAuth.m Thu Mar 21 14:06:17 2013 +0100
    +++ b/Plugins/Twitter Plugin/STTwitter/STTwitterOAuth.m Thu Mar 21 21:38:33 2013 -0400
    @@ -493,7 +493,7 @@
    id json = [NSJSONSerialization JSONObjectWithData:r.responseData options:NSJSONReadingMutableLeaves error:&jsonError];
    if(json == nil) {
    - errorBlock(jsonError);
    + successBlock(body); // response is not necessarily json, eg. https://api.twitter.com/oauth/request_token
    return;
    }