Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(349)

Unified Diff: net/proxy/proxy_config_service_linux.cc

Issue 7982053: Linux: try libgio-2.0.so.0 first when trying to use gsettings for proxy settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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)) ||
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698