adium 3244:a8bdcfd05ba6: Fixed the easy part of 13870 by removin...

commits at adium.im commits at adium.im
Wed Jun 23 10:20:13 UTC 2010


details:	http://hg.adium.im/adium/rev/a8bdcfd05ba6
revision:	3244:a8bdcfd05ba6
author:		Alan Humpherys
date:		Wed May 12 06:54:16 2010 -0600

Fixed the easy part of 13870 by removing tr.im from the list of URL shorteners...
Still todo, removing it from the 2 places where adium uses tr.im as the url shortener for internal purposes.
(transplanted from 07080b15053de46c3db28f6df3e4b906c7bce158)

diffs (33 lines):

diff -r 98f7fa4b4d26 -r a8bdcfd05ba6 Source/AIURLShortenerPlugin.h
--- a/Source/AIURLShortenerPlugin.h	Mon May 31 19:31:54 2010 +0200
+++ b/Source/AIURLShortenerPlugin.h	Wed May 12 06:54:16 2010 -0600
@@ -21,7 +21,6 @@
 	AITinyURL = 0,
 	AIisgd,
 	AIMetamark,
-	AITrim,
 	AIKlam,
 	AINumberOfShortenLinkServices
 } AIShortenLinkService;
diff -r 98f7fa4b4d26 -r a8bdcfd05ba6 Source/AIURLShortenerPlugin.m
--- a/Source/AIURLShortenerPlugin.m	Mon May 31 19:31:54 2010 +0200
+++ b/Source/AIURLShortenerPlugin.m	Wed May 12 06:54:16 2010 -0600
@@ -105,7 +105,6 @@
 	NSDictionary *shorteners = [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithInteger:AITinyURL], @"tinyurl.com",
 																		  [NSNumber numberWithInteger:AIisgd], @"is.gd",
 																		  [NSNumber numberWithInteger:AIMetamark], @"xrl.us",
-																		  [NSNumber numberWithInteger:AITrim], @"tr.im",
 																		  [NSNumber numberWithInteger:AIKlam], @"kl.am",
 																		  nil];
 
@@ -247,10 +246,6 @@
 			request = [NSString stringWithFormat:@"http://metamark.net/api/rest/simple?long_url=%@", [address stringByAddingPercentEscapesForAllCharacters]];
 			break;
 			
-		case AITrim:
-			request = [NSString stringWithFormat:@"http://api.tr.im/api/trim_simple?api_key=zghQN6sv5y0FkLPNlQAopm7qDQz6ItO33ENU21OBsy3dL1Kl&url=%@", [address stringByAddingPercentEscapesForAllCharacters]];
-			break;
-			
 		case AIKlam:
 			request = [NSString stringWithFormat:@"http://kl.am/api/shorten?url=%@&format=text", [address stringByAddingPercentEscapesForAllCharacters]];
 			break;




More information about the commits mailing list