Commit c8bdb865 authored by Sebastian Ramacher's avatar Sebastian Ramacher

Use GDK_WINDOWING_X11 instead of WITH_XEMBED

parent 4283228c
......@@ -24,10 +24,6 @@ else
LIBNOTIFY_PC_NAME =
endif
ifneq (${WITH_XEMBED},0)
CPPFLAGS += -DWITH_XEMBED
endif
ifeq (,$(findstring -DGETTEXT_PACKAGE,${CPPFLAGS}))
CPPFLAGS += -DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\"
endif
......
......@@ -73,9 +73,6 @@ SHARED_FLAG ?= -shared
# set to something != 0 if you want verbose build output
VERBOSE ?= 0
# xembed
WITH_XEMBED ?= 1
# gettext package name
GETTEXT_PACKAGE ?= lib${PROJECT}-${SOMAJOR}
......
......@@ -327,13 +327,13 @@ girara_session_init(girara_session_t* session, const char* sessionname)
G_CALLBACK(css_template_changed), session);
/* window */
#ifdef WITH_XEMBED
#ifdef GDK_WINDOWING_X11
if (session->gtk.embed != 0) {
session->gtk.window = gtk_plug_new(session->gtk.embed);
} else {
#endif
session->gtk.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
#ifdef WITH_XEMBED
#ifdef GDK_WINDOWING_X11
}
#endif
......
......@@ -8,7 +8,9 @@
#include "callbacks.h"
#include <gtk/gtk.h>
#ifdef GDK_WINDOWING_X11
#include <gtk/gtkx.h>
#endif
#include <gdk/gdkkeysyms.h>
struct girara_session_s
......@@ -30,7 +32,7 @@ struct girara_session_s
GtkEntry *inputbar_entry; /**< Inputbar entry */
GtkNotebook *tabs; /**< The tabs notebook */
GtkBox *results; /**< Completion results */
#ifdef WITH_XEMBED
#ifdef GDK_WINDOWING_X11
Window embed; /**< Embedded window */
#endif
} gtk;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment