[xulrunner/f15/master] Don't claim network is offline until we've loaded the link service

[Christopher Aillon]

commit f69a239dc5588d110760b3ef15fc138fa82a4320
Author: Christopher Aillon <caillon at redhat.com>
Date:   Sun Apr 10 17:10:11 2011 -0700

    Don't claim network is offline until we've loaded the link service
    
    On version upgrades, we look for network earlier to check for
    extension updates.  Since we haven't loaded the network link
    service at this point, we can't ask it, so assume it's off.
    
    This updates the patch for mozilla bug 627672 from v4 to v5.
    https://bugzilla.mozilla.org/show_bug.cgi?id=627672

 xulrunner-2.0-network-link-service.patch |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/xulrunner-2.0-network-link-service.patch b/xulrunner-2.0-network-link-service.patch
index f318b70..bdd1e2f 100644
--- a/xulrunner-2.0-network-link-service.patch
+++ b/xulrunner-2.0-network-link-service.patch
@@ -55,7 +55,7 @@ diff -p -U8 mozilla-2.0/netwerk/base/src/nsIOService.cpp.network-link-service mo
          
      NS_TIME_FUNCTION_MARK("Registered observers");
  
-@@ -257,32 +260,16 @@ nsIOService::Init()
+@@ -257,32 +260,20 @@ nsIOService::Init()
          NS_WARN_IF_FALSE(NS_SUCCEEDED(rv), "Was unable to allocate.  No gBufferCache.");
          CallQueryInterface(recyclingAllocator, &gBufferCache);
      }
@@ -69,7 +69,10 @@ diff -p -U8 mozilla-2.0/netwerk/base/src/nsIOService.cpp.network-link-service mo
 -    if (XRE_GetProcessType() == GeckoProcessType_Default)
 -#endif
 -        mNetworkLinkService = do_GetService(NS_NETWORK_LINK_SERVICE_CONTRACTID);
--
++    // We can't really determine if the machine has a usable network connection,
++    // (mNetworkLinkService will be initialized later) so let's cross our fingers!
++    SetOffline(PR_FALSE);
+ 
 -    if (!mNetworkLinkService)
 -        // We can't really determine if the machine has a usable network connection,
 -        // so let's cross our fingers!