7 retrieving revision 1.1

     7 retrieving revision 1.1

     8 

     8 

     9 diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp

     9 diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp

    10 --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp

    10 --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp

    11 +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp

    11 +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp

    13    // dbus prevents us from being threadsafe, but this routine should not block anyhow

    13    // dbus prevents us from being threadsafe, but this routine should not block anyhow

    14    *aMainThreadOnly = true;

    14    *aMainThreadOnly = true;

    15    return NS_OK;

    15    return NS_OK;

    16  }

    16  }

    17  

    17  

    35 +    }

    35 +    }

    36 +    if (!mProxySettings) {

    36 +    if (!mProxySettings) {

    37 +      mGConf = do_GetService(NS_GCONFSERVICE_CONTRACTID);

    37 +      mGConf = do_GetService(NS_GCONFSERVICE_CONTRACTID);

    38 +    }

    38 +    }

    39    }

    39    }

    41    return NS_OK;

    41    return NS_OK;

    42  }

    42  }

    43  

    43  

    44  bool

    44  bool

    45  nsUnixSystemProxySettings::IsProxyMode(const char* aMode)

    45  nsUnixSystemProxySettings::IsProxyMode(const char* aMode)