13 files changed, 31 insertions, 31 deletions

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 6b699c2b..6d17a7a3 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -10,18 +10,18 @@ INCLUDES = \
 bin_PROGRAMS = gnunet-fs-gtk
 
 gnunet_fs_gtk_SOURCES = \
-  gnunet-fs-gtk-about.c \
-  gnunet-fs-gtk-common.c gnunet-fs-gtk-common.h \
-  gnunet-fs-gtk-download.c gnunet-fs-gtk-download.h \
-  gnunet-fs-gtk-edit_publish_dialog.c gnunet-fs-gtk-edit_publish_dialog.h \
-  gnunet-fs-gtk-event_handler.c gnunet-fs-gtk-event_handler.h \
-  gnunet-fs-gtk-anonymity_spin_buttons.c gnunet-fs-gtk-anonymity_spin_buttons.h \
-  gnunet-fs-gtk-main_window_meta_data_context_menu.c \
   gnunet-fs-gtk.c gnunet-fs-gtk.h \
+  gnunet-fs-gtk_about.c \
+  gnunet-fs-gtk_anonymity-widgets.c gnunet-fs-gtk_anonymity-widgets.h \
+  gnunet-fs-gtk_common.c gnunet-fs-gtk_common.h \
+  gnunet-fs-gtk_download-save-as.c gnunet-fs-gtk_download-save-as.h \
+  gnunet-fs-gtk_event-handler.c gnunet-fs-gtk_event-handler.h \
+  gnunet-fs-gtk_publish-dialog.c \
+  gnunet-fs-gtk_publish-edit-dialog.c gnunet-fs-gtk_publish-edit-dialog.h \
+  gnunet-fs-gtk-main_window_meta_data_context_menu.c \
   gnunet-fs-gtk-main_window_adv_pseudonym.c \
   gnunet-fs-gtk-main_window_create_pseudonym.c \
   gnunet-fs-gtk-main_window_file_download.c \
-  gnunet-fs-gtk-main_window_file_publish.c \
   gnunet-fs-gtk-main_window_namespace.c \
   gnunet-fs-gtk-main_window_search.c \
   gnunet-fs-gtk-main_window_open_directory.c \
diff --git a/src/fs/gnunet-fs-gtk-about.c b/src/fs/gnunet-fs-gtk_about.c
index 36e0d115..a36c8e83 100644
--- a/src/fs/gnunet-fs-gtk-about.c
+++ b/src/fs/gnunet-fs-gtk_about.c
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file src/fs/gnunet-fs-gtk-about.c
+ * @file src/fs/gnunet-fs-gtk_about.c
  * @author Christian Grothoff
  * @author Igor Wronsky
  *
diff --git a/src/fs/gnunet-fs-gtk-anonymity_spin_buttons.c b/src/fs/gnunet-fs-gtk_anonymity-widgets.c
index 380daa09..e54dd4cb 100644
--- a/src/fs/gnunet-fs-gtk-anonymity_spin_buttons.c
+++ b/src/fs/gnunet-fs-gtk_anonymity-widgets.c
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file src/fs/gnunet-fs-gtk-anonymtiy_spin_buttons.c
+ * @file src/fs/gnunet-fs-gtk_anonymtiy-widgets.c
  * @author Christian Grothoff
  * @brief operations to manage user's anonymity level selections
  */
diff --git a/src/fs/gnunet-fs-gtk-anonymity_spin_buttons.h b/src/fs/gnunet-fs-gtk_anonymity-widgets.h
index ee8e30f0..9dcb090c 100644
--- a/src/fs/gnunet-fs-gtk-anonymity_spin_buttons.h
+++ b/src/fs/gnunet-fs-gtk_anonymity-widgets.h
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file src/fs/gnunet-fs-gtk-anonymtiy_spin_buttons.h
+ * @file src/fs/gnunet-fs-gtk_anonymtiy-widgets.h
  * @author Christian Grothoff
  * @brief operations to manage user's anonymity level selections
  */
