| Index: net/proxy/proxy_config_service_linux.cc
|
| ===================================================================
|
| --- net/proxy/proxy_config_service_linux.cc (revision 102250)
|
| +++ net/proxy/proxy_config_service_linux.cc (working copy)
|
| @@ -844,10 +844,14 @@
|
| // binary, so we detect these systems that way.
|
|
|
| #ifdef DLOPEN_GSETTINGS
|
| - gio_handle_ = dlopen("libgio-2.0.so", RTLD_NOW | RTLD_GLOBAL);
|
| + gio_handle_ = dlopen("libgio-2.0.so.0", RTLD_NOW | RTLD_GLOBAL);
|
| if (!gio_handle_) {
|
| - VLOG(1) << "Cannot load gio library. Will fall back to gconf.";
|
| - return false;
|
| + // Try again without .0 at the end; on some systems this may be required.
|
| + gio_handle_ = dlopen("libgio-2.0.so", RTLD_NOW | RTLD_GLOBAL);
|
| + if (!gio_handle_) {
|
| + VLOG(1) << "Cannot load gio library. Will fall back to gconf.";
|
| + return false;
|
| + }
|
| }
|
| if (!LoadSymbol("g_settings_new",
|
| reinterpret_cast<void**>(&g_settings_new)) ||
|
|
|