diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-06-22 16:53:49 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-06-22 16:53:49 -0700 |
| commit | 204603e201ae4f3e088c5e14eefc536c4f567398 (patch) | |
| tree | 7d14cbb5b385532302d8e792e0167e71f8c7a55a /indra/media_plugins/webkit/linux_volume_catcher.cpp | |
| parent | 25de07a379aaacfc7eb37dd91f33005acd3791ae (diff) | |
| parent | 6296390cdee1102eb7b0ea5e1625a1d4c268b490 (diff) | |
Merge
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) { |