aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llwindow/llwindowsdl.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llwindow/llwindowsdl.cpp')
-rw-r--r--linden/indra/llwindow/llwindowsdl.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp
index c088dd8..0cff44f 100644
--- a/linden/indra/llwindow/llwindowsdl.cpp
+++ b/linden/indra/llwindow/llwindowsdl.cpp
@@ -123,9 +123,9 @@ BOOL ll_try_gtk_init(void)
123 if (!tried_gtk_init) 123 if (!tried_gtk_init)
124 { 124 {
125 tried_gtk_init = TRUE; 125 tried_gtk_init = TRUE;
126#if LL_GSTREAMER_ENABLED 126///#if LL_GSTREAMER_ENABLED
127 if (!g_thread_supported ()) g_thread_init (NULL); 127 if (!g_thread_supported ()) g_thread_init (NULL);
128#endif // LL_GSTREAMER_ENABLED 128///#endif // LL_GSTREAMER_ENABLED
129 maybe_lock_display(); 129 maybe_lock_display();
130 gtk_is_good = gtk_init_check(NULL, NULL); 130 gtk_is_good = gtk_init_check(NULL, NULL);
131 maybe_unlock_display(); 131 maybe_unlock_display();
@@ -2530,7 +2530,7 @@ S32 OSMessageBoxSDL(const std::string& text, const std::string& caption, U32 typ
2530 buttons = GTK_BUTTONS_YES_NO; 2530 buttons = GTK_BUTTONS_YES_NO;
2531 break; 2531 break;
2532 } 2532 }
2533 win = gtk_message_dialog_new(NULL,flags, messagetype, buttons, text.c_str()); 2533 win = gtk_message_dialog_new(NULL,flags, messagetype, buttons, "%s", text.c_str());
2534 2534
2535# if LL_X11 2535# if LL_X11
2536 // Make GTK tell the window manager to associate this 2536 // Make GTK tell the window manager to associate this