adium 5507:ed655a387ff7: Remove some old commented code.
commits at adium.im
commits at adium.im
Thu May 23 15:28:46 UTC 2013
details: http://hg.adium.im/adium/rev/ed655a387ff7
revision: 5507:ed655a387ff7
branch: adium-1.6
author: Frank Dowsett <wixardy at adium.im>
date: Thu May 23 10:44:09 2013 -0400
Remove some old commented code.
Subject: adium 5508:79fd06cefb05: Remove the padding for the account connection progress percentage to fix #16389.
details: http://hg.adium.im/adium/rev/79fd06cefb05
revision: 5508:79fd06cefb05
branch: adium-1.6
author: Frank Dowsett <wixardy at adium.im>
date: Thu May 23 11:19:50 2013 -0400
Remove the padding for the account connection progress percentage to fix #16389.
Subject: adium 5509:15c77b70f583: Show retweets as being from the original tweeter. Fixes #16242
details: http://hg.adium.im/adium/rev/15c77b70f583
revision: 5509:15c77b70f583
branch: adium-1.6
author: Frank Dowsett <wixardy at adium.im>
date: Thu May 23 11:28:15 2013 -0400
Show retweets as being from the original tweeter. Fixes #16242
If someone has a better way to identify the retweeter, that'd be awesome.
diffs (735 lines):
diff -r 131c5ecd1169 -r 15c77b70f583 Frameworks/AIUtilities Framework/Source/AICompletingTextField.m
--- a/Frameworks/AIUtilities Framework/Source/AICompletingTextField.m Tue May 21 23:53:01 2013 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AICompletingTextField.m Thu May 23 11:28:15 2013 -0400
@@ -220,10 +220,9 @@
[possibleCompletions release];
+ //When the AICompletingTextfield is modified to be able to provide multiple choices of completions, the entire array can be used later.
if ([sortedArray count] > 0){
return [sortedArray objectAtIndex:0];
- //When the AICompletingTextfield is modified to be able to provide multiple choices of completions, the entire array can be used later.
- //return sortedArray;
}
return nil;
diff -r 131c5ecd1169 -r 15c77b70f583 Frameworks/AIUtilities Framework/Source/AIDateFormatterAdditions.m
--- a/Frameworks/AIUtilities Framework/Source/AIDateFormatterAdditions.m Tue May 21 23:53:01 2013 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AIDateFormatterAdditions.m Thu May 23 11:28:15 2013 -0400
@@ -609,8 +609,6 @@
[newFormat appendString:@"%%"];
[scanner setScanLocation:[scanner scanLocation] - [span length] + 1];
- } else {
- //NSLog(@"Unhandled format %@", span);
}
}
diff -r 131c5ecd1169 -r 15c77b70f583 Frameworks/AIUtilities Framework/Source/AISmoothTooltipTracker.m
--- a/Frameworks/AIUtilities Framework/Source/AISmoothTooltipTracker.m Tue May 21 23:53:01 2013 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AISmoothTooltipTracker.m Thu May 23 11:28:15 2013 -0400
@@ -276,12 +276,8 @@
#if LOG_TRACKING_INFO
NSLog(@"%@: Visible: %i ; Point %@ in %@ = %i", self,
[[view window] isVisible],
-/* NSStringFromPoint([[view superview] convertPoint:[[view window] convertScreenToBase:mouseLocation] fromView:[[view window] contentView]]),*/
NSStringFromPoint([[view window] convertScreenToBase:mouseLocation]),
-/* NSStringFromRect([view frame]),*/
NSStringFromRect([[[view window] contentView] convertRect:[view frame] fromView:[view superview]]),
-/* NSPointInRect([[view window] convertScreenToBase:mouseLocation], [view frame])*/
- /*NSPointInRect([[view superview] convertPoint:[[view window] convertScreenToBase:mouseLocation] fromView:[[view window] contentView]],[view frame])*/
NSPointInRect([[view window] convertScreenToBase:mouseLocation],[[[view window] contentView] convertRect:[view frame] fromView:[view superview]]));
#endif
diff -r 131c5ecd1169 -r 15c77b70f583 Frameworks/AIUtilities Framework/Source/AIStringAdditions.m
--- a/Frameworks/AIUtilities Framework/Source/AIStringAdditions.m Tue May 21 23:53:01 2013 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AIStringAdditions.m Thu May 23 11:28:15 2013 -0400
@@ -283,82 +283,6 @@
return [string autorelease];
}
-//- (NSString *)stringByEncodingURLEscapes
-//{
-// NSScanner *s = [NSScanner scannerWithString:self];
-// NSCharacterSet *notUrlCode = [[NSCharacterSet characterSetWithCharactersInString:
-// @"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789$-_.+!*'(),;/?:@=&"] invertedSet];
-// NSMutableString *encodedString = [[NSMutableString alloc] initWithString:@""];
-// NSString *read;
-//
-// while (![s isAtEnd])
-// {
-// [s scanUpToCharactersFromSet:notUrlCode intoString:&read];
-// if (read)
-// [encodedString appendString:read];
-// if (![s isAtEnd])
-// {
-// [encodedString appendFormat:@"%%%x", [self characterAtIndex:[s scanLocation]]];
-// [s setScanLocation:[s scanLocation]+1];
-// }
-// }
-//
-// return [encodedString autorelease];
-//}
-//
-//- (NSString *)stringByDecodingURLEscapes
-//{
-// NSScanner *s = [NSScanner scannerWithString:self];
-// NSMutableString *decodedString = [[NSMutableString alloc] initWithString:@""];
-// NSString *read;
-//
-// while (![s isAtEnd])
-// {
-// [s scanUpToString:@"%" intoString:&read];
-// if (read)
-// [decodedString appendString:read];
-// if (![s isAtEnd])
-// {
-// [decodedString appendString:[NSString stringWithFormat:@"%c",
-// [[NSString stringWithFormat:@"%li",
-// strtol([[self substringWithRange:NSMakeRange([s scanLocation]+1, 2)] cString],
-// NULL, 16)]
-// intValue]]];
-//
-// [s setScanLocation:[s scanLocation]+3];
-//
-// }
-// }
-// return [decodedString autorelease];
-//
-//}
-//
-//- (BOOL)isURLEncoded
-//{
-// NSCharacterSet *notUrlCode = [[NSCharacterSet characterSetWithCharactersInString:
-// @"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789$-_.+!*'(),;/?:@=&"] invertedSet];
-// NSCharacterSet *notHexSet = [[NSCharacterSet characterSetWithCharactersInString:@"0123456789ABCEFabcdef"]
-// invertedSet];
-// NSScanner *s = [NSScanner scannerWithString:self];
-//
-// if ([self rangeOfCharacterFromSet:notUrlCode].location != NSNotFound)
-// return NO;
-//
-// while (![s isAtEnd])
-// {
-// [s scanUpToString:@"%" intoString:nil];
-//
-// if ([[self substringWithRange:NSMakeRange([s scanLocation]+1, 2)] rangeOfCharacterFromSet:notHexSet].location != NSNotFound)
-// return NO;
-// }
-//
-// return YES;
-//}
-
-
-
-
-
//stringByEncodingURLEscapes
// Percent escape all characters except for a-z, A-Z, 0-9, '_', and '-'
// Convert spaces to '+'
diff -r 131c5ecd1169 -r 15c77b70f583 Frameworks/AIUtilities Framework/Source/AITextViewWithPlaceholder.m
--- a/Frameworks/AIUtilities Framework/Source/AITextViewWithPlaceholder.m Tue May 21 23:53:01 2013 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AITextViewWithPlaceholder.m Thu May 23 11:28:15 2013 -0400
@@ -24,9 +24,6 @@
- (void)setPlaceholderString:(NSString *)inPlaceholderString
{
- // NSDictionary *attributes;
-
-// attributes = [NSDictionary dictionaryWithObjectsAndKeys:[NSColor grayColor], NSForegroundColorAttributeName, nil];
[self setPlaceholder:[[[NSAttributedString alloc] initWithString:inPlaceholderString
attributes:nil] autorelease]];
}
diff -r 131c5ecd1169 -r 15c77b70f583 Frameworks/Adium Framework/Source/AIAccount.m
--- a/Frameworks/Adium Framework/Source/AIAccount.m Tue May 21 23:53:01 2013 +0200
+++ b/Frameworks/Adium Framework/Source/AIAccount.m Thu May 23 11:28:15 2013 -0400
@@ -1191,7 +1191,6 @@
}
AIChat *newChat = [adium.chatController chatWithContact:contact];
- // NSLog(@"Making new chat %@ in chat window %@:%@",newChat,chatWindowController,[chatWindowController containerID]);
[adium.interfaceController openChat:newChat inContainerWithID:[chatWindowController containerID] atIndex:index];
return newChat;
} else {
@@ -1212,7 +1211,6 @@
[newParticipants addObject:[[participants objectAtIndex:i] objectsByEvaluatingSpecifier]];
}
- //AIChat *newChat = [adium.chatController chatWithName:name identifier:nil onAccount:self chatCreationInfo:nil];
DCJoinChatViewController *chatController = [DCJoinChatViewController joinChatView];
[chatController doJoinChatWithName:name onAccount:self chatCreationInfo:nil invitingContacts:newParticipants withInvitationMessage:@"Hey, wanna join my chat?"];
return [adium.chatController existingChatWithName:name onAccount:self];
diff -r 131c5ecd1169 -r 15c77b70f583 Frameworks/Adium Framework/Source/AIAddressBookUserIconSource.m
--- a/Frameworks/Adium Framework/Source/AIAddressBookUserIconSource.m Tue May 21 23:53:01 2013 +0200
+++ b/Frameworks/Adium Framework/Source/AIAddressBookUserIconSource.m Thu May 23 11:28:15 2013 -0400
@@ -137,7 +137,6 @@
if (useABImages) {
NSNumber *tagNumber;
NSImage *image;
- // AIListContact *parentContact;
NSString *uniqueID;
id setOrObject;
@@ -164,7 +163,7 @@
asynchronously:YES
forObject:listObject];
- } else /*if ([setOrObject isKindOfClass:[NSSet class]])*/{
+ } else {
//Apply the image to each listObject at the appropriate priority
for (AIListObject *listObject in [[(NSSet *)setOrObject copy] autorelease]) {
[AIUserIcons userIconSource:self
@@ -224,7 +223,7 @@
[trackingDict setObject:objectSet forKey:tagNumber];
}
- } else /*if ([previousValue isKindOfClass:[NSMutableSet class]])*/{
+ } else {
//Add the new object to the previously-created set
[(NSMutableSet *)previousValue addObject:inObject];
}
diff -r 131c5ecd1169 -r 15c77b70f583 Frameworks/Adium Framework/Source/AIEditStateWindowController.m
--- a/Frameworks/Adium Framework/Source/AIEditStateWindowController.m Tue May 21 23:53:01 2013 +0200
+++ b/Frameworks/Adium Framework/Source/AIEditStateWindowController.m Thu May 23 11:28:15 2013 -0400
@@ -178,8 +178,6 @@
*/
- (void)windowDidLoad
{
-// NSNumberFormatter *intFormatter;
-
[scrollView_statusMessage setAutohidesScrollers:YES];
[scrollView_statusMessage setAlwaysDrawFocusRingIfFocused:YES];
[textView_statusMessage setTarget:self action:@selector(okay:)];
diff -r 131c5ecd1169 -r 15c77b70f583 Frameworks/Adium Framework/Source/AIListGroupCell.m
--- a/Frameworks/Adium Framework/Source/AIListGroupCell.m Tue May 21 23:53:01 2013 +0200
+++ b/Frameworks/Adium Framework/Source/AIListGroupCell.m Thu May 23 11:28:15 2013 -0400
@@ -158,13 +158,8 @@
*/
- (CGFloat)flippyIndent
{
-// if ([self textAlignment] != NSCenterTextAlignment) {
- NSSize size = [self cellSize];
- return size.height*0.4f + size.height*0.2f + FLIPPY_TEXT_PADDING;
-/* } else {
- return 0;
- }
-*/
+ NSSize size = [self cellSize];
+ return size.height*0.4f + size.height*0.2f + FLIPPY_TEXT_PADDING;
}
@@ -194,10 +189,8 @@
[arrowPath closePath];
[arrowPath fill];
-// if ([self textAlignment] != NSCenterTextAlignment) {
- rect.origin.x += rect.size.height*0.4f + rect.size.height*0.2f + FLIPPY_TEXT_PADDING;
- rect.size.width -= rect.size.height*0.4f + rect.size.height*0.2f + FLIPPY_TEXT_PADDING;
-// }
+ rect.origin.x += rect.size.height*0.4f + rect.size.height*0.2f + FLIPPY_TEXT_PADDING;
+ rect.size.width -= rect.size.height*0.4f + rect.size.height*0.2f + FLIPPY_TEXT_PADDING;
if ([listObject boolValueForProperty:@"showCount"]) {
rect = [self drawGroupCountWithFrame:rect];
diff -r 131c5ecd1169 -r 15c77b70f583 Frameworks/Adium Framework/Source/AILocalizationControl.m
--- a/Frameworks/Adium Framework/Source/AILocalizationControl.m Tue May 21 23:53:01 2013 +0200
+++ b/Frameworks/Adium Framework/Source/AILocalizationControl.m Thu May 23 11:28:15 2013 -0400
@@ -121,7 +121,6 @@
newFrame.size.width = AIround(NSWidth(newFrame) + 0.5f);
//Enforce a minimum width of the original frame width
-// NSLog(@"%@: new is %@; original is %@",inStringValue,NSStringFromRect(newFrame),NSStringFromRect(originalFrame));
if (NSWidth(newFrame) < NSWidth(originalFrame)) {
newFrame.size.width = NSWidth(originalFrame);
}
diff -r 131c5ecd1169 -r 15c77b70f583 Frameworks/Adium Framework/Source/DCJoinChatViewController.m
--- a/Frameworks/Adium Framework/Source/DCJoinChatViewController.m Tue May 21 23:53:01 2013 +0200
+++ b/Frameworks/Adium Framework/Source/DCJoinChatViewController.m Thu May 23 11:28:15 2013 -0400
@@ -276,9 +276,6 @@
// Is there a contact with our service?
if ( [self validContact:uniqueID withService:account.service] ) {
-
- //if ([[view window] firstResponder] != textField_inviteUsers)
- // [[view window] makeFirstResponder:textField_inviteUsers];
return NSDragOperationGeneric;
}
}
diff -r 131c5ecd1169 -r 15c77b70f583 Frameworks/Adium Framework/Source/ESContactAlertsViewController.m
--- a/Frameworks/Adium Framework/Source/ESContactAlertsViewController.m Tue May 21 23:53:01 2013 +0200
+++ b/Frameworks/Adium Framework/Source/ESContactAlertsViewController.m Thu May 23 11:28:15 2013 -0400
@@ -145,7 +145,6 @@
{
[self calculateAllHeights];
[outlineView_summary reloadData];
-// [outlineView_summary noteHeightOfRowsWithIndexesChanged:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, [outlineView_summary numberOfRows]-1)]];
}
//Configure the pane for a list object
diff -r 131c5ecd1169 -r 15c77b70f583 Plugins/Bonjour/libezv/Classes/EKEzvIncomingFileTransfer.m
--- a/Plugins/Bonjour/libezv/Classes/EKEzvIncomingFileTransfer.m Tue May 21 23:53:01 2013 +0200
+++ b/Plugins/Bonjour/libezv/Classes/EKEzvIncomingFileTransfer.m Thu May 23 11:28:15 2013 -0400
@@ -167,10 +167,7 @@
/*rootPath will be the path -without- root's name appended */
if ([[root name] isEqualToString:@"file"]) {
/*We have a file so get it's info and then download it*/
- // NSString *mimeType = [[root attributeForName:@"mimetype"] objectValue];
NSString *posixFlags = [[root attributeForName:@"posixflags"] objectValue];
- // NSString *hfsFlags = [[root attributeForName:@"hfsflags"] objectValue];
- // NSString *size = [[root attributeForName:@"size"] objectValue];
NSArray *nameChildren = [root elementsForName:@"name"];
if (!nameChildren) {
diff -r 131c5ecd1169 -r 15c77b70f583 Plugins/Bonjour/libezv/Private Classes/AWEzvRendezvousData.m
--- a/Plugins/Bonjour/libezv/Private Classes/AWEzvRendezvousData.m Tue May 21 23:53:01 2013 +0200
+++ b/Plugins/Bonjour/libezv/Private Classes/AWEzvRendezvousData.m Thu May 23 11:28:15 2013 -0400
@@ -270,7 +270,6 @@
AWEzvLog(@"Creating TXTRecord: No data and No key");
}
- /* AWEzvLog(@"key:%@ value=%@", keyString, data); */
} else {
AWEzvLog(@"Error reading txt keys");
}
@@ -278,22 +277,7 @@
}
-
-// // kind of a hack: munge txtRecord so it's human-readable
-// if ( len > 0) {
-// char *readableText = (char*) malloc( len);
-// if ( readableText != nil) {
-// ByteCount index, subStrLen;
-// memcpy( readableText, txtRecord, len);
-// for ( index=0; index < len - 1; index += subStrLen + 1) {
-// subStrLen = readableText[ index];
-// readableText[ index] = '\n';
-// }
-// //NSLog(@"%@\n\n",[NSString stringWithCString:&readableText[1] length:len - 1]);
-// free( readableText);
-// }
-// }
-
+
return self;
}
diff -r 131c5ecd1169 -r 15c77b70f583 Plugins/Dual Window Interface/AIMessageWindowController.m
--- a/Plugins/Dual Window Interface/AIMessageWindowController.m Tue May 21 23:53:01 2013 +0200
+++ b/Plugins/Dual Window Interface/AIMessageWindowController.m Thu May 23 11:28:15 2013 -0400
@@ -381,8 +381,6 @@
[tabView_tabBar setUseOverflowMenu:(useOverflow ? [useOverflow boolValue] : YES)];
[[tabView_tabBar overflowPopUpButton] setAlternateImage:[AIStatusIcons statusIconForStatusName:@"content" statusType:AIAvailableStatusType iconType:AIStatusIconTab direction:AIIconNormal]];
- //NSImage *overflowImage = [[[NSImage alloc] initByReferencingFile:[[NSBundle mainBundle] pathForImageResource:@"overflow_overlay"]] autorelease];
- //[[tabView_tabBar overflowPopUpButton] setAlternateImage:overflowImage];
//change the frame of the tab bar according to the orientation
if (firstTime || [key isEqualToString:KEY_TABBAR_POSITION]) {
@@ -396,7 +394,6 @@
//set tab style drawing attributes
[tabView_tabStyle setDrawsRight:(tabPosition == AdiumTabPositionRight)];
[tabView_tabStyle setDrawsUnified:(tabPosition == AdiumTabPositionTop)];
- //[[[self window] toolbar] setShowsBaselineSeparator:(tabPosition != AdiumTabPositionTop)];
[self _updateWindowTitleAndIcon];
@@ -1249,45 +1246,6 @@
}
}
-/*//Custom Tabs Delegate -------------------------------------------------------------------------------------------------
-#pragma mark Custom Tabs Delegate
-//Bring our window to the front
-- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
-{
- NSDragOperation tmp = NSDragOperationNone;
- NSString *type = [[sender draggingPasteboard] availableTypeFromArray:[NSArray arrayWithObjects:TAB_CELL_IDENTIFIER,nil]];
-
- if (sender == nil || type) {
- if (![[self window] isKeyWindow]) [[self window] makeKeyAndOrderFront:nil];
- [self _suppressTabHiding:YES];
- tmp = NSDragOperationPrivate;
- }
- return tmp;
-}
-
-- (void)draggingExited:(id <NSDraggingInfo>)sender
-{
- NSString *type = [[sender draggingPasteboard] availableTypeFromArray:[NSArray arrayWithObjects:TAB_CELL_IDENTIFIER,nil]];
-
- if (sender == nil || type) [self _suppressTabHiding:NO];
-}
-
-- (void)_suppressTabHiding:(BOOL)suppress
-{
- supressHiding = suppress;
- [self updateTabBarVisibilityAndAnimate:YES];
-}
-
-//Send the print message to our view
-- (void)adiumPrint:(id)sender
-{
- id controller = [(AIMessageTabViewItem *)[tabView_messages selectedTabViewItem] messageViewController];
-
- if ([controller respondsToSelector:@selector(adiumPrint:)]) {
- [controller adiumPrint:sender];
- }
-}*/
-
//Toolbar --------------------------------------------------------------------------------------------------------------
#pragma mark Toolbar
//Install our toolbar
diff -r 131c5ecd1169 -r 15c77b70f583 Plugins/Purple Service/AIFacebookXMPPOAuthWebViewWindowController.m
--- a/Plugins/Purple Service/AIFacebookXMPPOAuthWebViewWindowController.m Tue May 21 23:53:01 2013 +0200
+++ b/Plugins/Purple Service/AIFacebookXMPPOAuthWebViewWindowController.m Thu May 23 11:28:15 2013 -0400
@@ -172,45 +172,37 @@
- (void)addCookiesToRequest:(NSMutableURLRequest *)request
{
NSURL *requestURL = [request URL];
- //NSLog(@"requestURL: %@", requestURL);
NSMutableArray *sentCookies = [NSMutableArray array];
// same origin: domain, port, path.
for (NSHTTPCookie *cookie in cookies.allValues) {
if ([[cookie expiresDate] timeIntervalSinceNow] < 0) {
- //NSLog(@"****** expired: %@", cookie);
continue;
}
if ([cookie isSecure] && ![[requestURL scheme] isEqualToString:@"https"]) {
- //NSLog(@"****** secure not https: %@", cookie);
continue;
}
if ([[cookie domain] hasPrefix:@"."]) { // ".example.com" should match "foo.example.com" and "example.com"
if (!([[requestURL host] hasSuffix:[cookie domain]] ||
[[@"." stringByAppendingString:[requestURL host]] isEqualToString:[cookie domain]])) {
- //NSLog(@"****** dot prefix host mismatch: %@", cookie);
continue;
}
} else {
if (![[requestURL host] isEqualToString:[cookie domain]]) {
- //NSLog(@"****** host mismatch: %@", cookie);
continue;
}
}
if ([[cookie portList] count] && ([requestURL port] != NULL) && ![[cookie portList] containsObject:[requestURL port]]) {
- //NSLog(@"****** port mismatch: %@ (%@ doesn't have %@)", cookie, cookie.portList, requestURL.port);
continue;
}
if (![[requestURL path] hasPrefix:[cookie path]]) {
- //NSLog(@"****** path mismatch: %@", cookie);
continue;
}
- //NSLog(@"adding cookie: %@", cookie);
[sentCookies addObject:cookie];
}
diff -r 131c5ecd1169 -r 15c77b70f583 Plugins/Purple Service/ESPurpleJabberAccount.m
--- a/Plugins/Purple Service/ESPurpleJabberAccount.m Tue May 21 23:53:01 2013 +0200
+++ b/Plugins/Purple Service/ESPurpleJabberAccount.m Thu May 23 11:28:15 2013 -0400
@@ -738,7 +738,6 @@
AILog(@"Warning: Invisibility is not yet supported in libpurple 2.0.0 jabber");
priority = [self preferenceForKey:KEY_JABBER_PRIORITY_AWAY group:GROUP_ACCOUNT_STATUS];
statusID = jabber_buddy_state_get_status_id(JABBER_BUDDY_STATE_AWAY);
-// statusID = "Invisible";
break;
case AIOfflineStatusType:
diff -r 131c5ecd1169 -r 15c77b70f583 Plugins/Purple Service/adiumPurpleConversation.m
--- a/Plugins/Purple Service/adiumPurpleConversation.m Tue May 21 23:53:01 2013 +0200
+++ b/Plugins/Purple Service/adiumPurpleConversation.m Thu May 23 11:28:15 2013 -0400
@@ -486,11 +486,6 @@
case PURPLE_CONV_UPDATE_ICON:
case PURPLE_CONV_UPDATE_FEATURES:
-/*
- [accountLookup(purple_conversation_get_account(conv)) mainPerformSelector:@selector(convUpdateForChat:type:)
- withObject:groupChatLookupFromConv(conv)
- withObject:[NSNumber numberWithInt:type]];
-*/
default:
break;
}
diff -r 131c5ecd1169 -r 15c77b70f583 Plugins/Twitter Plugin/AITwitterAccount.m
--- a/Plugins/Twitter Plugin/AITwitterAccount.m Tue May 21 23:53:01 2013 +0200
+++ b/Plugins/Twitter Plugin/AITwitterAccount.m Thu May 23 11:28:15 2013 -0400
@@ -1060,6 +1060,25 @@
}
/*!
+ * @brief Update the display name, icon, and status of the list contact.
+ */
+- (void)updateContact:(AIListContact *)listContact withInfo:(NSDictionary *)userInfo andStatusMessage:(NSAttributedString *)message
+{
+ // Grab the Twitter display name and set it as the remote alias.
+ NSString *displayName = [userInfo objectForKey:TWITTER_INFO_DISPLAY_NAME];
+ if (![[listContact valueForProperty:@"serverDisplayName"] isEqualToString:displayName]) {
+ [listContact setServersideAlias:displayName
+ silently:silentAndDelayed];
+ }
+
+ // Update the user's status message
+ [listContact setStatusMessage:message
+ notify:NotifyLater];
+
+ [self updateUserIcon:[userInfo objectForKey:TWITTER_INFO_ICON] forContact:listContact];
+}
+
+/*!
* @brief Unfollow the requested contacts.
*/
- (void)removeContacts:(NSArray *)objects fromGroups:(NSArray *)groups
@@ -1527,19 +1546,8 @@
inReplyToUser:(NSString *)replyUserID
inReplyToTweetID:(NSString *)replyTweetID
{
- NSMutableAttributedString *mutableMessage;
- NSDictionary *retweet = [inStatus objectForKey:TWITTER_STATUS_RETWEET];
-
- if (retweet && [retweet isKindOfClass:[NSDictionary class]]) {
- NSString *text = [[retweet objectForKey:TWITTER_STATUS_TEXT] stringByUnescapingFromXMLWithEntities:nil];
- mutableMessage = [[NSMutableAttributedString alloc] initWithString:text];
- [mutableMessage replaceCharactersInRange:NSMakeRange(0, 0)
- withString:[NSString stringWithFormat:@"RT @%@: ",
- [[retweet objectForKey:TWITTER_STATUS_USER] objectForKey:TWITTER_STATUS_UID]]];
- } else {
- NSString *text = [[inStatus objectForKey:TWITTER_STATUS_TEXT] stringByUnescapingFromXMLWithEntities:nil];
- mutableMessage = [[NSMutableAttributedString alloc] initWithString:text];
- }
+ NSString *text = [[inStatus objectForKey:TWITTER_STATUS_TEXT] stringByUnescapingFromXMLWithEntities:nil];
+ NSMutableAttributedString *mutableMessage = [[NSMutableAttributedString alloc] initWithString:text];
//Extract hashtags, users, and URLs
NSDictionary *entities = [inStatus objectForKey:@"entities"];
@@ -1824,6 +1832,15 @@
[[AIContactObserverManager sharedManager] delayListObjectNotifications];
for (NSDictionary *status in sortedQueuedUpdates) {
+ NSDate *date = [status objectForKey:TWITTER_STATUS_CREATED];
+
+ NSDictionary *retweet = [status objectForKey:TWITTER_STATUS_RETWEET];
+ NSString *retweeter = nil;
+ if (retweet && [retweet isKindOfClass:[NSDictionary class]]) {
+ retweeter = [[status objectForKey:TWITTER_STATUS_USER] objectForKey:TWITTER_STATUS_UID];
+ status = retweet;
+ }
+
NSString *contactUID = [[status objectForKey:TWITTER_STATUS_USER] objectForKey:TWITTER_STATUS_UID];
NSAttributedString *message = [self parseStatus:status
tweetID:[status objectForKey:TWITTER_STATUS_ID]
@@ -1831,18 +1848,26 @@
inReplyToUser:[status objectForKey:TWITTER_STATUS_REPLY_UID]
inReplyToTweetID:[status objectForKey:TWITTER_STATUS_REPLY_ID]];
- NSDate *date = [status objectForKey:TWITTER_STATUS_CREATED];
+ //Add a link to the retweeter
+ if (retweeter) {
+ NSMutableAttributedString *m = [[message mutableCopy] autorelease];
+ NSString *linkURL = [self addressForLinkType:AITwitterLinkUserPage
+ userID:retweeter
+ statusID:nil
+ context:nil];
+ NSAttributedString *rt = [NSAttributedString attributedStringWithString:[NSString stringWithFormat:@" [@%@]", retweeter]
+ linkRange:NSMakeRange(2, retweeter.length+1)
+ linkDestination:linkURL];
+ [m appendAttributedString:rt];
+ message = m;
+ }
AIListObject *fromObject = nil;
if (![self.UID isCaseInsensitivelyEqualToString:contactUID]) {
AIListContact *listContact = [self contactWithUID:contactUID];
- // Update the user's status message
- [listContact setStatusMessage:message
- notify:NotifyNow];
-
- [self updateUserIcon:[[status objectForKey:TWITTER_STATUS_USER] objectForKey:TWITTER_INFO_ICON] forContact:listContact];
+ [self updateContact:listContact withInfo:[status objectForKey:TWITTER_STATUS_USER] andStatusMessage:message];
[timelineChat addParticipatingNick:listContact.UID notify:NotifyNow];
[timelineChat setContact:listContact forNick:listContact.UID];
@@ -2213,26 +2238,17 @@
[listContact addRemoteGroupName:self.timelineGroupName];
}
- // Grab the Twitter display name and set it as the remote alias.
- if (![[listContact valueForProperty:@"serverDisplayName"] isEqualToString:[user objectForKey:TWITTER_INFO_DISPLAY_NAME]]) {
- [listContact setServersideAlias:[user objectForKey:TWITTER_INFO_DISPLAY_NAME]
- silently:silentAndDelayed];
- }
-
- // Grab the user icon and set it as their serverside icon.
- [self updateUserIcon:[user objectForKey:TWITTER_INFO_ICON] forContact:listContact];
+ // Set the user's status message to their current twitter status text
+ NSString *statusText = [[user objectForKey:TWITTER_INFO_STATUS] objectForKey:TWITTER_INFO_STATUS_TEXT] ?: @"";
+ [self updateContact:listContact
+ withInfo:user
+ andStatusMessage:[NSAttributedString stringWithString:[statusText stringByUnescapingFromXMLWithEntities:nil]]];
// Set the user as available.
[listContact setStatusWithName:nil
statusType:AIAvailableStatusType
notify:NotifyLater];
- // Set the user's status message to their current twitter status text
- NSString *statusText = [[user objectForKey:TWITTER_INFO_STATUS] objectForKey:TWITTER_INFO_STATUS_TEXT];
- if (!statusText) //nil if they've never tweeted
- statusText = @"";
- [listContact setStatusMessage:[NSAttributedString stringWithString:[statusText stringByUnescapingFromXMLWithEntities:nil]] notify:NotifyLater];
-
// Set the user as online.
[listContact setOnline:YES notify:NotifyLater silently:silentAndDelayed];
diff -r 131c5ecd1169 -r 15c77b70f583 Plugins/WebKit Message View/AIWebKitDelegate.m
--- a/Plugins/WebKit Message View/AIWebKitDelegate.m Tue May 21 23:53:01 2013 +0200
+++ b/Plugins/WebKit Message View/AIWebKitDelegate.m Thu May 23 11:28:15 2013 -0400
@@ -64,8 +64,6 @@
[webView setDraggingDelegate:self];
[webView setEditingDelegate:self];
[webView setResourceLoadDelegate:self];
-
-// [[webView windowScriptObject] setValue:self forKey:@"client"];
}
- (void) removeDelegate:(AIWebKitMessageViewController *)controller
{
diff -r 131c5ecd1169 -r 15c77b70f583 Source/AIAccountController.m
--- a/Source/AIAccountController.m Tue May 21 23:53:01 2013 +0200
+++ b/Source/AIAccountController.m Thu May 23 11:28:15 2013 -0400
@@ -79,12 +79,12 @@
}
- (void)dealloc
-{
+{/*
[adiumServices release];
[adiumPasswords release];
[adiumAccounts release];
[adiumPreferredAccounts release];
-
+*/
[super dealloc];
}
diff -r 131c5ecd1169 -r 15c77b70f583 Source/AIAccountListPreferences.m
--- a/Source/AIAccountListPreferences.m Tue May 21 23:53:01 2013 +0200
+++ b/Source/AIAccountListPreferences.m Thu May 23 11:28:15 2013 -0400
@@ -709,7 +709,7 @@
if ([account valueForProperty:@"connectionProgressString"] && [account boolValueForProperty:@"isConnecting"]) {
// Connection status if we're currently connecting, with the percent at the end
- statusMessage = [[account valueForProperty:@"connectionProgressString"] stringByAppendingFormat:@" (%2.f%%)", [[account valueForProperty:@"connectionProgressPercent"] doubleValue]];
+ statusMessage = [[account valueForProperty:@"connectionProgressString"] stringByAppendingFormat:@" (%.f%%)", [[account valueForProperty:@"connectionProgressPercent"] doubleValue]];
} else if ([account lastDisconnectionError] && ![account boolValueForProperty:@"isOnline"] && ![account boolValueForProperty:@"isConnecting"]) {
// If there's an error and we're not online and not connecting
NSMutableString *returnedMessage = [[[account lastDisconnectionError] mutableCopy] autorelease];
diff -r 131c5ecd1169 -r 15c77b70f583 Source/AIContactController.m
--- a/Source/AIContactController.m Tue May 21 23:53:01 2013 +0200
+++ b/Source/AIContactController.m Thu May 23 11:28:15 2013 -0400
@@ -628,7 +628,6 @@
//we only allow group->meta->contact, not group->meta->meta->contact
NSParameterAssert(![listObject conformsToProtocol:@protocol(AIContainingObject)]);
- // AILog(@"MetaContacts: Storing %@ in %@",listObject, metaContact);
NSDictionary *containedContactDict;
NSMutableDictionary *allMetaContactsDict;
NSMutableArray *containedContactsArray;
diff -r 131c5ecd1169 -r 15c77b70f583 Source/AILogViewerWindowController.m
--- a/Source/AILogViewerWindowController.m Tue May 21 23:53:01 2013 +0200
+++ b/Source/AILogViewerWindowController.m Thu May 23 11:28:15 2013 -0400
@@ -1701,7 +1701,6 @@
totalCount--;
}
- //if (logPath) CFRelease(logPath);
if (url) CFRelease(url);
if (document) CFRelease(document);
}
diff -r 131c5ecd1169 -r 15c77b70f583 Source/ESAddressBookIntegrationAdvancedPreferences.m
--- a/Source/ESAddressBookIntegrationAdvancedPreferences.m Tue May 21 23:53:01 2013 +0200
+++ b/Source/ESAddressBookIntegrationAdvancedPreferences.m Thu May 23 11:28:15 2013 -0400
@@ -161,13 +161,6 @@
[tokenField_lastToken setEnabled:enableImport];
[tokenField_nickToken setEnabled:enableImport];
- //We will not allow image syncing if AB images are preferred
- //so disable the control and uncheck the box to indicate this to the user
- //dchoby98: why are image import and export linked?
- //[checkBox_syncAutomatic setEnabled:!preferABImages];
- //if (preferABImages)
- // [checkBox_syncAutomatic setState:NSOffState];
-
//Disable the image priority checkbox if we aren't using images
[checkBox_preferABImages setEnabled:useImages];
}
diff -r 131c5ecd1169 -r 15c77b70f583 Source/ESDebugWindowController.m
--- a/Source/ESDebugWindowController.m Tue May 21 23:53:01 2013 +0200
+++ b/Source/ESDebugWindowController.m Thu May 23 11:28:15 2013 -0400
@@ -60,10 +60,6 @@
[[textView_debug textStorage] addAttribute:NSParagraphStyleAttributeName
value:debugParagraphStyle
range:NSMakeRange(0, [mutableDebugString length])];
-
-// [fullDebugLogArray removeAllObjects];
-
-// [adium.debugController clearDebugLogArray];
[scrollView_debug scrollToBottom];
}
diff -r 131c5ecd1169 -r 15c77b70f583 Source/ESFileTransferProgressView.m
--- a/Source/ESFileTransferProgressView.m Tue May 21 23:53:01 2013 +0200
+++ b/Source/ESFileTransferProgressView.m Thu May 23 11:28:15 2013 -0400
@@ -188,7 +188,6 @@
[transferStatus retain];
-// [textField_transferStatus setStringValue:transferStatus];
[self setNeedsDisplayInRect:[box_transferStatusFrame frame]];
[textField_rate setStringValue:(inTransferSpeedStatus ? inTransferSpeedStatus : @"")];
}
diff -r 131c5ecd1169 -r 15c77b70f583 Source/ESStatusPreferences.m
--- a/Source/ESStatusPreferences.m Tue May 21 23:53:01 2013 +0200
+++ b/Source/ESStatusPreferences.m Thu May 23 11:28:15 2013 -0400
@@ -234,7 +234,6 @@
*/
- (void)updateTableControlAvailability
{
-// NSArray *selectedItems = [outlineView_stateList arrayOfSelectedItems];
NSIndexSet *selectedIndexes = [outlineView_stateList selectedRowIndexes];
NSInteger count = [selectedIndexes count];
diff -r 131c5ecd1169 -r 15c77b70f583 Source/XtrasInstaller.m
--- a/Source/XtrasInstaller.m Tue May 21 23:53:01 2013 +0200
+++ b/Source/XtrasInstaller.m Thu May 23 11:28:15 2013 -0400
@@ -99,12 +99,10 @@
urlToDownload = [[NSURL alloc] initWithString:[NSString stringWithFormat:@"%@://%@/%@%@%@", @"http", [url host], [url path],
([url query] ? @"?" : @""),
([url query] ? [url query] : @"")]];
-// dest = [NSTemporaryDirectory() stringByAppendingPathComponent:[[urlToDownload path] lastPathComponent]];
AILogWithSignature(@"Downloading %@", urlToDownload);
NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:urlToDownload];
[request setHTTPShouldHandleCookies:NO];
self.download = [[[NSURLDownload alloc] initWithRequest:request delegate:self] autorelease];
-// [download setDestination:dest allowOverwrite:YES];
[urlToDownload release];
diff -r 131c5ecd1169 -r 15c77b70f583 UnitTests/TestRichTextCoercion.m
--- a/UnitTests/TestRichTextCoercion.m Tue May 21 23:53:01 2013 +0200
+++ b/UnitTests/TestRichTextCoercion.m Thu May 23 11:28:15 2013 -0400
@@ -129,7 +129,6 @@
NSDictionary *scriptSuite = [self dictionaryForScriptSuiteNamed:@"NSTextSuite" fromSdefFile:[testBundle pathForResource:@"Adium" ofType:@"sdef"]];
NSDictionary *scriptTerminology = [self dictionaryForScriptTerminologyNamed:@"NSTextSuite" fromSdefFile:[testBundle pathForResource:@"Adium" ofType:@"sdef"]];
NSDictionary *scriptSuiteAndTerminology = [self dictionaryByMergingSuiteDictionary:scriptSuite withTerminologyDictionary:scriptTerminology];
-// NSLog(@"scriptSuite: %@", scriptSuite);
[[NSScriptSuiteRegistry sharedScriptSuiteRegistry] loadSuiteWithDictionary:scriptSuiteAndTerminology fromBundle:testBundle];
[AIRichTextCoercer enableRichTextCoercion];
More information about the commits
mailing list