From a9fda066a10f941d1bd3ba54d9ec4caad56fc6ec Mon Sep 17 00:00:00 2001 From: Alex Henrie Date: Fri, 6 Mar 2015 22:06:34 -0700 Subject: [PATCH] Bug 1134537 - Only support GIO in nsIOService. r=mcmanus --- netwerk/base/nsIOService.cpp | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/netwerk/base/nsIOService.cpp b/netwerk/base/nsIOService.cpp index d2fc5ee449a..4cdf2c97ae9 100644 --- a/netwerk/base/nsIOService.cpp +++ b/netwerk/base/nsIOService.cpp @@ -439,7 +439,7 @@ nsIOService::GetProtocolHandler(const char* scheme, nsIProtocolHandler* *result) return rv; } -#ifdef MOZ_X11 +#ifdef MOZ_ENABLE_GIO // check to see whether GVFS can handle this URI scheme. if it can // create a nsIURI for the "scheme:", then we assume it has support for // the requested protocol. otherwise, we failover to using the default @@ -460,30 +460,6 @@ nsIOService::GetProtocolHandler(const char* scheme, nsIProtocolHandler* *result) NS_RELEASE(*result); } - - // check to see whether GnomeVFS can handle this URI scheme. if it can - // create a nsIURI for the "scheme:", then we assume it has support for - // the requested protocol. otherwise, we failover to using the default - // protocol handler. - - // XXX should this be generalized into something that searches a - // category? (see bug 234714) - - rv = CallGetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX"moz-gnomevfs", - result); - if (NS_SUCCEEDED(rv)) { - nsAutoCString spec(scheme); - spec.Append(':'); - - nsIURI *uri; - rv = (*result)->NewURI(spec, nullptr, nullptr, &uri); - if (NS_SUCCEEDED(rv)) { - NS_RELEASE(uri); - return rv; - } - - NS_RELEASE(*result); - } #endif }