diff options
author | Mike Antipov <mantipov@productengine.com> | 2010-06-23 12:05:09 +0300 |
---|---|---|
committer | Mike Antipov <mantipov@productengine.com> | 2010-06-23 12:05:09 +0300 |
commit | 6290930c98ace2d3b3d76d3be0a06df718a9a238 (patch) | |
tree | 48584ccb08b80d120ec53f3d1df16df55cd9480b /indra/media_plugins/webkit/linux_volume_catcher.cpp | |
parent | e02b51f125f876cfef10f504a121693b3612155a (diff) | |
parent | 11ec720a063b73fc042e8b06338b9526835dbb6b (diff) |
Merge with default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/media_plugins/webkit/linux_volume_catcher.cpp')
-rw-r--r-- | indra/media_plugins/webkit/linux_volume_catcher.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/media_plugins/webkit/linux_volume_catcher.cpp b/indra/media_plugins/webkit/linux_volume_catcher.cpp index 2e7fda865e..5eaef0e1c3 100644 --- a/indra/media_plugins/webkit/linux_volume_catcher.cpp +++ b/indra/media_plugins/webkit/linux_volume_catcher.cpp @@ -47,6 +47,7 @@ extern "C" { #include <glib.h> +#include <glib-object.h> #include <pulse/introspect.h> #include <pulse/context.h> @@ -220,6 +221,10 @@ void VolumeCatcherImpl::init() mGotSyms = loadsyms("libpulse-mainloop-glib.so.0"); if (!mGotSyms) return; + // better make double-sure glib itself is initialized properly. + if (!g_thread_supported ()) g_thread_init (NULL); + g_type_init(); + mMainloop = llpa_glib_mainloop_new(g_main_context_default()); if (mMainloop) { |