adium 5234:025087895771: Cruft removal
commits at adium.im
commits at adium.im
Wed Dec 19 02:08:57 UTC 2012
details: http://hg.adium.im/adium/rev/025087895771
revision: 5234:025087895771
branch: adium-1.6
author: Frank Dowsett <wixardy at adium.im>
date: Sun Sep 30 11:57:09 2012 -0400
Cruft removal
Subject: adium 5235:ede896965948: Don't use an uninitialized variable's (and the wrong one at that) length.
details: http://hg.adium.im/adium/rev/ede896965948
revision: 5235:ede896965948
branch: adium-1.6
author: Frank Dowsett <wixardy at adium.im>
date: Sun Sep 30 22:40:21 2012 -0400
Don't use an uninitialized variable's (and the wrong one at that) length.
Subject: adium 5236:719bdbfd1bef: Fix a link to the forums in the help.
details: http://hg.adium.im/adium/rev/719bdbfd1bef
revision: 5236:719bdbfd1bef
branch: adium-1.6
author: Frank Dowsett <wixardy at adium.im>
date: Tue Dec 18 21:08:08 2012 -0500
Fix a link to the forums in the help.
diffs (72 lines):
diff -r a1ac760c5e57 -r 719bdbfd1bef AdiumHelp/pgs/AdvancedFeatures-AdiumXtras.html
--- a/AdiumHelp/pgs/AdvancedFeatures-AdiumXtras.html Tue Nov 13 21:18:56 2012 -0800
+++ b/AdiumHelp/pgs/AdvancedFeatures-AdiumXtras.html Tue Dec 18 21:08:08 2012 -0500
@@ -68,7 +68,7 @@
<h3>Getting support for an Xtra</h3>
</div>
<div class="taskboxtext">
- <p>An Xtra installed from the Adium Xtras site is supported by the Xtra's author. The first place to seek support is on the Xtra's page, probably in the comments unless the Author has given other instructions. If that doesn't work, try the <a class="ext_link" href="http://trac.adium.im/wiki/CreatingXtras"http://forum.adium.im/">Adium forums</a>.</p>
+ <p>An Xtra installed from the Adium Xtras site is supported by the Xtra's author. The first place to seek support is on the Xtra's page, probably in the comments unless the Author has given other instructions. If that doesn't work, try the <a class="ext_link" href="http://forum.adium.im/">Adium forums</a>.</p>
</div>
</div>
<div class="taskboxline">
diff -r a1ac760c5e57 -r 719bdbfd1bef Source/AIChatLog.m
--- a/Source/AIChatLog.m Tue Nov 13 21:18:56 2012 -0800
+++ b/Source/AIChatLog.m Tue Dec 18 21:08:08 2012 -0500
@@ -53,10 +53,11 @@
NSArray *serviceAndFromUIDArray = [serviceAndFromUID componentsSeparatedByString:@"."];
if ([serviceAndFromUIDArray count] >= 2) {
- myServiceClass = handleSpecialCasesForUIDAndServiceClass(toUID, [serviceAndFromUIDArray objectAtIndex:0]);
+ NSString *serviceString = [serviceAndFromUIDArray objectAtIndex:0];
+ myServiceClass = handleSpecialCasesForUIDAndServiceClass(toUID, serviceString);
//Use substringFromIndex so we include the rest of the string in the case of a UID with a . in it
- fromUID = [serviceAndFromUID substringFromIndex:([serviceClass length] + 1)]; //One off for the '.'
+ fromUID = [serviceAndFromUID substringFromIndex:([serviceString length] + 1)]; //One off for the '.'
} else {
//Fallback: blank non-nil serviceClass; folderName as the fromUID
diff -r a1ac760c5e57 -r 719bdbfd1bef Source/AILogViewerWindowController.m
--- a/Source/AILogViewerWindowController.m Tue Nov 13 21:18:56 2012 -0800
+++ b/Source/AILogViewerWindowController.m Tue Dec 18 21:08:08 2012 -0500
@@ -293,7 +293,6 @@
//Init our log filtering tree
- (void)initLogFiltering
{
- NSMutableDictionary *toDict = [NSMutableDictionary dictionary];
NSString *basePath = [AILoggerPlugin logBasePath];
NSString *fromUID, *serviceClass;
@@ -302,7 +301,6 @@
for (NSString *folderName in [[[NSFileManager defaultManager] contentsOfDirectoryAtPath:basePath error:NULL] sortedArrayUsingSelector:@selector(compare:)]) {
if (![folderName isEqualToString:@".DS_Store"]) { // avoid the directory info
AILogFromGroup *logFromGroup;
- NSMutableSet *toSetForThisService;
NSArray *serviceAndFromUIDArray;
/* Determine the service and fromUID - should be SERVICE.ACCOUNT_NAME
@@ -326,21 +324,10 @@
//Store logFromGroup on a key in the form "SERVICE.ACCOUNT_NAME"
[logFromGroupDict setObject:logFromGroup forKey:folderName];
- //To processing
- if (!(toSetForThisService = [toDict objectForKey:serviceClass])) {
- toSetForThisService = [NSMutableSet set];
- [toDict setObject:toSetForThisService
- forKey:serviceClass];
- }
-
//Add the 'to' for each grouping on this account
for (AILogToGroup *currentToGroup in [logFromGroup toGroupArray]) {
- NSString *currentTo;
-
- if ((currentTo = [currentToGroup to])) {
- //Store currentToGroup on a key in the form "SERVICE.ACCOUNT_NAME/TARGET_CONTACT"
- [logToGroupDict setObject:currentToGroup forKey:[currentToGroup relativePath]];
- }
+ //Store currentToGroup on a key in the form "SERVICE.ACCOUNT_NAME/TARGET_CONTACT"
+ [logToGroupDict setObject:currentToGroup forKey:[currentToGroup relativePath]];
}
[logFromGroup release];
More information about the commits
mailing list