adium 4677:72566a9e37c0: Fixed regression of not being able to a...

Thu Feb 9 18:37:48 UTC 2012

details:	http://hg.adium.im/adium/rev/72566a9e37c0
revision:	4677:72566a9e37c0
branch:		(none)
author:		Robert Vehse
date:		Thu Feb 09 19:37:36 2012 +0100

Fixed regression of not being able to automatically install Xtras from the website as reported by mathuaerknedam (http://i.imgur.com/G2i8F.jpg). Credits for the patch go to Paul Wilde. r=wixardy

diffs (93 lines):

diff -r 386cc688212b -r 72566a9e37c0 AdiumHelp/pgs/AdvancedFeatures-SearchForBuddyBy Email.html

--- a/AdiumHelp/pgs/AdvancedFeatures-SearchForBuddyBy Email.html	Thu Feb 09 12:56:27 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link media="all" rel="stylesheet" href="../css/topicpage.css" type="text/css" />
-<title>AIM: search for buddy by email address</title>
-<meta name="keywords" content="account, aim, aol, search, email" />
-<meta name="description" content="Supplemental information about your AOL IM account." />
-</head>
-<body>
-<div id="banner"> <a name="account" id="account"></a><a name="msn" id="msn"></a>
-	<div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div>
-</div>
-<div id="mainbox">
-	<div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div>
-	<div id="pagetitle">
-		<h1>AIM: search for buddy by email address</h1>
-	</div>
-	<div class="taskboxline">
-		<div class="taskboxheader">
-			<h3>Searching for a contact by their email address</h3>
-		</div>
-		<div class="taskboxtext">
-			<p>If you want to find one of your AIM contacts by his/her email, just select select "Search for Buddy by Email" from the submenu of the AIM account in the File menu.</p>
-		</div>
-	</div>
-</div>
-<script type="text/javascript" src="../js/help.js"></script>
-</body>
-</html>
\ No newline at end of file
diff -r 386cc688212b -r 72566a9e37c0 AdiumHelp/pgs/AdvancedFeatures-SearchForBuddyByEmail.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/AdiumHelp/pgs/AdvancedFeatures-SearchForBuddyByEmail.html	Thu Feb 09 19:37:36 2012 +0100
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<link media="all" rel="stylesheet" href="../css/topicpage.css" type="text/css" />
+<title>AIM: search for buddy by email address</title>
+<meta name="keywords" content="account, aim, aol, search, email" />
+<meta name="description" content="Supplemental information about your AOL IM account." />
+</head>
+<body>
+<div id="banner"> <a name="account" id="account"></a><a name="msn" id="msn"></a>
+	<div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div>
+</div>
+<div id="mainbox">
+	<div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div>
+	<div id="pagetitle">
+		<h1>AIM: search for buddy by email address</h1>
+	</div>
+	<div class="taskboxline">
+		<div class="taskboxheader">
+			<h3>Searching for a contact by their email address</h3>
+		</div>
+		<div class="taskboxtext">
+			<p>If you want to find one of your AIM contacts by their email address, just select select "Search for Buddy by Email" from the submenu of the AIM account in the File menu.</p>
+		</div>
+	</div>
+</div>
+<script type="text/javascript" src="../js/help.js"></script>
+</body>
+</html>
\ No newline at end of file
diff -r 386cc688212b -r 72566a9e37c0 Source/XtrasInstaller.m
--- a/Source/XtrasInstaller.m	Thu Feb 09 12:56:27 2012 +0200
+++ b/Source/XtrasInstaller.m	Thu Feb 09 19:37:36 2012 +0100
@@ -78,7 +78,7 @@
 
 - (void)installXtraAtURL:(NSURL *)url
 {
-	if ([[url host] isEqualToString:@"xtras.adium.im"] || ALLOW_UNTRUSTED_XTRAS) {
+	if ([[url host] isEqualToString:@"xtras.adium.im"] || [[url host] isEqualToString:@"www.adiumxtras.com"] || ALLOW_UNTRUSTED_XTRAS) {
 		NSURL	*urlToDownload;
 
 		[NSBundle loadNibNamed:@"XtraProgressWindow" owner:self];
@@ -110,7 +110,7 @@
 
 	} else {
 		NSRunAlertPanel(AILocalizedString(@"Nontrusted Xtra", nil),
-						AILocalizedString(@"This Xtra is not hosted by xtras.adium.im. Automatic installation is not allowed.", nil),
+						AILocalizedString(@"This Xtra is not hosted on the Adium Xtras website. Automatic installation is not allowed.", nil),
 						AILocalizedString(@"Cancel", nil),
 						nil, nil);
 		[self closeInstaller];


