adium-1.4 3053:d4b6a044b645: Backed out changeset 85903a7dd4f3

[commits at adium.im]

details:	http://hg.adium.im/adium-1.4/rev/d4b6a044b645
revision:	3053:d4b6a044b645
author:		Zachary West <zacw at adium.im>
date:		Mon Sep 20 07:23:16 2010 -0400

Backed out changeset 85903a7dd4f3

Let's wait for 1.4.1 to make any further non-vital changes.

Refs #13987.
Subject: adium-1.4 3054:b615e48c4a71: Backed out changeset 961833271e26

details:	http://hg.adium.im/adium-1.4/rev/b615e48c4a71
revision:	3054:b615e48c4a71
author:		Zachary West <zacw at adium.im>
date:		Mon Sep 20 07:23:28 2010 -0400

Backed out changeset 961833271e26

Let's wait for 1.4.1 to make any further non-vital changes.

Refs #13987.
Subject: adium-1.4 3055:dc0331cdb426: Merge.

details:	http://hg.adium.im/adium-1.4/rev/dc0331cdb426
revision:	3055:dc0331cdb426
author:		Zachary West <zacw at adium.im>
date:		Mon Sep 20 07:23:34 2010 -0400

Merge.

diffs (123 lines):

diff -r 85903a7dd4f3 -r dc0331cdb426 Frameworks/Adium Framework/Source/AIAccount.h
--- a/Frameworks/Adium Framework/Source/AIAccount.h	Mon Sep 20 00:42:20 2010 +0200
+++ b/Frameworks/Adium Framework/Source/AIAccount.h	Mon Sep 20 07:23:34 2010 -0400
@@ -275,16 +275,6 @@
 - (BOOL)chatShouldAutocompleteUID:(AIChat *)inChat;
 
 /*!
- * @brief Suffix for autocompleted contacts
- */
-- (NSString *)suffixForAutocomplete:(AIChat *)inChat forPartialWordRange:(NSRange)charRange;
-
-/*!
- * @brief Prefix for autocompleted contacts
- */
-- (NSString *)prefixForAutocomplete:(AIChat *)inChat forPartialWordRange:(NSRange)charRange;
-
-/*!
  * @brief Does the account support sending notifications?
  */
 - (BOOL)supportsSendingNotifications;
diff -r 85903a7dd4f3 -r dc0331cdb426 Frameworks/Adium Framework/Source/AIAccount.m
--- a/Frameworks/Adium Framework/Source/AIAccount.m	Mon Sep 20 00:42:20 2010 +0200
+++ b/Frameworks/Adium Framework/Source/AIAccount.m	Mon Sep 20 07:23:34 2010 -0400
@@ -930,28 +930,6 @@
 	return NO;
 }
 
-/*!
- * @brief Suffix for autocompleted contacts
- */
-- (NSString *)suffixForAutocomplete:(AIChat *)inChat forPartialWordRange:(NSRange)charRange
-{
-	NSString *suffix = nil;
-	if (charRange.location == 0)
-	{
-		suffix = @": ";
-	}
-	return suffix;
-}
-
-/*!
- * @brief Prefix for autocompleted contacts
- */
-- (NSString *)prefixForAutocomplete:(AIChat *)inChat forPartialWordRange:(NSRange)charRange
-{
-	return nil;
-}
-
-
 -(NSMenu*)actionMenuForChat:(AIChat*)chat
 {
 	return nil;
diff -r 85903a7dd4f3 -r dc0331cdb426 Plugins/Dual Window Interface/AIMessageViewController.m
--- a/Plugins/Dual Window Interface/AIMessageViewController.m	Mon Sep 20 00:42:20 2010 +0200
+++ b/Plugins/Dual Window Interface/AIMessageViewController.m	Mon Sep 20 07:23:34 2010 -0400
@@ -1046,28 +1046,13 @@
 	NSMutableArray	*completions = nil;
 	
 	if (self.chat.isGroupChat) {
-		NSString *suffix = [self.chat.account suffixForAutocomplete:self.chat forPartialWordRange:charRange];
-		NSString *prefix = [self.chat.account prefixForAutocomplete:self.chat forPartialWordRange:charRange];
+		NSString *suffix = nil;
 		NSString *partialWord = [textView.textStorage.string substringWithRange:charRange];
 		BOOL autoCompleteUID = [self.chat.account chatShouldAutocompleteUID:self.chat];
 		
-		// Check to see if the prefix is already present
-		if (charRange.location != 0 && charRange.location >= prefix.length) {
-			prefix = [[textView.textStorage.string substringWithRange:
-					   NSMakeRange(charRange.location-prefix.length, prefix.length)] isEqualToString:prefix] ? nil : prefix;
-		}
-		
-		// If we need to add a prefix, insert it into the text, then call [textView complete:] again; return early with no completions.
-		if (prefix.length > 0) {
-			[textView.textStorage insertAttributedString:[[NSAttributedString alloc] initWithString:prefix] atIndex:charRange.location];
-			[textView complete:nil];
-			return nil;
-		}
-		
-		// Check to see if the suffix is already present
-		if (charRange.location + charRange.length + suffix.length <= textView.textStorage.string.length ) {
-			suffix = [[textView.textStorage.string substringWithRange:
-					   NSMakeRange(charRange.location + charRange.length, suffix.length)] isEqualToString:suffix] ? nil : suffix;
+		//At the start of a line, append ": "
+		if (charRange.location == 0) {
+			suffix = @": ";
 		}
 		
 		completions = [NSMutableArray array];
@@ -1085,7 +1070,7 @@
 				completion = aliasOrDisplayName;
 			}
 			
-			// Add what we came up with to the completions list (with suffix if required)
+			// Add what we came up with to the completions list (with suffix if at beginning of line)
 			[completions addObject:(suffix ? [completion stringByAppendingString:suffix] : completion)];
 		}
 		
diff -r 85903a7dd4f3 -r dc0331cdb426 Plugins/Twitter Plugin/AITwitterAccount.m
--- a/Plugins/Twitter Plugin/AITwitterAccount.m	Mon Sep 20 00:42:20 2010 +0200
+++ b/Plugins/Twitter Plugin/AITwitterAccount.m	Mon Sep 20 07:23:34 2010 -0400
@@ -352,22 +352,6 @@
 }
 
 /*!
- * @brief Suffix for autocompleted contacts
- */
-- (NSString *)suffixForAutocomplete:(AIChat *)inChat forPartialWordRange:(NSRange)charRange
-{
-	return nil;
-}
-
-/*!
- * @brief Prefix for autocompleted contacts
- */
-- (NSString *)prefixForAutocomplete:(AIChat *)inChat forPartialWordRange:(NSRange)charRange
-{
-	return @"@";
-}
-
-/*!
  * @brief A chat opened.
  *
  * If this is a group chat which belongs to us, aka a timeline chat, set it up how we want it.