adium-1.4 3549:42caafcfe810: im.pidgin.adium.1-4 @ 9fa905dc57b22...
commits at adium.im
commits at adium.im
Sat Jun 25 21:08:59 UTC 2011
details: http://hg.adium.im/adium-1.4/rev/42caafcfe810
revision: 3549:42caafcfe810
branch: (none)
author: Evan Schoenberg
date: Sat Jun 25 16:08:05 2011 -0500
im.pidgin.adium.1-4 @ 9fa905dc57b224f6ecc51361480da7be9668055c with MSNp15 enabled (downgrading from MSNp16). It connects and lets me send messages. Beyond that, someone who uses MSN needs to test it :)
Fixes #15256. Note that this is only on adium-1.4; I'm not recompiling adium 1.5's libpurple at this time.
Subject: adium-1.4 3550:347fdddcbd15: Resolved a warning
details: http://hg.adium.im/adium-1.4/rev/347fdddcbd15
revision: 3550:347fdddcbd15
branch: (none)
author: Evan Schoenberg
date: Sat Jun 25 16:08:31 2011 -0500
Resolved a warning
Subject: adium-1.4 3551:7309beb46a0a: Properly use the defaults system for the connect host of Twitter. Clear out a previously set preference for twitter.com. Set the apiPath to /1. Fixes retrieving the Twitter user list. Fixes #15239
details: http://hg.adium.im/adium-1.4/rev/7309beb46a0a
revision: 3551:7309beb46a0a
branch: (none)
author: Evan Schoenberg
date: Sat Jun 25 16:02:59 2011 -0500
Properly use the defaults system for the connect host of Twitter. Clear out a previously set preference for twitter.com. Set the apiPath to /1. Fixes retrieving the Twitter user list. Fixes #15239
(transplanted from 6ca41449fc055d04ebd45011479fb3c636e65a1f)
diffs (134 lines):
diff -r 91f6b5e157f6 -r 7309beb46a0a Frameworks/libpurple.framework/Versions/0/Headers/marshallers.h
--- a/Frameworks/libpurple.framework/Versions/0/Headers/marshallers.h Sat Jun 25 15:34:53 2011 -0500
+++ b/Frameworks/libpurple.framework/Versions/0/Headers/marshallers.h Sat Jun 25 16:02:59 2011 -0500
@@ -6,7 +6,7 @@
G_BEGIN_DECLS
-/* VOID:POINTER,POINTER,OBJECT (/Users/thijs/Projects/Checkouts/Adium/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:1) */
+/* VOID:POINTER,POINTER,OBJECT (/Users/evands/coding/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:1) */
extern void purple_smarshal_VOID__POINTER_POINTER_OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -14,7 +14,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* BOOLEAN:OBJECT,POINTER,STRING (/Users/thijs/Projects/Checkouts/Adium/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:2) */
+/* BOOLEAN:OBJECT,POINTER,STRING (/Users/evands/coding/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:2) */
extern void purple_smarshal_BOOLEAN__OBJECT_POINTER_STRING (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -22,7 +22,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:STRING,STRING (/Users/thijs/Projects/Checkouts/Adium/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:3) */
+/* VOID:STRING,STRING (/Users/evands/coding/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:3) */
extern void purple_smarshal_VOID__STRING_STRING (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -30,7 +30,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:STRING,STRING,DOUBLE (/Users/thijs/Projects/Checkouts/Adium/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:4) */
+/* VOID:STRING,STRING,DOUBLE (/Users/evands/coding/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:4) */
extern void purple_smarshal_VOID__STRING_STRING_DOUBLE (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -38,7 +38,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:ENUM,STRING,STRING (/Users/thijs/Projects/Checkouts/Adium/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:5) */
+/* VOID:ENUM,STRING,STRING (/Users/evands/coding/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:5) */
extern void purple_smarshal_VOID__ENUM_STRING_STRING (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -46,7 +46,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:ENUM,STRING,STRING,BOOLEAN (/Users/thijs/Projects/Checkouts/Adium/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:6) */
+/* VOID:ENUM,STRING,STRING,BOOLEAN (/Users/evands/coding/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:6) */
extern void purple_smarshal_VOID__ENUM_STRING_STRING_BOOLEAN (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -54,7 +54,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:FLAGS,FLAGS (/Users/thijs/Projects/Checkouts/Adium/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:7) */
+/* VOID:FLAGS,FLAGS (/Users/evands/coding/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:7) */
extern void purple_smarshal_VOID__FLAGS_FLAGS (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -62,7 +62,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:STRING,STRING,OBJECT,OBJECT (/Users/thijs/Projects/Checkouts/Adium/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:8) */
+/* VOID:STRING,STRING,OBJECT,OBJECT (/Users/evands/coding/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:8) */
extern void purple_smarshal_VOID__STRING_STRING_OBJECT_OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
diff -r 91f6b5e157f6 -r 7309beb46a0a Frameworks/libpurple.framework/Versions/0/libpurple
Binary file Frameworks/libpurple.framework/Versions/0/libpurple has changed
diff -r 91f6b5e157f6 -r 7309beb46a0a Plugins/Purple Service/AIFacebookXMPPAccountViewController.h
--- a/Plugins/Purple Service/AIFacebookXMPPAccountViewController.h Sat Jun 25 15:34:53 2011 -0500
+++ b/Plugins/Purple Service/AIFacebookXMPPAccountViewController.h Sat Jun 25 16:02:59 2011 -0500
@@ -20,7 +20,7 @@
@property (assign) IBOutlet NSProgressIndicator *spinner;
@property (assign) IBOutlet NSTextField *textField_OAuthStatus;
- at property (assign) IBOutlet NSButton *button_OAuthStart;
+ at property (assign) IBOutlet AILocalizationButton *button_OAuthStart;
@property (assign) IBOutlet NSButton *button_help;
- (IBAction)showHelp:(id)sender;
diff -r 91f6b5e157f6 -r 7309beb46a0a Plugins/Twitter Plugin/AITwitterAccount.m
--- a/Plugins/Twitter Plugin/AITwitterAccount.m Sat Jun 25 15:34:53 2011 -0500
+++ b/Plugins/Twitter Plugin/AITwitterAccount.m Sat Jun 25 16:02:59 2011 -0500
@@ -95,10 +95,19 @@
forGroup:TWITTER_PREFERENCE_GROUP_UPDATES
object:self];
- // If we don't have a server set, set our default (if we have one)
- if (!self.host && self.defaultServer) {
- [self setPreference:self.defaultServer forKey:KEY_CONNECT_HOST group:GROUP_ACCOUNT_STATUS];
- }
+ /* twitter.com isn't a valid server, but it was stored directly in the past. Clear it. */
+ if ([[self preferenceForKey:KEY_CONNECT_HOST group:GROUP_ACCOUNT_STATUS] isEqualToString:@"twitter.com"])
+ [self setPreference:nil
+ forKey:KEY_CONNECT_HOST
+ group:GROUP_ACCOUNT_STATUS];
+
+ /* Register the default server if there is one. A subclass may choose to have no default server at all. */
+ if (self.defaultServer) {
+ [adium.preferenceController registerDefaults:[NSDictionary dictionaryWithObject:self.defaultServer
+ forKey:KEY_CONNECT_HOST]
+ forGroup:GROUP_ACCOUNT_STATUS
+ object:self];
+ }
[adium.preferenceController registerPreferenceObserver:self forGroup:TWITTER_PREFERENCE_GROUP_UPDATES];
[adium.preferenceController informObserversOfChangedKey:nil inGroup:TWITTER_PREFERENCE_GROUP_UPDATES object:self];
@@ -123,7 +132,7 @@
*/
- (NSString *)defaultServer
{
- return @"twitter.com";
+ return @"api.twitter.com";
}
#pragma mark AIAccount methods
@@ -298,7 +307,7 @@
*/
- (NSString *)apiPath
{
- return nil;
+ return @"/1";
}
/*!
More information about the commits
mailing list