[totem] main: Add guards for XInitThreads() calls
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem] main: Add guards for XInitThreads() calls
- Date: Thu, 29 Mar 2012 02:19:53 +0000 (UTC)
commit 26a564c99a4dd414ee4014e524e371188769a4e6
Author: Bastien Nocera <hadess hadess net>
Date: Thu Mar 29 04:10:14 2012 +0200
main: Add guards for XInitThreads() calls
src/backend/bvw-test.c | 7 ++++++-
src/totem.c | 7 ++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/src/backend/bvw-test.c b/src/backend/bvw-test.c
index 0f6b3a5..d24ddfa 100644
--- a/src/backend/bvw-test.c
+++ b/src/backend/bvw-test.c
@@ -5,6 +5,7 @@
#include <gdk/gdk.h>
#include "bacon-video-widget.h"
#ifdef GDK_WINDOWING_X11
+#include <gdk/gdkx.h>
#include <X11/Xlib.h>
#endif
@@ -78,7 +79,11 @@ int main
GtkWidget *win, *bvw;
#ifdef GDK_WINDOWING_X11
- XInitThreads ();
+ GdkDisplay *display;
+
+ display = gdk_display_get_default ();
+ if (GDK_IS_X11_DISPLAY (display))
+ XInitThreads ();
#endif
context = g_option_context_new ("- Play audio and video inside a web browser");
diff --git a/src/totem.c b/src/totem.c
index 2de9dd8..36c30c0 100644
--- a/src/totem.c
+++ b/src/totem.c
@@ -231,13 +231,18 @@ main (int argc, char **argv)
{
Totem *totem;
GtkSettings *gtk_settings;
+#ifdef GDK_WINDOWING_X11
+ GdkDisplay *display;
+#endif
bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
#ifdef GDK_WINDOWING_X11
- if (XInitThreads () == 0)
+ display = gdk_display_get_default ();
+ if (GDK_IS_X11_DISPLAY (display) &&
+ XInitThreads () == 0)
{
gtk_init (&argc, &argv);
g_set_application_name (_("Totem Movie Player"));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]