From 6c7479c35e5795ff63ed3359348837c1cd4e6477 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Fri, 26 Feb 2016 18:59:24 +0100 Subject: [PATCH] Make zathura_set_xid always available Signed-off-by: Sebastian Ramacher --- zathura/main.c | 4 ---- zathura/zathura.c | 2 -- zathura/zathura.h | 5 ++--- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/zathura/main.c b/zathura/main.c index 2671e4c..d8bb463 100644 --- a/zathura/main.c +++ b/zathura/main.c @@ -18,10 +18,6 @@ #include "synctex.h" #endif -#ifndef GDK_WINDOWING_X11 -typedef int Window; -#endif - /* Init locale */ static void init_locale(void) diff --git a/zathura/zathura.c b/zathura/zathura.c index c3fd6cc..8712c8a 100644 --- a/zathura/zathura.c +++ b/zathura/zathura.c @@ -448,7 +448,6 @@ zathura_free(zathura_t* zathura) g_free(zathura); } -#ifdef GDK_WINDOWING_X11 void zathura_set_xid(zathura_t* zathura, Window xid) { @@ -456,7 +455,6 @@ zathura_set_xid(zathura_t* zathura, Window xid) zathura->ui.session->gtk.embed = xid; } -#endif void zathura_set_config_dir(zathura_t* zathura, const char* dir) diff --git a/zathura/zathura.h b/zathura/zathura.h index ffb5d80..5c3f134 100644 --- a/zathura/zathura.h +++ b/zathura/zathura.h @@ -238,15 +238,14 @@ bool zathura_init(zathura_t* zathura); */ void zathura_free(zathura_t* zathura); -#ifdef GDK_WINDOWING_X11 /** - * Set parent window id + * Set parent window id. This does not have an effect if the underlying Gtk + * backend is not X11. * * @param zathura The zathura session * @param xid The window id */ void zathura_set_xid(zathura_t* zathura, Window xid); -#endif /** * Set the path to the configuration directory