aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-12-24 16:25:18 +0000
committerChristian Grothoff <christian@grothoff.org>2011-12-24 16:25:18 +0000
commit380409315646ec606ce5b76bd42f54ac9e92dc1f (patch)
treec1c8fd1619e9e08259a042178cb02e8d19e949ff
parentbc8959497fd96585bde441c2b2bc484c195db4e4 (diff)
downloadgnunet-gtk-380409315646ec606ce5b76bd42f54ac9e92dc1f.tar.gz
gnunet-gtk-380409315646ec606ce5b76bd42f54ac9e92dc1f.zip
-fix GDK_Return compile error once and for all
-rw-r--r--src/fs/gnunet-fs-gtk-edit_publish_dialog.c2
-rw-r--r--src/fs/gnunet-fs-gtk.c3
-rw-r--r--src/include/gnunet_gtk.h4
3 files changed, 5 insertions, 4 deletions
diff --git a/src/fs/gnunet-fs-gtk-edit_publish_dialog.c b/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
index 8c0d76b8..34dd9613 100644
--- a/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
+++ b/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
@@ -26,7 +26,7 @@
26#include "gnunet-fs-gtk-edit_publish_dialog.h" 26#include "gnunet-fs-gtk-edit_publish_dialog.h"
27#include "gnunet-fs-gtk.h" 27#include "gnunet-fs-gtk.h"
28#include <gnunet/gnunet_util_lib.h> 28#include <gnunet/gnunet_util_lib.h>
29#include <gdk/gdkkeysyms.h> 29
30 30
31#define PUBSTATE "edit-publication-state" 31#define PUBSTATE "edit-publication-state"
32 32
diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index 5545371b..8f484a6b 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -542,9 +542,6 @@ main_window_search_button_clicked_cb (GtkButton *button, gpointer user_data)
542 GNUNET_FS_uri_destroy (uri); 542 GNUNET_FS_uri_destroy (uri);
543} 543}
544 544
545#ifndef GDK_KEY_Return
546#define GDK_KEY_Return GDK_Return
547#endif
548 545
549gboolean 546gboolean
550main_window_search_entry_key_press_event_cb (GtkWidget *widget, 547main_window_search_entry_key_press_event_cb (GtkWidget *widget,
diff --git a/src/include/gnunet_gtk.h b/src/include/gnunet_gtk.h
index 4f3e2cdb..ee5bbf99 100644
--- a/src/include/gnunet_gtk.h
+++ b/src/include/gnunet_gtk.h
@@ -39,6 +39,10 @@
39#include <extractor.h> 39#include <extractor.h>
40#include <gtk/gtk.h> 40#include <gtk/gtk.h>
41#include <gladeui/glade.h> 41#include <gladeui/glade.h>
42#include <gdk/gdkkeysyms.h>
43#ifndef GDK_KEY_Return
44#define GDK_KEY_Return GDK_Return
45#endif
42 46
43/* ****************** Initialization *************** */ 47/* ****************** Initialization *************** */
44 48