[GNUnet-SVN] r32305 - in gnunet-gtk/src: lib main

[gnunet]

Author: LRN
Date: 2014-02-11 13:15:42 +0100 (Tue, 11 Feb 2014)
New Revision: 32305

Modified:
   gnunet-gtk/src/lib/eventloop.c
   gnunet-gtk/src/main/gnunet-gtk.c
Log:
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.

Modified: gnunet-gtk/src/lib/eventloop.c
===================================================================
--- gnunet-gtk/src/lib/eventloop.c      2014-02-11 12:15:40 UTC (rev 32304)
+++ gnunet-gtk/src/lib/eventloop.c      2014-02-11 12:15:42 UTC (rev 32305)
@@ -181,7 +181,7 @@
 GNUNET_GTK_plug_me (const char *env_name,
                     GtkWidget *main_window)
 {
-#if HAVE_GTK_GTKX_H
+#if GDK_WINDOWING_X11
   const char *plugid;
   GtkWidget *plug;
   GtkWidget *child;

Modified: gnunet-gtk/src/main/gnunet-gtk.c
===================================================================
--- gnunet-gtk/src/main/gnunet-gtk.c    2014-02-11 12:15:40 UTC (rev 32304)
+++ gnunet-gtk/src/main/gnunet-gtk.c    2014-02-11 12:15:42 UTC (rev 32305)
@@ -24,7 +24,7 @@
  * @brief Gtk user interface for GNUnet
  */
 #include "gnunet_gtk.h"
-#if HAVE_GTK_GTKX_H
+#ifdef GDK_WINDOWING_X11
 #include <gtk/gtkx.h>
 #endif
 
@@ -170,7 +170,7 @@
 }
 
 
-#if HAVE_GTK_GTKX_H
+#ifdef GDK_WINDOWING_X11
 /**
  * Start the child process for the plug.
  *
@@ -298,7 +298,7 @@
   main_window = GTK_WIDGET (get_object ("gnunet_gtk_window"));
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
                                &cleanup_task, NULL);
-#if HAVE_GTK_GTKX_H
+#ifdef GDK_WINDOWING_X11
   plug ("gnunet_statistics_hbox",
         "gnunet-statistics-gtk",
         "GNUNET_STATISTICS_GTK_PLUG");