From 0c993efabf2067510504a2fb909e8f06cfdc3419 Mon Sep 17 00:00:00 2001
From: "pinkerton%aol.net"
 <pinkerton%aol.net@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 6 May 2005 17:46:58 +0000
Subject: [PATCH] use GetPrePath() to replace a bunch of code that did the same
 thing (bug 292671)

git-svn-id: svn://10.0.0.236/trunk@173115 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/camino/src/browser/SiteIconProvider.mm | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/mozilla/camino/src/browser/SiteIconProvider.mm b/mozilla/camino/src/browser/SiteIconProvider.mm
index b0267609444..8c3ad859185 100644
--- a/mozilla/camino/src/browser/SiteIconProvider.mm
+++ b/mozilla/camino/src/browser/SiteIconProvider.mm
@@ -173,22 +173,8 @@ static nsresult MakeFaviconURIFromURI(const nsAString& inURIString, nsAString& o
   if (!isHTTP && !isHTTPS)
     return NS_OK;
 
-  PRInt32 port;
-  uri->GetPort(&port);
-
-  nsCAutoString scheme;
-  uri->GetScheme(scheme);
-  
-  nsCAutoString host;
-  uri->GetHost(host);
-  
-  nsCAutoString faviconURI(scheme);
-  faviconURI.Append("://");
-  faviconURI.Append(host);
-  if (port != -1) {
-    faviconURI.Append(':');
-    faviconURI.AppendInt(port);
-  }
+  nsCAutoString faviconURI;
+  uri->GetPrePath(faviconURI);
   faviconURI.Append("/favicon.ico");
 
   outFaviconURI.Assign(NS_ConvertUTF8toUCS2(faviconURI));