adium/adium

Merged adium-1.5.7 into adium-1.6.
adium-1.6
2013-06-29, Thijs Alkemade
4c09a9c47209
Parents b21557d6db3041c3ce5d4fd0
Children 3c13f50a2032
Merged adium-1.5.7 into adium-1.6.
2 files changed, 2 insertions(+), 1 deletions(-)
  • +1 -1
    ChangeLogs/Changes.txt
  • +1 -0
    Plugins/Twitter Plugin/AITwitterAccount.m
    • --- a/ChangeLogs/Changes.txt Tue Jun 25 21:49:22 2013 +0200
    +++ b/ChangeLogs/Changes.txt Sat Jun 29 13:59:00 2013 +0200
    @@ -58,7 +58,7 @@
    - "Proxy bypass when registered jabber handle" (#15957)
    Version 1.5.7 (XX/06/2013)
    - * Updated Twitter support.
    + * Updated Twitter support. (#16118)
    * Retweets (RTs) now properly display the original author.
    * t.co links are now expanded.
    * Fixed parsing to conform to the standard. (#13947)
    --- a/Plugins/Twitter Plugin/AITwitterAccount.m Tue Jun 25 21:49:22 2013 +0200
    +++ b/Plugins/Twitter Plugin/AITwitterAccount.m Sat Jun 29 13:59:00 2013 +0200
    @@ -198,6 +198,7 @@
    [self didConnect];
    }
    } errorBlock:^(NSError *error) {
    + AILogWithSignature(@"Unable to retrieve user list: %@", error);
    [self setLastDisconnectionError:AILocalizedString(@"Unable to retrieve user list [fail]", "Message when a (vital) twitter request to retrieve the follow list fails")];
    [self didDisconnect];
    }];