-rename fest

19 files changed, 29 insertions, 34 deletions

diff --git a/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c b/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c
index 0c6849a9..41fb7e7f 100644
--- a/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c
+++ b/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c
@@ -22,9 +22,9 @@
  * @file src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c
  * @author Christian Grothoff
  */
-#include "gnunet-fs-gtk-common.h"
+#include "gnunet-fs-gtk_common.h"
 #include "gnunet-fs-gtk.h"
-#include "gnunet-fs-gtk-edit_publish_dialog.h"
+#include "gnunet-fs-gtk_publish-edit-dialog.h"
 
 
 
diff --git a/src/fs/gnunet-fs-gtk-main_window_create_pseudonym.c b/src/fs/gnunet-fs-gtk-main_window_create_pseudonym.c
index 85bf7ec7..9232e775 100644
--- a/src/fs/gnunet-fs-gtk-main_window_create_pseudonym.c
+++ b/src/fs/gnunet-fs-gtk-main_window_create_pseudonym.c
@@ -23,7 +23,7 @@
  * @author Christian Grothoff
  *
  */
-#include "gnunet-fs-gtk-common.h"
+#include "gnunet-fs-gtk_common.h"
 #include "gnunet-fs-gtk.h"
 
 void
diff --git a/src/fs/gnunet-fs-gtk-main_window_file_download.c b/src/fs/gnunet-fs-gtk-main_window_file_download.c
index 5f04f26a..73ec3bb9 100644
--- a/src/fs/gnunet-fs-gtk-main_window_file_download.c
+++ b/src/fs/gnunet-fs-gtk-main_window_file_download.c
@@ -27,8 +27,8 @@
  * - automatically populate dialog from clipboard?
  * - use our own builder instead of the main builder?
  */
-#include "gnunet-fs-gtk-common.h"
-#include "gnunet-fs-gtk-download.h"
+#include "gnunet-fs-gtk_common.h"
+#include "gnunet-fs-gtk_download-save-as.h"
 #include "gnunet-fs-gtk.h"
 #include <gdk/gdkkeysyms.h>
 
diff --git a/src/fs/gnunet-fs-gtk-main_window_meta_data_context_menu.c b/src/fs/gnunet-fs-gtk-main_window_meta_data_context_menu.c
index 4f8edd53..af4efc42 100644
--- a/src/fs/gnunet-fs-gtk-main_window_meta_data_context_menu.c
+++ b/src/fs/gnunet-fs-gtk-main_window_meta_data_context_menu.c
@@ -24,8 +24,8 @@
  * @author Christian Grothoff
  */
 #include "gnunet-fs-gtk.h"
-#include "gnunet-fs-gtk-download.h"
-#include "gnunet-fs-gtk-event_handler.h"
+#include "gnunet-fs-gtk_download-save-as.h"
+#include "gnunet-fs-gtk_event-handler.h"
 #include <string.h>
 
 
diff --git a/src/fs/gnunet-fs-gtk-main_window_namespace.c b/src/fs/gnunet-fs-gtk-main_window_namespace.c
index 7c61c882..db724b9e 100644
--- a/src/fs/gnunet-fs-gtk-main_window_namespace.c
+++ b/src/fs/gnunet-fs-gtk-main_window_namespace.c
@@ -23,8 +23,7 @@
  * @author Christian Grothoff
  * @brief event handlers for the namespace selection dropdown box in the main window
  */
-#include "gnunet-fs-gtk-common.h"
-#include <gdk/gdk.h>
+#include "gnunet-fs-gtk_common.h"
 #include "gnunet-fs-gtk.h"
 
 
diff --git a/src/fs/gnunet-fs-gtk-main_window_open_directory.c b/src/fs/gnunet-fs-gtk-main_window_open_directory.c
index 8b4717b5..cee0ff17 100644
--- a/src/fs/gnunet-fs-gtk-main_window_open_directory.c
+++ b/src/fs/gnunet-fs-gtk-main_window_open_directory.c
@@ -22,8 +22,8 @@
  * @file src/fs/gnunet-fs-gtk-main_window_open_directory.c
  * @author Christian Grothoff
  */
