diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-06-23 17:47:24 +0300 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-06-23 17:47:24 +0300 |
| commit | 02f042d0dee2a3f413784b46317ce022cf2132f7 (patch) | |
| tree | e9ef0b9255609c70bc0a0ac1b9e40ae8f5426e81 /indra/media_plugins/webkit/linux_volume_catcher.cpp | |
| parent | 4a0950e2d75a32d5eb4452520bff35967dc67ab2 (diff) | |
| parent | d5fb82283997f50d81af7dbf364783a5961b75d5 (diff) | |
merge
--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) { |