summaryrefslogtreecommitdiffstats
path: root/content/plugin
diff options
context:
space:
mode:
authorqiankun.miao@intel.com <qiankun.miao@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-28 02:41:57 +0000
committerqiankun.miao@intel.com <qiankun.miao@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-28 02:41:57 +0000
commit6ee0191d300457545b2bbddf2b8c0c6b7aa296d3 (patch)
tree03479f5a47c2c8a1c96e7575af0836118daf73a0 /content/plugin
parent353853301c360c31da37d0c860a7ef1087bf8681 (diff)
downloadchromium_src-6ee0191d300457545b2bbddf2b8c0c6b7aa296d3.zip
chromium_src-6ee0191d300457545b2bbddf2b8c0c6b7aa296d3.tar.gz
chromium_src-6ee0191d300457545b2bbddf2b8c0c6b7aa296d3.tar.bz2
Fix compilation error due to deprecated glib API
g_thread_init and g_thread_get_initialized are two deprecated APIs since glib version 2.32. The Glib threading system is automatically initialized at the start of a program. There will be compilation error with these two functions. Remove calls to these two functions. BUG=119669 TEST=NONE Review URL: http://codereview.chromium.org/9835044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129350 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/plugin')
-rw-r--r--content/plugin/plugin_thread.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/content/plugin/plugin_thread.cc b/content/plugin/plugin_thread.cc
index 77dc9d1..b5fec37 100644
--- a/content/plugin/plugin_thread.cc
+++ b/content/plugin/plugin_thread.cc
@@ -82,7 +82,11 @@ PluginThread::PluginThread()
{
// XEmbed plugins assume they are hosted in a Gtk application, so we need
// to initialize Gtk in the plugin process.
+ // g_thread_init API is deprecated since glib 2.31.0, see release note:
+ // http://mail.gnome.org/archives/gnome-announce-list/2011-October/msg00041.html
+#if !(GLIB_CHECK_VERSION(2, 31, 0))
g_thread_init(NULL);
+#endif
// Flash has problems receiving clicks with newer GTKs due to the
// client-side windows change. To be safe, we just always set the