diff --git a/src/fs/gnunet-fs-gtk-common.c b/src/fs/gnunet-fs-gtk_common.c
index 586c51fd..afc03807 100644
--- a/src/fs/gnunet-fs-gtk-common.c
+++ b/src/fs/gnunet-fs-gtk_common.c
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file src/fs/gnunet-fs-gtk-common.c
+ * @file src/fs/gnunet-fs-gtk_common.c
  * @brief Common functions used in various places
  * @author Christian Grothoff
  */
diff --git a/src/fs/gnunet-fs-gtk-common.h b/src/fs/gnunet-fs-gtk_common.h
index 3d7f9f7b..3e88c364 100644
--- a/src/fs/gnunet-fs-gtk-common.h
+++ b/src/fs/gnunet-fs-gtk_common.h
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file src/fs/gnunet-fs-gtk-common.h
+ * @file src/fs/gnunet-fs-gtk_common.h
  * @brief Common includes for all gnunet-gtk source files
  * @author Christian Grothoff
  */
diff --git a/src/fs/gnunet-fs-gtk-download.c b/src/fs/gnunet-fs-gtk_download-save-as.c
index 36ad03e0..587d8a86 100644
--- a/src/fs/gnunet-fs-gtk-download.c
+++ b/src/fs/gnunet-fs-gtk_download-save-as.c
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file src/fs/gnunet-fs-gtk-download.c
+ * @file src/fs/gnunet-fs-gtk_download-save-as.c
  * @brief functions for managing the 'save as' dialog 
  * @author Christian Grothoff
  */
diff --git a/src/fs/gnunet-fs-gtk-download.h b/src/fs/gnunet-fs-gtk_download-save-as.h
index 3d7ac16c..2196fcd8 100644
--- a/src/fs/gnunet-fs-gtk-download.h
+++ b/src/fs/gnunet-fs-gtk_download-save-as.h
@@ -19,12 +19,12 @@
 */
 
 /**
- * @file src/fs/gnunet-fs-gtk-download.h
+ * @file src/fs/gnunet-fs-gtk_download-save-as.h
  * @brief functions for downloading
  * @author Christian Grothoff
  */
-#ifndef GNUNET_FS_GTK_DOWNLOAD_H
-#define GNUNET_FS_GTK_DOWNLOAD_H
+#ifndef GNUNET_FS_GTK_DOWNLOAD_SAVE_AS_H
+#define GNUNET_FS_GTK_DOWNLOAD_SAVE_AS_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 ed5f56bf..7c243b65 100644
--- a/src/fs/gnunet-fs-gtk-event_handler.c
+++ b/src/fs/gnunet-fs-gtk_event-handler.c
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file src/fs/gnunet-fs-gtk-event_handler.c
+ * @file src/fs/gnunet-fs-gtk_event-handler.c
  * @brief Main event handler for file-sharing
  * @author Christian Grothoff
  */
diff --git a/src/fs/gnunet-fs-gtk-event_handler.h b/src/fs/gnunet-fs-gtk_event-handler.h
index 4617d76e..064c0542 100644
--- a/src/fs/gnunet-fs-gtk-event_handler.h
+++ b/src/fs/gnunet-fs-gtk_event-handler.h
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file src/fs/gnunet-fs-gtk-event_handler.h
+ * @file src/fs/gnunet-fs-gtk_event-handler.h
  * @brief Main event handler for file-sharing
  * @author Christian Grothoff
  */
diff --git a/src/fs/gnunet-fs-gtk-main_window_file_publish.c b/src/fs/gnunet-fs-gtk_publish-dialog.c
index 57a5eb6a..1dd67f62 100644
--- a/src/fs/gnunet-fs-gtk-main_window_file_publish.c
+++ b/src/fs/gnunet-fs-gtk_publish-dialog.c
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file src/fs/gnunet-fs-gtk-main_window_file_publish.c
+ * @file src/fs/gnunet-fs-gtk_publish-dialog.c
  * @author Christian Grothoff
  */
 #include "gnunet-fs-gtk-common.h"
diff --git a/src/fs/gnunet-fs-gtk-edit_publish_dialog.c b/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
index a689b06d..6dcf5653 100644
--- a/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file src/fs/gnunet-fs-gtk-edit_publish_dialog.c
+ * @file src/fs/gnunet-fs-gtk_publish-edit-dialog.c
  * @author Christian Grothoff
  */
 #include "gnunet-fs-gtk-common.h"
