diff options
| author | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-06 12:20:12 +0000 |
|---|---|---|
| committer | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-06 12:20:12 +0000 |
| commit | 79c71b3cf46a6cd35d36db03d8cf7236957ef554 (patch) | |
| tree | 813b359cbdf20f4a9a4d1717ea1a963c02c4b4b1 /chrome/app | |
| parent | 48b03754b6f842eea4b179cbe9b7716ce893083b (diff) | |
| download | chromium_src-79c71b3cf46a6cd35d36db03d8cf7236957ef554.zip chromium_src-79c71b3cf46a6cd35d36db03d8cf7236957ef554.tar.gz chromium_src-79c71b3cf46a6cd35d36db03d8cf7236957ef554.tar.bz2 | |
Temporarily disable gconf usage from ProxyConfigServiceLinux because of Glib races.
Patch by Stephane Doyon.
BUG=11442
Review URL: http://codereview.chromium.org/109040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15404 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/chrome_dll_main.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc index ab6dba0..7f30891 100644 --- a/chrome/app/chrome_dll_main.cc +++ b/chrome/app/chrome_dll_main.cc @@ -449,8 +449,11 @@ int ChromeMain(int argc, const char** argv) { // gdk_threads_enter/leave(). Similar issue with the clipboard // (estade@ deanm@). g_type_init(); +#if 0 // gconf temporarily disabled because of races. + // See http://crbug.com/11442. g_thread_init(NULL); gdk_threads_init(); +#endif // 0 (gconf disabled) // gtk_init() can change |argc| and |argv|, but nobody else uses them. gtk_init(&argc, const_cast<char***>(&argv)); SetUpGLibLogHandler(); |