adium 5543:7ae79997e6b8: This warning isn't applicable anymore.
commits at adium.im
commits at adium.im
Fri Jun 7 22:02:28 UTC 2013
details: http://hg.adium.im/adium/rev/7ae79997e6b8
revision: 5543:7ae79997e6b8
branch: (none)
author: Frank Dowsett <wixardy at adium.im>
date: Fri Jun 07 13:16:14 2013 -0400
This warning isn't applicable anymore.
Subject: adium 5544:32cca8059748: Add the cast back here.
details: http://hg.adium.im/adium/rev/32cca8059748
revision: 5544:32cca8059748
branch: (none)
author: Frank Dowsett <wixardy at adium.im>
date: Fri Jun 07 13:17:03 2013 -0400
Add the cast back here.
Subject: adium 5545:daf0c1588ffc: Localize the connection error messages for Bonjour accounts.
details: http://hg.adium.im/adium/rev/daf0c1588ffc
revision: 5545:daf0c1588ffc
branch: (none)
author: Frank Dowsett <wixardy at adium.im>
date: Fri Jun 07 13:19:15 2013 -0400
Localize the connection error messages for Bonjour accounts.
Subject: adium 5546:2fe87f308f9c: There are tickets for areas where iChat import needs to be updated, removing this #warning.
details: http://hg.adium.im/adium/rev/2fe87f308f9c
revision: 5546:2fe87f308f9c
branch: (none)
author: Frank Dowsett <wixardy at adium.im>
date: Fri Jun 07 13:31:09 2013 -0400
There are tickets for areas where iChat import needs to be updated, removing this #warning.
Subject: adium 5547:1314884409b0: I moved these #warnings into ticket #16403 since there's nothing we can do about them right now.
details: http://hg.adium.im/adium/rev/1314884409b0
revision: 5547:1314884409b0
branch: (none)
author: Frank Dowsett <wixardy at adium.im>
date: Fri Jun 07 18:01:06 2013 -0400
I moved these #warnings into ticket #16403 since there's nothing we can do about them right now.
diffs (125 lines):
diff -r 4df5dfc309d9 -r 1314884409b0 Plugins/Bonjour/libezv/Private Classes/AWEzvContactManagerRendezvous.m
--- a/Plugins/Bonjour/libezv/Private Classes/AWEzvContactManagerRendezvous.m Wed Jun 05 22:51:50 2013 -0400
+++ b/Plugins/Bonjour/libezv/Private Classes/AWEzvContactManagerRendezvous.m Fri Jun 07 18:01:06 2013 -0400
@@ -182,7 +182,7 @@
[fDomainBrowser addToCurrentRunLoop];
avDNSReference = servRef;
} else {
- [[client client] reportError:@"Could not register DNS service: _presence._tcp" ofLevel:AWEzvConnectionError];
+ [[client client] reportError:AILocalizedString(@"Could not register DNS service: _presence._tcp", nil) ofLevel:AWEzvConnectionError];
[self disconnect];
}
@@ -296,7 +296,7 @@
);
if (updateError != kDNSServiceErr_NoError) {
- [[client client] reportError:@"Error updating TXT Record" ofLevel:AWEzvConnectionError];
+ [[client client] reportError:AILocalizedString(@"Error updating TXT Record", nil) ofLevel:AWEzvConnectionError];
[self disconnect];
}
@@ -416,7 +416,7 @@
fServiceBrowser = [[ServiceController alloc] initWithServiceRef:browsRef forContactManager:self];
[fServiceBrowser addToCurrentRunLoop];
} else {
- [[client client] reportError:@"Could not browse for _presence._tcp instances" ofLevel:AWEzvConnectionError];
+ [[client client] reportError:AILocalizedString(@"Could not browse for _presence._tcp instances", nil) ofLevel:AWEzvConnectionError];
[self disconnect];
}
}
@@ -478,7 +478,7 @@
[[contact resolveServiceController] addToCurrentRunLoop];
} else {
- [[client client] reportError:@"Could not search for TXT records" ofLevel:AWEzvConnectionError];
+ [[client client] reportError:AILocalizedString(@"Could not search for TXT records", nil) ofLevel:AWEzvConnectionError];
[self disconnect];
}
} else {
@@ -739,17 +739,16 @@
// Recover if there was an error
if (errorCode != kDNSServiceErr_NoError) {
switch (errorCode) {
-#warning Localize and report through the connection error system
case kDNSServiceErr_Unknown:
- [[[self client] client] reportError:@"Unknown error in Bonjour Registration"
+ [[[self client] client] reportError:AILocalizedString(@"Unknown error in Bonjour Registration", nil)
ofLevel:AWEzvConnectionError];
break;
case kDNSServiceErr_NameConflict:
- [[[self client] client] reportError:@"A user with your Bonjour data is already online"
+ [[[self client] client] reportError:AILocalizedString(@"A user with your Bonjour data is already online", nil)
ofLevel:AWEzvConnectionError];
break;
default:
- [[[self client] client] reportError:@"An internal error occurred"
+ [[[self client] client] reportError:AILocalizedString(@"An internal error occurred", nil)
ofLevel:AWEzvConnectionError];
AWEzvLog(@"Internal error: rendezvous code %d", errorCode);
break;
@@ -769,7 +768,7 @@
- (void)serviceControllerReceivedFatalError:(ServiceController *)serviceController
{
- [[[self client] client] reportError:@"An unrecoverable connection error occurred"
+ [[[self client] client] reportError:AILocalizedString(@"An unrecoverable connection error occurred", nil)
ofLevel:AWEzvConnectionError];
[self disconnect];
}
diff -r 4df5dfc309d9 -r 1314884409b0 Plugins/Purple Service/ESPurpleGaduGaduAccount.m
--- a/Plugins/Purple Service/ESPurpleGaduGaduAccount.m Wed Jun 05 22:51:50 2013 -0400
+++ b/Plugins/Purple Service/ESPurpleGaduGaduAccount.m Fri Jun 07 18:01:06 2013 -0400
@@ -51,7 +51,7 @@
- (void)uploadContactListToServer
{
-#warning Temporarily disable contact list sync with servers
+ //XXX: need to update libpurple. see #16403
return;
char *buddylist = ggp_buddylist_dump(account);
@@ -90,7 +90,7 @@
- (void)downloadContactListFromServer
{
-#warning Temporarily disable contact list sync with servers
+ //XXX: need to update libpurple. see #16403
return;
// If we're connected and have no buddies, request 'em from the server.
diff -r 4df5dfc309d9 -r 1314884409b0 Plugins/Purple Service/adiumPurpleCore.m
--- a/Plugins/Purple Service/adiumPurpleCore.m Wed Jun 05 22:51:50 2013 -0400
+++ b/Plugins/Purple Service/adiumPurpleCore.m Fri Jun 07 18:01:06 2013 -0400
@@ -33,8 +33,6 @@
#import <Adium/AIAccountControllerProtocol.h>
#import <AIUtilities/AIApplicationAdditions.h>
-#warning This include and the jabber_auth_add_mech() will be part of the FacebookXMPP account's initialization
-
#pragma mark Debug
// Debug ------------------------------------------------------------------------------------------------------
diff -r 4df5dfc309d9 -r 1314884409b0 Plugins/Purple Service/adiumPurpleRequest.m
--- a/Plugins/Purple Service/adiumPurpleRequest.m Wed Jun 05 22:51:50 2013 -0400
+++ b/Plugins/Purple Service/adiumPurpleRequest.m Fri Jun 07 18:01:06 2013 -0400
@@ -330,7 +330,7 @@
userData:userData];
}
- return CFBridgingRetain(requestController);
+ return (void *)CFBridgingRetain(requestController);
}
}
diff -r 4df5dfc309d9 -r 1314884409b0 Source/BGICImportController.m
--- a/Source/BGICImportController.m Wed Jun 05 22:51:50 2013 -0400
+++ b/Source/BGICImportController.m Fri Jun 07 18:01:06 2013 -0400
@@ -117,7 +117,6 @@
ESDotMacService *macService = nil;
ESJabberService *jabberService = nil;
-#warning iChat Import needs to be updated for MobileMe
for (AIService *service in adium.accountController.services) {
if ([service.serviceID isEqual:@"AIM"])
aimService = (ESAIMService *)service;
More information about the commits
mailing list