| Index: content/utility/utility_thread_impl.cc
|
| ===================================================================
|
| --- content/utility/utility_thread_impl.cc (revision 126124)
|
| +++ content/utility/utility_thread_impl.cc (working copy)
|
| @@ -137,11 +137,16 @@
|
| // On Linux, some plugins expect the browser to have loaded glib/gtk. Do that
|
| // before attempting to call into the plugin.
|
| #if defined(TOOLKIT_USES_GTK)
|
| + // g_thread_init is deprecated since gtk version 2.32
|
| +#if (GTK_VERSION_MAJOR == 2 && GTK_VERSION_MINOR < 32)
|
| if (!g_thread_get_initialized()) {
|
| g_thread_init(NULL);
|
| gfx::GtkInitFromCommandLine(*CommandLine::ForCurrentProcess());
|
| }
|
| +#else
|
| + gfx::GtkInitFromCommandLine(*CommandLine::ForCurrentProcess());
|
| #endif
|
| +#endif
|
|
|
| for (size_t i = 0; i < plugin_paths.size(); ++i) {
|
| ScopedVector<webkit::npapi::PluginGroup> plugin_groups;
|
|
|