-#include "gnunet-fs-gtk-common.h"
-#include "gnunet-fs-gtk-event_handler.h"
+#include "gnunet-fs-gtk_common.h"
+#include "gnunet-fs-gtk_event-handler.h"
 
 struct AddChildContext
 {
diff --git a/src/fs/gnunet-fs-gtk-main_window_search.c b/src/fs/gnunet-fs-gtk-main_window_search.c
index b67de6b3..bc9a9236 100644
--- a/src/fs/gnunet-fs-gtk-main_window_search.c
+++ b/src/fs/gnunet-fs-gtk-main_window_search.c
@@ -23,10 +23,9 @@
  * @author Christian Grothoff
  * @brief event handlers for the search function in the main window
  */
-#include "gnunet-fs-gtk-common.h"
+#include "gnunet-fs-gtk_common.h"
 #include "gnunet-fs-gtk.h"
-#include <gdk/gdk.h>
-#include "gnunet-fs-gtk-anonymity_spin_buttons.h"
+#include "gnunet-fs-gtk_anonymity-widgets.h"
 
 
 void
diff --git a/src/fs/gnunet-fs-gtk-main_window_view_toggles.c b/src/fs/gnunet-fs-gtk-main_window_view_toggles.c
index 9b73cac3..3cb3ee2a 100644
--- a/src/fs/gnunet-fs-gtk-main_window_view_toggles.c
+++ b/src/fs/gnunet-fs-gtk-main_window_view_toggles.c
@@ -24,7 +24,7 @@
  *
  * This file contains callbacks for the 'view' menu that toggle views.
  */
-#include "gnunet-fs-gtk-common.h"
+#include "gnunet-fs-gtk_common.h"
 #include "gnunet-fs-gtk.h"
 
 
diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index 48c8bdab..e50476b5 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -23,8 +23,8 @@
  * @brief Main function of gnunet-fs-gtk
  * @author Christian Grothoff
  */
-#include "gnunet-fs-gtk-common.h"
-#include "gnunet-fs-gtk-event_handler.h"
+#include "gnunet-fs-gtk_common.h"
+#include "gnunet-fs-gtk_event-handler.h"
 #include <gdk/gdkkeysyms.h>
 
 /**
diff --git a/src/fs/gnunet-fs-gtk_anonymity-widgets.c b/src/fs/gnunet-fs-gtk_anonymity-widgets.c
index e54dd4cb..82fe26ca 100644
--- a/src/fs/gnunet-fs-gtk_anonymity-widgets.c
+++ b/src/fs/gnunet-fs-gtk_anonymity-widgets.c
@@ -23,8 +23,8 @@
  * @author Christian Grothoff
  * @brief operations to manage user's anonymity level selections
  */
-#include "gnunet-fs-gtk-common.h"
-#include "gnunet-fs-gtk-anonymity_spin_buttons.h"
+#include "gnunet-fs-gtk_common.h"
+#include "gnunet-fs-gtk_anonymity-widgets.h"
 #include <gdk/gdk.h>
 
 /**
diff --git a/src/fs/gnunet-fs-gtk_anonymity-widgets.h b/src/fs/gnunet-fs-gtk_anonymity-widgets.h
index 9dcb090c..1572b349 100644
--- a/src/fs/gnunet-fs-gtk_anonymity-widgets.h
+++ b/src/fs/gnunet-fs-gtk_anonymity-widgets.h
@@ -26,8 +26,7 @@
 #ifndef GNUNET_FS_GTK_ANONYMITY_SPIN_BUTTONS_H
 #define GNUNET_FS_GTK_ANONYMITY_SPIN_BUTTONS_H
 
-#include "gnunet-fs-gtk-common.h"
-#include <gdk/gdk.h>
+#include "gnunet-fs-gtk_common.h"
 
 
 /**
diff --git a/src/fs/gnunet-fs-gtk_common.c b/src/fs/gnunet-fs-gtk_common.c
index afc03807..52ad1595 100644
--- a/src/fs/gnunet-fs-gtk_common.c
+++ b/src/fs/gnunet-fs-gtk_common.c
@@ -23,7 +23,7 @@
  * @brief Common functions used in various places
  * @author Christian Grothoff
  */
-#include "gnunet-fs-gtk-common.h"
+#include "gnunet-fs-gtk_common.h"
 
 /**
  * Converts metadata specified by @data of size @data_len
diff --git a/src/fs/gnunet-fs-gtk_download-save-as.c b/src/fs/gnunet-fs-gtk_download-save-as.c
index 587d8a86..46f381a1 100644
--- a/src/fs/gnunet-fs-gtk_download-save-as.c
+++ b/src/fs/gnunet-fs-gtk_download-save-as.c
@@ -23,9 +23,9 @@
  * @brief functions for managing the 'save as' dialog 
  * @author Christian Grothoff
  */
-#include "gnunet-fs-gtk-download.h"
+#include "gnunet-fs-gtk_download-save-as.h"
 #include "gnunet-fs-gtk.h"
-#include "gnunet-fs-gtk-event_handler.h"
+#include "gnunet-fs-gtk_event-handler.h"
 
 /**
  * State for a 'save as' dialog of a download.
diff --git a/src/fs/gnunet-fs-gtk_download-save-as.h b/src/fs/gnunet-fs-gtk_download-save-as.h
index 2196fcd8..d5b4d051 100644
--- a/src/fs/gnunet-fs-gtk_download-save-as.h
+++ b/src/fs/gnunet-fs-gtk_download-save-as.h
@@ -26,7 +26,7 @@
 #ifndef GNUNET_FS_GTK_DOWNLOAD_SAVE_AS_H
 #define GNUNET_FS_GTK_DOWNLOAD_SAVE_AS_H
 
-#include "gnunet-fs-gtk-common.h"
+#include "gnunet-fs-gtk_common.h"
 
 
 /**
diff --git a/src/fs/gnunet-fs-gtk_event-handler.c b/src/fs/gnunet-fs-gtk_event-handler.c
index 7c243b65..3df59cf1 100644
--- a/src/fs/gnunet-fs-gtk_event-handler.c
+++ b/src/fs/gnunet-fs-gtk_event-handler.c
@@ -24,9 +24,8 @@
  * @author Christian Grothoff
  */
 #include "gnunet-fs-gtk.h"
-#include "gnunet-fs-gtk-download.h"
-#include "gnunet-fs-gtk-event_handler.h"
-#include <string.h>
+#include "gnunet-fs-gtk_download-save-as.h"
+#include "gnunet-fs-gtk_event-handler.h"
 
 
 /**
diff --git a/src/fs/gnunet-fs-gtk_event-handler.h b/src/fs/gnunet-fs-gtk_event-handler.h
index 064c0542..a2f155e4 100644
--- a/src/fs/gnunet-fs-gtk_event-handler.h
+++ b/src/fs/gnunet-fs-gtk_event-handler.h
@@ -23,7 +23,7 @@
  * @brief Main event handler for file-sharing
  * @author Christian Grothoff
  */
-#include "gnunet-fs-gtk-common.h"
+#include "gnunet-fs-gtk_common.h"
 
 
 /**
diff --git a/src/fs/gnunet-fs-gtk_publish-dialog.c b/src/fs/gnunet-fs-gtk_publish-dialog.c
index 1dd67f62..b3c4bd32 100644
--- a/src/fs/gnunet-fs-gtk_publish-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-dialog.c
@@ -22,9 +22,9 @@
  * @file src/fs/gnunet-fs-gtk_publish-dialog.c
  * @author Christian Grothoff
  */
-#include "gnunet-fs-gtk-common.h"
+#include "gnunet-fs-gtk_common.h"
 #include "gnunet-fs-gtk.h"
-#include "gnunet-fs-gtk-edit_publish_dialog.h"
+#include "gnunet-fs-gtk_publish-edit-dialog.h"
 #include <gnunet/gnunet_util_lib.h>
 #include <gnunet/gnunet_fs_service.h>
 
diff --git a/src/fs/gnunet-fs-gtk_publish-edit-dialog.c b/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
index 6dcf5653..df0eecdf 100644
--- a/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
@@ -22,8 +22,7 @@
  * @file src/fs/gnunet-fs-gtk_publish-edit-dialog.c
  * @author Christian Grothoff
  */
-#include "gnunet-fs-gtk-common.h"
-#include "gnunet-fs-gtk-edit_publish_dialog.h"
+#include "gnunet-fs-gtk_publish-edit-dialog.h"
 #include "gnunet-fs-gtk.h"
 #include <gnunet/gnunet_util_lib.h>
 
diff --git a/src/fs/gnunet-fs-gtk_publish-edit-dialog.h b/src/fs/gnunet-fs-gtk_publish-edit-dialog.h
index ae87d09c..4db3cd5e 100644
--- a/src/fs/gnunet-fs-gtk_publish-edit-dialog.h
+++ b/src/fs/gnunet-fs-gtk_publish-edit-dialog.h
@@ -25,7 +25,7 @@
 #ifndef GNUNET_FS_GTK_PUBLISH_EDIT_DIALOG_H
 #define GNUNET_FS_GTK_PUBLISH_EDIT_DIALOG_H
 
-#include "gnunet-fs-gtk-common.h"
+#include "gnunet-fs-gtk_common.h"
 #include <gnunet/gnunet_util_lib.h>
 #include <gnunet/gnunet_fs_service.h>