[GNUnet-SVN] r18799 - in gnunet-gtk/src: fs include

[gnunet]

Author: grothoff
Date: 2011-12-24 17:25:18 +0100 (Sat, 24 Dec 2011)
New Revision: 18799

Modified:
   gnunet-gtk/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
   gnunet-gtk/src/fs/gnunet-fs-gtk.c
   gnunet-gtk/src/include/gnunet_gtk.h
Log:
-fix GDK_Return compile error once and for all

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-edit_publish_dialog.c       2011-12-24 
16:04:53 UTC (rev 18798)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-edit_publish_dialog.c       2011-12-24 
16:25:18 UTC (rev 18799)
@@ -26,8 +26,8 @@
 #include "gnunet-fs-gtk-edit_publish_dialog.h"
 #include "gnunet-fs-gtk.h"
 #include <gnunet/gnunet_util_lib.h>
-#include <gdk/gdkkeysyms.h>
 
+
 #define PUBSTATE "edit-publication-state"
 
 struct EditPublicationState

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk.c   2011-12-24 16:04:53 UTC (rev 18798)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk.c   2011-12-24 16:25:18 UTC (rev 18799)
@@ -542,9 +542,6 @@
   GNUNET_FS_uri_destroy (uri);
 }
 
-#ifndef GDK_KEY_Return
-#define GDK_KEY_Return GDK_Return
-#endif
 
 gboolean
 main_window_search_entry_key_press_event_cb (GtkWidget *widget,

Modified: gnunet-gtk/src/include/gnunet_gtk.h
===================================================================
--- gnunet-gtk/src/include/gnunet_gtk.h 2011-12-24 16:04:53 UTC (rev 18798)
+++ gnunet-gtk/src/include/gnunet_gtk.h 2011-12-24 16:25:18 UTC (rev 18799)
@@ -39,6 +39,10 @@
 #include <extractor.h>
 #include <gtk/gtk.h>
 #include <gladeui/glade.h>
+#include <gdk/gdkkeysyms.h>
+#ifndef GDK_KEY_Return
+#define GDK_KEY_Return GDK_Return
+#endif
 
 /* ****************** Initialization *************** */