adium 4499:fe90d7000f7a: Switched some adiumx.com links to adium...
commits at adium.im
commits at adium.im
Thu Jan 12 17:57:59 UTC 2012
details: http://hg.adium.im/adium/rev/fe90d7000f7a
revision: 4499:fe90d7000f7a
branch: (none)
author: Adrian Godoroja <robotive at me.com>
date: Thu Jan 12 19:57:37 2012 +0200
Switched some adiumx.com links to adium.im. Added some "missing" wwws.
diffs (199 lines):
diff -r 192f90d29d23 -r fe90d7000f7a Frameworks/AutoHyperlinks Framework/UnitTests/SimpleURLTest.m
--- a/Frameworks/AutoHyperlinks Framework/UnitTests/SimpleURLTest.m Wed Jan 11 20:50:36 2012 -0500
+++ b/Frameworks/AutoHyperlinks Framework/UnitTests/SimpleURLTest.m Thu Jan 12 19:57:37 2012 +0200
@@ -429,7 +429,7 @@
testHyperlink(@"yahoo://im?to=adiumy");
testHyperlink(@"ymsgr:im?to=adiumy");
testHyperlink(@"yahoo:im?to=adiumy");
- //gtalk: URIs adapted from http://groups.google.com/group/google-talk-open/browse_thread/thread/8b297e26b4ffce1b/8d9f92f0f5e68a04?#8d9f92f0f5e68a04 and http://trac.adiumx.com/ticket/7420#comment:4
+ //gtalk: URIs adapted from http://groups.google.com/group/google-talk-open/browse_thread/thread/8b297e26b4ffce1b/8d9f92f0f5e68a04?#8d9f92f0f5e68a04 and http://trac.adium.im/ticket/7420#comment:4
testHyperlink(@"gtalk:chat?jid=example at gmail.com");
testHyperlink(@"gtalk:chat?jid=example at gmail.com&from_jid=example2 at gmail.com");
testHyperlink(@"gtalk:call?jid=example at gmail.com");
diff -r 192f90d29d23 -r fe90d7000f7a Frameworks/libpurple.framework/Versions/0.10.0/Headers/jabber.h
--- a/Frameworks/libpurple.framework/Versions/0.10.0/Headers/jabber.h Wed Jan 11 20:50:36 2012 -0500
+++ b/Frameworks/libpurple.framework/Versions/0.10.0/Headers/jabber.h Thu Jan 12 19:57:37 2012 +0200
@@ -149,7 +149,7 @@
* when we receive a roster push.
*
* See these bug reports:
- * http://trac.adiumx.com/ticket/8834
+ * http://trac.adium.im/ticket/8834
* http://developer.pidgin.im/ticket/5484
* http://developer.pidgin.im/ticket/6188
*/
diff -r 192f90d29d23 -r fe90d7000f7a Plugins/Purple Service/AMPurpleRequestFieldsController.m
--- a/Plugins/Purple Service/AMPurpleRequestFieldsController.m Wed Jan 11 20:50:36 2012 -0500
+++ b/Plugins/Purple Service/AMPurpleRequestFieldsController.m Thu Jan 12 19:57:37 2012 +0200
@@ -510,7 +510,7 @@
NSXMLElement *formnode = [NSXMLNode elementWithName:@"form" children:nil attributes:[NSArray arrayWithObjects:
- [NSXMLNode attributeWithName:@"action" stringValue:@"http://www.adiumx.com/XMPP/form"],
+ [NSXMLNode attributeWithName:@"action" stringValue:@"http://www.adium.im/XMPP/form"],
[NSXMLNode attributeWithName:@"method" stringValue:@"POST"],nil]];
[body addChild:formnode];
@@ -706,7 +706,7 @@
[listener use];
else {
- if ([[[request URL] absoluteString] isEqualToString:@"http://www.adiumx.com/XMPP/form"]) {
+ if ([[[request URL] absoluteString] isEqualToString:@"http://www.adium.im/XMPP/form"]) {
NSString *info = [[NSString alloc] initWithData:[request HTTPBody] encoding:NSUTF8StringEncoding];
NSArray *formfields = [info componentsSeparatedByString:@"&"];
[info release];
diff -r 192f90d29d23 -r fe90d7000f7a Plugins/Purple Service/ESPurpleNotifyEmailController.m
--- a/Plugins/Purple Service/ESPurpleNotifyEmailController.m Wed Jan 11 20:50:36 2012 -0500
+++ b/Plugins/Purple Service/ESPurpleNotifyEmailController.m Thu Jan 12 19:57:37 2012 +0200
@@ -246,7 +246,7 @@
* nor what normally happens when the user opens a .html file since that is, on many systems, an HTML editor.
* Instead, we want to know what application to use for viewing web pages... and then open this file in it.
*/
- err = LSGetApplicationForURL((CFURLRef)[NSURL URLWithString:@"http://www.adiumx.com"],
+ err = LSGetApplicationForURL((CFURLRef)[NSURL URLWithString:@"http://www.adium.im"],
kLSRolesViewer,
/*outAppRef*/ NULL,
&appURL);
diff -r 192f90d29d23 -r fe90d7000f7a Plugins/Purple Service/adiumPurpleCore.m
--- a/Plugins/Purple Service/adiumPurpleCore.m Wed Jan 11 20:50:36 2012 -0500
+++ b/Plugins/Purple Service/adiumPurpleCore.m Thu Jan 12 19:57:37 2012 +0200
@@ -265,7 +265,7 @@
* The ui_info stays in memory forever, anyways, so it hardly matters. -evands
*/
g_hash_table_insert(ui_info, "version", g_strdup([[NSApp applicationVersion] UTF8String]));
- g_hash_table_insert(ui_info, "website", "http://adium.im");
+ g_hash_table_insert(ui_info, "website", "http://www.adium.im");
g_hash_table_insert(ui_info, "dev_website", "http://trac.adium.im");
g_hash_table_insert(ui_info, "client_type", "mac");
diff -r 192f90d29d23 -r fe90d7000f7a Plugins/Twitter Plugin/AITwitterAccount.m
--- a/Plugins/Twitter Plugin/AITwitterAccount.m Wed Jan 11 20:50:36 2012 -0500
+++ b/Plugins/Twitter Plugin/AITwitterAccount.m Thu Jan 12 19:57:37 2012 +0200
@@ -160,7 +160,7 @@
[twitterEngine setClientName:@"Adium"
version:[NSApp applicationVersion]
- URL:@"http://www.adiumx.com"
+ URL:@"http://www.adium.im"
token:self.sourceToken];
[twitterEngine setAPIDomain:[self.host stringByAppendingPathComponent:self.apiPath]];
diff -r 192f90d29d23 -r fe90d7000f7a Resources/Sounds/Adium.AdiumSoundset/Sounds.plist
--- a/Resources/Sounds/Adium.AdiumSoundset/Sounds.plist Wed Jan 11 20:50:36 2012 -0500
+++ b/Resources/Sounds/Adium.AdiumSoundset/Sounds.plist Thu Jan 12 19:57:37 2012 +0200
@@ -10,7 +10,7 @@
The original Adium sounds.
Adam Iser (adamiser at mac.com)
-http://www.adiumx.com
+http://www.adium.im
</string>
<key>Sounds</key>
<dict>
diff -r 192f90d29d23 -r fe90d7000f7a Resources/Sounds/TokyoTrainStation.AdiumSoundset/Sounds.plist
--- a/Resources/Sounds/TokyoTrainStation.AdiumSoundset/Sounds.plist Wed Jan 11 20:50:36 2012 -0500
+++ b/Resources/Sounds/TokyoTrainStation.AdiumSoundset/Sounds.plist Thu Jan 12 19:57:37 2012 +0200
@@ -10,7 +10,7 @@
Version 3.0 of the popular Adium Soundset
________________
-http://www.adiumx.com
+http://www.adium.im
</string>
<key>Sounds</key>
<dict>
diff -r 192f90d29d23 -r fe90d7000f7a Source/AIAdium.h
--- a/Source/AIAdium.h Wed Jan 11 20:50:36 2012 -0500
+++ b/Source/AIAdium.h Thu Jan 12 19:57:37 2012 +0200
@@ -21,7 +21,7 @@
* @mainpage Adium
*
* Adium is a multi-protocol instant messenger written in Objective-C and licensed under the GPL.
- * You can find more about Adium at <http://adium.im/about/>.
+ * You can find more about Adium at <http://www.adium.im/about/>.
*/
@class AICorePluginLoader, AICoreComponentLoader, SUUpdater;
diff -r 192f90d29d23 -r fe90d7000f7a Source/AIAutoLinkingPlugin.m
--- a/Source/AIAutoLinkingPlugin.m Wed Jan 11 20:50:36 2012 -0500
+++ b/Source/AIAutoLinkingPlugin.m Thu Jan 12 19:57:37 2012 +0200
@@ -71,7 +71,7 @@
if (![replacementMessage attribute:NSLinkAttributeName atIndex:i longestEffectiveRange:&linkRange inRange:NSMakeRange(i, stringLength - i)]) {
/* If there's no link at this index already, process it via the hyperlinkScanner to see if there should be one.
* We don't process existing links because (a) it would be duplicative effort and (b) we might mess up a link which had
- * a linkable item within its text, such as "Check out the new story at adiumx.com" linked to an adiumx.com page.
+ * a linkable item within its text, such as "Check out the new story at adium.im" linked to an adium.im page.
*/
NSAttributedString *replacementPart = [[AHHyperlinkScanner hyperlinkScannerWithAttributedString:[inAttributedString attributedSubstringFromRange:linkRange]] linkifiedString];
[replacementMessage replaceCharactersInRange:linkRange
diff -r 192f90d29d23 -r fe90d7000f7a UnitTests/TestAttributedStringAdditions.m
--- a/UnitTests/TestAttributedStringAdditions.m Wed Jan 11 20:50:36 2012 -0500
+++ b/UnitTests/TestAttributedStringAdditions.m Thu Jan 12 19:57:37 2012 +0200
@@ -23,7 +23,7 @@
- (void) testLinkedAttributedString
{
NSString *linkLabel = @"Adium";
- NSString *linkURLString = @"http://adiumx.com/";
+ NSString *linkURLString = @"http://www.adium.im/";
NSURL *linkURL = [NSURL URLWithString:linkURLString];
NSRange linkRange = { 0UL, 0UL };
id linkValue;
@@ -57,7 +57,7 @@
- (void) testAttributedStringWithLinkedSubstring
{
NSString *linkLabel = @"Download Adium now!";
- NSString *linkURLString = @"http://adiumx.com/";
+ NSString *linkURLString = @"http://www.adium.im/";
NSURL *linkURL = [NSURL URLWithString:linkURLString];
NSRange intendedLinkRange = { 9UL, 5UL }; //@"Adium"
NSRange linkRange = { 0UL, 0UL };
@@ -89,7 +89,7 @@
- (void) testAttributedStringWithLinkedEntireStringUsingSubstringMethod
{
NSString *linkLabel = @"Adium";
- NSString *linkURLString = @"http://adiumx.com/";
+ NSString *linkURLString = @"http://www.adium.im/";
NSURL *linkURL = [NSURL URLWithString:linkURLString];
NSRange intendedLinkRange = { 0UL, [linkLabel length] };
NSRange linkRange = { 0UL, 0UL };
@@ -124,7 +124,7 @@
- (void) testAttributedStringWithLinkedEmptySubstring
{
NSString *linkLabel = @"Download Adium now!";
- NSString *linkURLString = @"http://adiumx.com/";
+ NSString *linkURLString = @"http://www.adium.im/";
NSURL *linkURL = [NSURL URLWithString:linkURLString];
NSRange intendedLinkRange = { 9UL, 0UL }; //@""
NSRange linkRange = { 0UL, 0UL };
@@ -157,26 +157,26 @@
- (void) testAttributedStringByConvertingLinksToStrings {
NSMutableAttributedString *input = [[[NSMutableAttributedString alloc] initWithString:@"Adium requires Growl."] autorelease];
- [input addAttribute:NSLinkAttributeName value:[NSURL URLWithString:@"http://adiumx.com/"] range:[[input string] rangeOfString:@"Adium"]];
+ [input addAttribute:NSLinkAttributeName value:[NSURL URLWithString:@"http://www.adium.im/"] range:[[input string] rangeOfString:@"Adium"]];
[input addAttribute:NSLinkAttributeName value:[NSURL URLWithString:@"http://growl.info/"] range:[[input string] rangeOfString:@"Growl"]];
NSAttributedString *result = nil;
STAssertNoThrow(result = [input attributedStringByConvertingLinksToStrings], @"-attributedStringByConvertingLinksToStrings threw an exception");
STAssertNotNil(result, @"-attributedStringByConvertingLinksToStrings returned nil");
- STAssertEqualObjects([result string], @"Adium (http://adiumx.com/) requires Growl (http://growl.info/).", @"-attributedStringByConvertingLinksToStrings did not correctly expand the links");
+ STAssertEqualObjects([result string], @"Adium (http://www.adium.im/) requires Growl (http://growl.info/).", @"-attributedStringByConvertingLinksToStrings did not correctly expand the links");
}
- (void) testAttributedStringByConvertingLinksToURLStrings {
NSMutableAttributedString *input = [[[NSMutableAttributedString alloc] initWithString:@"Adium requires Growl."] autorelease];
- [input addAttribute:NSLinkAttributeName value:[NSURL URLWithString:@"http://adiumx.com/"] range:[[input string] rangeOfString:@"Adium"]];
+ [input addAttribute:NSLinkAttributeName value:[NSURL URLWithString:@"http://www.adium.im/"] range:[[input string] rangeOfString:@"Adium"]];
[input addAttribute:NSLinkAttributeName value:[NSURL URLWithString:@"http://growl.info/"] range:[[input string] rangeOfString:@"Growl"]];
NSAttributedString *result = nil;
STAssertNoThrow(result = [input attributedStringByConvertingLinksToURLStrings], @"-attributedStringByConvertingLinksToURLStrings threw an exception");
STAssertNotNil(result, @"-attributedStringByConvertingLinksToURLStrings returned nil");
- STAssertEqualObjects([result string], @"http://adiumx.com/ requires http://growl.info/.", @"-attributedStringByConvertingLinksToURLStrings did not correctly expand the links");
+ STAssertEqualObjects([result string], @"http://www.adium.im/ requires http://growl.info/.", @"-attributedStringByConvertingLinksToURLStrings did not correctly expand the links");
}
@end
More information about the commits
mailing list