Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compiler warning fixes.

Browse Source 
g_thread_init is automatically called since 2.32 (and deprecated since 2.35).
g_type_init is automatically called since 2.36 and will be deprecated in the
future.
This commit is contained in:
Aleric Inglewood
2014-07-11 16:54:06 +02:00
parent a4b3c3d1ad
commit 6ccca51fee
6 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llwindow/llwindowsdl.cpp
View File

@@ -125,7 +125,9 @@ bool LLWindowSDL::ll_try_gtk_init(void)
if (!tried_gtk_init)
{
tried_gtk_init = TRUE;
#if !GLIB_CHECK_VERSION(2, 32, 0)
if (!g_thread_supported ()) g_thread_init (NULL);
#endif
maybe_lock_display();
gtk_is_good = gtk_init_check(NULL, NULL);
maybe_unlock_display();

6
indra/newview/llappviewerlinux.cpp
View File

@@ -133,11 +133,13 @@ LLAppViewerLinux::~LLAppViewerLinux()
bool LLAppViewerLinux::init()
{
#if !GLIB_CHECK_VERSION(2, 32, 0)
// g_thread_init() must be called before *any* use of glib, *and*
// before any mutexes are held, *and* some of our third-party
// libraries likes to use glib functions; in short, do this here
// really early in app startup!
if (!g_thread_supported ()) g_thread_init (NULL);
#endif
bool success = LLAppViewer::init();
@@ -277,7 +279,9 @@ bool LLAppViewerLinux::initSLURLHandler()
return false; // failed
}
#if !GLIB_CHECK_VERSION(2, 36, 0)
g_type_init();
#endif
//ViewerAppAPI *api_server = (ViewerAppAPI*)
g_object_new(viewerappapi_get_type(), NULL);
@@ -297,7 +301,9 @@ bool LLAppViewerLinux::sendURLToOtherInstance(const std::string& url)
DBusGConnection *bus;
GError *error = NULL;
#if !GLIB_CHECK_VERSION(2, 36, 0)
g_type_init();
#endif
bus = lldbus_g_bus_get (DBUS_BUS_SESSION, &error);
if (bus)

2
indra/plugins/filepicker/legacy.cpp
View File

@@ -70,7 +70,9 @@ namespace LLWindowSDL {
if (!tried_gtk_init)
{
tried_gtk_init = TRUE;
#if !GLIB_CHECK_VERSION(2, 32, 0)
if (!g_thread_supported ()) g_thread_init (NULL);
#endif
//maybe_lock_display();
gtk_is_good = gtk_init_check(NULL, NULL);
//maybe_unlock_display();

7
indra/plugins/gstreamer010/media_plugin_gstreamer010.cpp
View File

@@ -793,10 +793,13 @@ MediaPluginGStreamer010::startup()
// only do global GStreamer initialization once.
if (!mDoneInit)
{
g_thread_init(NULL);
#if !GLIB_CHECK_VERSION(2, 36, 0)
#if !GLIB_CHECK_VERSION(2, 32, 0)
if (!g_thread_supported()) g_thread_init(NULL);
#endif
// Init the glib type system - we need it.
g_type_init();
#endif
set_gst_plugin_path();

4
indra/plugins/webkit/linux_volume_catcher.cpp
View File

@@ -227,9 +227,13 @@ void VolumeCatcherImpl::init()
mGotSyms = loadsyms("libpulse-mainloop-glib.so.0");
if (!mGotSyms) return;
#if !GLIB_CHECK_VERSION(2, 36, 0)
#if !GLIB_CHECK_VERSION(2, 32, 0)
// better make double-sure glib itself is initialized properly.
if (!g_thread_supported ()) g_thread_init (NULL);
#endif
g_type_init();
#endif
mMainloop = llpa_glib_mainloop_new(g_main_context_default());
if (mMainloop)

4
indra/plugins/webkit/media_plugin_webkit.cpp
View File

@@ -229,12 +229,16 @@ private:
std::string application_dir = std::string( cwd );
#if LL_LINUX
#if !GLIB_CHECK_VERSION(2, 36, 0)
#if !GLIB_CHECK_VERSION(2, 32, 0)
// take care to initialize glib properly, because some
// versions of Qt don't, and we indirectly need it for (some
// versions of) Flash to not crash the browser.
if (!g_thread_supported ()) g_thread_init (NULL);
#endif
g_type_init();
#endif
#endif
#if LL_DARWIN
// When running under the Xcode debugger, there's a setting called "Break on Debugger()/DebugStr()" which defaults to being turned on.