[totem/wip/hadess/libx11-threads: 3/3] main: Rely on libX11 initialising threads
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem/wip/hadess/libx11-threads: 3/3] main: Rely on libX11 initialising threads
- Date: Wed, 4 May 2022 09:38:37 +0000 (UTC)
commit 92243dbf2e670e897eb8793877f8cddfac979f21
Author: Bastien Nocera <hadess hadess net>
Date: Wed May 4 11:38:02 2022 +0200
main: Rely on libX11 initialising threads
src/meson.build | 2 +-
src/totem.c | 10 ----------
2 files changed, 1 insertion(+), 11 deletions(-)
---
diff --git a/src/meson.build b/src/meson.build
index 6446e603e..7f4bb65d9 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -185,7 +185,7 @@ totem = executable(
meson.project_name(),
'totem.c',
include_directories: totem_common_incs,
- dependencies: [ libtotem_dep, x11_dep ],
+ dependencies: [ libtotem_dep ],
c_args: totem_common_cflags + [
'-DG_LOG_DOMAIN="Totem"'
],
diff --git a/src/totem.c b/src/totem.c
index 3794f5497..46fed4505 100644
--- a/src/totem.c
+++ b/src/totem.c
@@ -35,11 +35,6 @@
#include <locale.h>
#include <string.h>
-#ifdef GDK_WINDOWING_X11
-/* X11 headers */
-#include <X11/Xlib.h>
-#endif
-
#include "totem.h"
int
@@ -52,11 +47,6 @@ main (int argc, char **argv)
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
-#ifdef GDK_WINDOWING_X11
- if (XInitThreads () == 0)
- g_error ("XInitThreads() failed, OS is broken. Contact your provider for support.");
-#endif
-
g_set_prgname ("totem");
#if DEVELOPMENT_VERSION
g_set_application_name (_("Videos Preview"));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]