diff options
author | LRN <lrn1986@gmail.com> | 2014-02-11 12:15:42 +0000 |
---|---|---|
committer | LRN <lrn1986@gmail.com> | 2014-02-11 12:15:42 +0000 |
commit | f9d4c3a55af59899126466d9879e74ff7deb9f7f (patch) | |
tree | 95b129bde6f737a95d6ae956a495167b0f3fe226 | |
parent | 57868009041bad9556e59ed4660252048b31c642 (diff) | |
download | gnunet-gtk-f9d4c3a55af59899126466d9879e74ff7deb9f7f.tar.gz gnunet-gtk-f9d4c3a55af59899126466d9879e74ff7deb9f7f.zip |
Use GDK_WINDOWING_X11 to check for X backend support
Checking for gtkx.h does not work as intended, as this header is available
even if there's no X backend.
-rw-r--r-- | src/lib/eventloop.c | 2 | ||||
-rw-r--r-- | src/main/gnunet-gtk.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/eventloop.c b/src/lib/eventloop.c index d3aef7e7..d7182339 100644 --- a/src/lib/eventloop.c +++ b/src/lib/eventloop.c | |||
@@ -181,7 +181,7 @@ GtkWidget * | |||
181 | GNUNET_GTK_plug_me (const char *env_name, | 181 | GNUNET_GTK_plug_me (const char *env_name, |
182 | GtkWidget *main_window) | 182 | GtkWidget *main_window) |
183 | { | 183 | { |
184 | #if HAVE_GTK_GTKX_H | 184 | #if GDK_WINDOWING_X11 |
185 | const char *plugid; | 185 | const char *plugid; |
186 | GtkWidget *plug; | 186 | GtkWidget *plug; |
187 | GtkWidget *child; | 187 | GtkWidget *child; |
diff --git a/src/main/gnunet-gtk.c b/src/main/gnunet-gtk.c index 542edc7d..cc6c3c48 100644 --- a/src/main/gnunet-gtk.c +++ b/src/main/gnunet-gtk.c | |||
@@ -24,7 +24,7 @@ | |||
24 | * @brief Gtk user interface for GNUnet | 24 | * @brief Gtk user interface for GNUnet |
25 | */ | 25 | */ |
26 | #include "gnunet_gtk.h" | 26 | #include "gnunet_gtk.h" |
27 | #if HAVE_GTK_GTKX_H | 27 | #ifdef GDK_WINDOWING_X11 |
28 | #include <gtk/gtkx.h> | 28 | #include <gtk/gtkx.h> |
29 | #endif | 29 | #endif |
30 | 30 | ||
@@ -170,7 +170,7 @@ gnunet_gtk_quit_cb (GObject * object, | |||
170 | } | 170 | } |
171 | 171 | ||
172 | 172 | ||
173 | #if HAVE_GTK_GTKX_H | 173 | #ifdef GDK_WINDOWING_X11 |
174 | /** | 174 | /** |
175 | * Start the child process for the plug. | 175 | * Start the child process for the plug. |
176 | * | 176 | * |
@@ -298,7 +298,7 @@ run (void *cls, | |||
298 | main_window = GTK_WIDGET (get_object ("gnunet_gtk_window")); | 298 | main_window = GTK_WIDGET (get_object ("gnunet_gtk_window")); |
299 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, | 299 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, |
300 | &cleanup_task, NULL); | 300 | &cleanup_task, NULL); |
301 | #if HAVE_GTK_GTKX_H | 301 | #ifdef GDK_WINDOWING_X11 |
302 | plug ("gnunet_statistics_hbox", | 302 | plug ("gnunet_statistics_hbox", |
303 | "gnunet-statistics-gtk", | 303 | "gnunet-statistics-gtk", |
304 | "GNUNET_STATISTICS_GTK_PLUG"); | 304 | "GNUNET_STATISTICS_GTK_PLUG"); |