@@ -154,7 +154,7 @@ struct EditPublicationDialogContext
 
   /**
    * Flag to track if we changed the preview and thus should keep/discard
-   * certain metadata. (FIXME: yucky!)
+   * binary metadata.
    */
   int preview_changed;
 
@@ -254,7 +254,7 @@ GNUNET_GTK_edit_publication_type_combo_changed_cb (GtkComboBox * widget,
  * @param ts the tree selection object
  * @param user_data the 'struct EditPublicationDialogContext'
  */
-/* FIXME: connect this signal via glade (modern versions of Glade support this) */
+/* FIXME-UNCLEAN: connect this signal via glade (modern versions of Glade support this) */
 static void
 metadata_selection_changed_cb (GtkTreeSelection *ts,
                                gpointer user_data)
@@ -503,7 +503,7 @@ GNUNET_GTK_edit_publication_metadata_preview_file_chooser_button_file_set_cb (Gt
  * @param ts the tree selection object
  * @param user_data the 'struct EditPublicationDialogContext'
  */
-/* FIXME: connect this signal via glade (modern versions of Glade support this) */
+/* FIXME-UNCLEAN: connect this signal via glade (modern versions of Glade support this) */
 static void
 keywords_selection_changed_cb (GtkTreeSelection *ts,
                                gpointer user_data)
@@ -993,7 +993,7 @@ file_information_import (void *cls,
   }
   else
   {
-    /* FIXME: ensure that short_fn is UTF-8 encoded */
+    /* FIXME-BUG-MAYBE: ensure that short_fn is UTF-8 encoded */
     gtk_window_set_title (ctx->edit_publication_window, short_fn);
     GNUNET_free (short_fn);
   }
@@ -1008,8 +1008,8 @@ file_information_import (void *cls,
  * @param fip information about the file information that is to be edited
  * @param allow_no_keywords is it OK to close the dialog without any keywords?
  *                          also used to indicate that this is a namespace operation
- *                          (FIXME: overloaded/badly-named argument)
- * @param anon_liststore liststore with anonymity options (FIXME: bad sharing)
+ *                          (FIXME-UNCLEAN: overloaded/badly-named argument)
+ * @param anon_liststore liststore with anonymity options (FIXME-UNCLEAN: bad sharing)
  * @param cb function to call when the dialog is closed
  * @param cb_cls closure for 'cb'
  */
@@ -1142,7 +1142,7 @@ GNUNET_FS_GTK_edit_publish_dialog (GtkWindow * parent,
   gtk_widget_set_sensitive (ctx->confirm_button, allow_no_keywords ? TRUE : FALSE);
 
 
-  /* FIXME: these signal handlers can be set by (modern) versions of Glade */
+  /* FIXME-UNCLEAN: these signal handlers can be set by (modern) versions of Glade */
   keywords_selection = gtk_tree_view_get_selection (ctx->keywords_treeview);
   g_signal_connect (G_OBJECT (keywords_selection), "changed",
                     G_CALLBACK (keywords_selection_changed_cb), ctx);
diff --git a/src/fs/gnunet-fs-gtk-edit_publish_dialog.h b/src/fs/gnunet-fs-gtk_publish-edit-dialog.h
index 63111bbf..ae87d09c 100644
--- a/src/fs/gnunet-fs-gtk-edit_publish_dialog.h
+++ b/src/fs/gnunet-fs-gtk_publish-edit-dialog.h
@@ -19,11 +19,11 @@
 */
 
 /**
- * @file src/fs/gnunet-fs-gtk-edit_publish_dialog.h
+ * @file src/fs/gnunet-fs-gtk_publish-edit-dialog.h
  * @author Christian Grothoff
  */
-#ifndef GNUNET_FS_GTK_EDIT_PUBLISH_DIALOG_H
-#define GNUNET_FS_GTK_EDIT_PUBLISH_DIALOG_H
+#ifndef GNUNET_FS_GTK_PUBLISH_EDIT_DIALOG_H
+#define GNUNET_FS_GTK_PUBLISH_EDIT_DIALOG_H
 
 #include "gnunet-fs-gtk-common.h"
 #include <gnunet/gnunet_util_lib.h>