galeon r8945 - in trunk: . mozilla

[philipl svn gnome org]

Author: philipl
Date: Sat Feb  2 23:09:06 2008
New Revision: 8945
URL: http://svn.gnome.org/viewvc/galeon?rev=8945&view=rev

Log:
2008-02-02  Philip Langdale  <philipl alumni utexas net>

	* mozilla/EphyDirectoryProvider.cpp: Do it right...



Modified:
   trunk/ChangeLog
   trunk/mozilla/ExternalProtocolService.cpp

Modified: trunk/mozilla/ExternalProtocolService.cpp
==============================================================================
--- trunk/mozilla/ExternalProtocolService.cpp	(original)
+++ trunk/mozilla/ExternalProtocolService.cpp	Sat Feb  2 23:09:06 2008
@@ -96,8 +96,6 @@
 
 #if defined(HAVE_NSIEXTERNALPROTOCOLSERVICE_LOADURI) || defined (HAVE_NSPIEXTERNALPROTOCOLSERVICE)
 NS_IMETHODIMP GExternalProtocolService::LoadURI(nsIURI *aURI, nsIPrompt *)
-#elif defined(HAVE_NSIEXTERNALPROTOCOLSERVICE_LOADURI_WITH_IR)
-NS_IMETHODIMP GExternalProtocolService::LoadURI(nsIURI *aURI, nsIInterfaceRequestor *aWindowContext)
 {
 	/* Under some circumstances, the mozilla implementation of
 	 * this asks the user whether they want to open the URI, e.g
@@ -106,6 +104,11 @@
 	 *  http://bugzilla.mozilla.org/show_bug.cgi?id=263546 */
 	return LoadUrl (aURI);
 }
+#elif defined(HAVE_NSIEXTERNALPROTOCOLSERVICE_LOADURI_WITH_IR)
+NS_IMETHODIMP GExternalProtocolService::LoadURI(nsIURI *aURI, nsIInterfaceRequestor *aWindowContext)
+{
+	return LoadUrl (aURI);
+}
 #endif
 
 /* void loadUrl (in nsIURI aURL); */