[GNUnet-SVN] r16555 - gnunet-gtk/src/fs

[gnunet]

Author: grothoff
Date: 2011-08-15 16:55:37 +0200 (Mon, 15 Aug 2011)
New Revision: 16555

Modified:
   gnunet-gtk/src/fs/gnunet-fs-gtk-about.c
   gnunet-gtk/src/fs/gnunet-fs-gtk-anonymity_spin_buttons.c
   gnunet-gtk/src/fs/gnunet-fs-gtk-common.c
   gnunet-gtk/src/fs/gnunet-fs-gtk-common.h
   gnunet-gtk/src/fs/gnunet-fs-gtk-download.c
   gnunet-gtk/src/fs/gnunet-fs-gtk-download.h
   gnunet-gtk/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
   gnunet-gtk/src/fs/gnunet-fs-gtk-edit_publish_dialog.h
   gnunet-gtk/src/fs/gnunet-fs-gtk-event_handler.c
   gnunet-gtk/src/fs/gnunet-fs-gtk-event_handler.h
   gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c
   gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_create_pseudonym.c
   gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_download.c
   gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_publish.c
   gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_search.c
   gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_open_directory.c
   gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_view_toggles.c
   gnunet-gtk/src/fs/gnunet-fs-gtk.c
Log:
renaming

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-about.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-about.c     2011-08-15 14:39:21 UTC (rev 
16554)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-about.c     2011-08-15 14:55:37 UTC (rev 
16555)
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file src/fs/about.c
+ * @file src/fs/gnunet-fs-gtk-about.c
  * @author Christian Grothoff
  * @author Igor Wronsky
  *
@@ -39,4 +39,4 @@
 }
 
 
-/* end of about.c */
+/* end of gnunet-fs-gtk-about.c */

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-anonymity_spin_buttons.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-anonymity_spin_buttons.c    2011-08-15 
14:39:21 UTC (rev 16554)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-anonymity_spin_buttons.c    2011-08-15 
14:55:37 UTC (rev 16555)
@@ -19,13 +19,13 @@
 */
 
 /**
- * @file src/fs_anonymtiy_spin_buttons.c
+ * @file src/fs/gnunet-fs-gtk-anonymtiy_spin_buttons.c
  * @author Christian Grothoff
  *
  * This file contains callbacks to turn spin buttons red when the
  * value reaches zero.
  */
-#include "common.h"
+#include "gnunet-fs-gtk-common.h"
 
 
 /**
@@ -70,4 +70,4 @@
 }
 
 
-/* end of fs_anonymtiy_spin_buttons.c */
+/* end of gnunet-fs-gtk-anonymtiy_spin_buttons.c */

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-common.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-common.c    2011-08-15 14:39:21 UTC (rev 
16554)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-common.c    2011-08-15 14:55:37 UTC (rev 
16555)
@@ -19,11 +19,11 @@
 */
 
 /**
- * @file src/fs/common.c
+ * @file src/fs/gnunet-fs-gtk-common.c
  * @brief Common functions used in various places
  * @author Christian Grothoff
  */
-#include "common.h"
+#include "gnunet-fs-gtk-common.h"
 
 /**
  * Add meta data to list store.
@@ -180,4 +180,4 @@
 }
 
 
-/* end of common.c */
+/* end of gnunet-fs-gtk-common.c */

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-common.h
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-common.h    2011-08-15 14:39:21 UTC (rev 
16554)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-common.h    2011-08-15 14:55:37 UTC (rev 
16555)
@@ -19,32 +19,45 @@
 */
 
 /**
- * @file src/fs/common.h
+ * @file src/fs/gnunet-fs-gtk-common.h
  * @brief Common includes for all gnunet-gtk source files
  * @author Christian Grothoff
  */
-#ifndef COMMON_H
-#define COMMON_H
+#ifndef GNUNET_FS_GTK_COMMON_H
+#define GNUNET_FS_GTK_COMMON_H
 
 #include "gnunet_gtk.h"
 #include <gnunet/gnunet_fs_service.h>
 #include <extractor.h>
 
 
-
+/**
+ * Obtain pixbuf from thumbnail data in meta data.
+ *
+ * @param meta input meta data
+ * @return NULL on error, otherwise the embedded thumbnail
+ */
 GdkPixbuf *
 GNUNET_FS_GTK_get_thumbnail_from_meta_data (const struct 
GNUNET_CONTAINER_MetaData *meta);
 
+
 /**
+ * FIXME: odd API...
  * Setup the expiration year adjustment to start with the
  * next year and default to next year plus one.
+ *
+ * @param builder
  */
 void
 GNUNET_FS_GTK_setup_expiration_year_adjustment (GtkBuilder *builder);
 
+
 /**
  * Convert the year from the spin button to an expiration
  * time (on midnight, January 1st of that year).
+ *
+ * @param spin button with the year
+ * @param time converted from the spin button
  */
 struct GNUNET_TIME_Absolute 
 GNUNET_FS_GTK_get_expiration_time (GtkSpinButton *spin);
@@ -53,6 +66,10 @@
 /**
  * mmap the given file and run the GNUNET_FS_directory_list_contents
  * function on it.
+ *
+ * @param filename name with the directory
+ * @param dep function to call on each entry
+ * @param dep_cls closure for 'dep'
  */
 void
 GNUNET_FS_GTK_mmap_and_scan (const char *filename,
@@ -86,4 +103,4 @@
                                           size_t data_len);
 
 #endif
-/* end of common.h */
+/* end of gnunet-fs-gtk-common.h */

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-download.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-download.c  2011-08-15 14:39:21 UTC (rev 
16554)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-download.c  2011-08-15 14:55:37 UTC (rev 
16555)
@@ -19,16 +19,17 @@
 */
 
 /**
- * @file src/download.c
+ * @file src/fs/gnunet-fs-gtk-download.c
  * @brief functions for downloading
  * @author Christian Grothoff
  */
-#include "download.h"
+#include "gnunet-fs-gtk-download.h"
 #include "gnunet-fs-gtk.h"
-#include "fs_event_handler.h"
+#include "gnunet-fs-gtk-event_handler.h"
 
+
 void
-GNUNET_GTK_open_download_as_dialog (struct DownloadContext *dc)
+GNUNET_FS_GTK_open_download_as_dialog (struct DownloadContext *dc)
 {
   GtkWidget *ad;
   GtkBuilder *builder;
@@ -39,7 +40,7 @@
   struct DownloadEntry *de;
   GtkWidget *cb;
 
-  builder = GNUNET_GTK_get_new_builder ("download_as.glade");
+  builder = GNUNET_GTK_get_new_builder 
("gnunet_fs_gtk_download_as_dialog.glade");
   if (builder == NULL)
     {
       if (dc->rr != NULL)
@@ -133,4 +134,4 @@
   GNUNET_free (dc);
 }
 
-/* end of download.c */
+/* end of gnunet-fs-gtk-download.c */

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-download.h
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-download.h  2011-08-15 14:39:21 UTC (rev 
16554)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-download.h  2011-08-15 14:55:37 UTC (rev 
16555)
@@ -19,14 +19,14 @@
 */
 
 /**
- * @file src/download.h
+ * @file src/fs/gnunet-fs-gtk-download.h
  * @brief functions for downloading
  * @author Christian Grothoff
  */
 
-#ifndef DOWNLOAD_H
-#define DOWNLOAD_H
-#include "common.h"
+#ifndef GNUNET_FS_GTK_DOWNLOAD_H
+#define GNUNET_FS_GTK_DOWNLOAD_H
+#include "gnunet-fs-gtk-common.h"
 
 /**
  * Information we keep for a download.
@@ -78,6 +78,7 @@
 
 
 void
-GNUNET_GTK_open_download_as_dialog (struct DownloadContext *dc);
+GNUNET_FS_GTK_open_download_as_dialog (struct DownloadContext *dc);
 
+
 #endif

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-edit_publish_dialog.c       2011-08-15 
14:39:21 UTC (rev 16554)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-edit_publish_dialog.c       2011-08-15 
14:55:37 UTC (rev 16555)
@@ -19,11 +19,11 @@
 */
 
 /**
- * @file src/edit_publish_dialog.c
+ * @file src/fs/gnunet-fs-gtk-edit_publish_dialog.c
  * @author Christian Grothoff
  */
-#include "common.h"
-#include "edit_publish_dialog.h"
+#include "gnunet-fs-gtk-common.h"
+#include "gnunet-fs-gtk-edit_publish_dialog.h"
 #include <gnunet/gnunet_util_lib.h>
 
 /**
@@ -677,11 +677,11 @@
  * Open the dialog to edit file information data.
  */
 void
-GNUNET_GTK_edit_publish_dialog (int *do_index,
-                               char **short_fn,
-                               guint *anonymity_level,
-                               guint *priority,
-                               struct GNUNET_FS_FileInformation *fip)
+GNUNET_FS_GTK_edit_publish_dialog (int *do_index,
+                                  char **short_fn,
+                                  guint *anonymity_level,
+                                  guint *priority,
+                                  struct GNUNET_FS_FileInformation *fip)
 {
   GtkWidget *ad;
   GtkListStore *ls;
@@ -692,7 +692,7 @@
   GtkTreeSelection *sel;
 
   GNUNET_assert (builder == NULL);
-  builder = GNUNET_GTK_get_new_builder ("publish_edit_dialog.glade");
+  builder = GNUNET_GTK_get_new_builder 
("gnunet_fs_gtk_publish_edit_dialog.glade");
   if (builder == NULL)
     {
       GNUNET_break (0);
@@ -704,9 +704,9 @@
     {
       /* indexing does not apply to directories */
       gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder,
-                                                                   
"GNUNET_GTK_edit_file_information_index_check_button")));
+                                                          
"GNUNET_GTK_edit_file_information_index_check_button")));
       gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder,
-                                                                  
"GNUNET_GTK_edit_file_information_index_label")));
+                                                          
"GNUNET_GTK_edit_file_information_index_label")));
       
     }
 
@@ -768,4 +768,4 @@
   builder = NULL;
 }
 
-/* end of edit_publish_dialog.c */
+/* end of gnunet-fs-gtk-edit_publish_dialog.c */

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-edit_publish_dialog.h
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-edit_publish_dialog.h       2011-08-15 
14:39:21 UTC (rev 16554)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-edit_publish_dialog.h       2011-08-15 
14:55:37 UTC (rev 16555)
@@ -19,23 +19,23 @@
 */
 
 /**
- * @file src/edit_publish_dialog.h
+ * @file src/fs/gnunet-fs-gtk-edit_publish_dialog.h
  * @author Christian Grothoff
  */
-#ifndef EDIT_PUBLISH_DIALOG_H
-#define EDIT_PUBLISH_DIALOG_H
+#ifndef GNUNET_FS_GTK_EDIT_PUBLISH_DIALOG_H
+#define GNUNET_FS_GTK_EDIT_PUBLISH_DIALOG_H
 
-#include "common.h"
+#include "gnunet-fs-gtk-common.h"
 #include <gnunet/gnunet_util_lib.h>
 #include <gnunet/gnunet_fs_service.h>
 
 
 void
-GNUNET_GTK_edit_publish_dialog (int *do_index,
-                               char **short_fn,
-                               guint *anonymity_level,
-                               guint *priority,
-                               struct GNUNET_FS_FileInformation *fip);
+GNUNET_FS_GTK_edit_publish_dialog (int *do_index,
+                                  char **short_fn,
+                                  guint *anonymity_level,
+                                  guint *priority,
+                                  struct GNUNET_FS_FileInformation *fip);
 
 #endif
-/* end of edit_publish_dialog.h */
+/* end of gnunet-fs-gtk-edit_publish_dialog.h */

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-event_handler.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-event_handler.c     2011-08-15 14:39:21 UTC 
(rev 16554)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-event_handler.c     2011-08-15 14:55:37 UTC 
(rev 16555)
@@ -19,14 +19,13 @@
 */
 
 /**
- * @file src/fs_event_handler.c
+ * @file src/fs/gnunet-fs-gtk-event_handler.c
  * @brief Main event handler for file-sharing
  * @author Christian Grothoff
  */
-#include "common.h"
 #include "gnunet-fs-gtk.h"
-#include "download.h"
-#include "fs_event_handler.h"
+#include "gnunet-fs-gtk-download.h"
+#include "gnunet-fs-gtk-event_handler.h"
 #include <string.h>
 
 static struct SearchTab *search_tab_head;
@@ -691,7 +690,7 @@
   dlc->rr = gtk_tree_row_reference_new (tm, path);
   dlc->sr = sr->result;
   dlc->anonymity = -1;
-  GNUNET_GTK_open_download_as_dialog (dlc);
+  GNUNET_FS_GTK_open_download_as_dialog (dlc);
   g_free (mime);
 }
 
@@ -1205,7 +1204,7 @@
       else
        tab->query_txt = GNUNET_FS_uri_to_string (query);
     }
-  tab->builder = GNUNET_GTK_get_new_builder ("search_tab.glade");
+  tab->builder = GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_search_tab.glade");
   tab->ts = GTK_TREE_STORE (gtk_builder_get_object (tab->builder,
                                                    
"GNUNET_GTK_file_sharing_result_tree_store"));
   /* load frame */
@@ -1707,7 +1706,7 @@
       GNUNET_CONTAINER_DLL_insert (publish_tab_head,
                                   publish_tab_tail,
                                   tab);
-      tab->builder = GNUNET_GTK_get_new_builder ("publish_tab.glade");
+      tab->builder = GNUNET_GTK_get_new_builder 
("gnunet_fs_gtk_publish_tab.glade");
       df = GTK_WINDOW (gtk_builder_get_object (tab->builder,
                                               "_publish_frame_window"));
       tab->frame = gtk_bin_get_child (GTK_BIN (df));
@@ -2025,4 +2024,4 @@
 
 
 
-/* end of fs_event_handler.c */
+/* end of gnunet-fs-gtk-event_handler.c */

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-event_handler.h
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-event_handler.h     2011-08-15 14:39:21 UTC 
(rev 16554)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-event_handler.h     2011-08-15 14:55:37 UTC 
(rev 16555)
@@ -19,11 +19,11 @@
 */
 
 /**
- * @file src/fs_event_handler.h
+ * @file src/fs/gnunet-fs-gtk-event_handler.h
  * @brief Main event handler for file-sharing
  * @author Christian Grothoff
  */
-#include "common.h"
+#include "gnunet-fs-gtk-common.h"
 
 
 struct SearchResult;
@@ -195,4 +195,4 @@
                                   const struct GNUNET_FS_ProgressInfo *info);
 
 
-/* end of fs_event_handler.h */
+/* end of gnunet-fs-gtk-event_handler.h */

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c 2011-08-15 
14:39:21 UTC (rev 16554)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c 2011-08-15 
14:55:37 UTC (rev 16555)
@@ -19,10 +19,10 @@
 */
 
 /**
- * @file src/main_window_adv_pseudonym.c
+ * @file src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c
  * @author Christian Grothoff
  */
-#include "common.h"
+#include "gnunet-fs-gtk-common.h"
 #include "gnunet-fs-gtk.h"
 
 static GtkBuilder *builder;
@@ -413,7 +413,7 @@
   guint type;
   guint max_type;
  
-  builder = GNUNET_GTK_get_new_builder ("select_pseudonym_dialog.glade");
+  builder = GNUNET_GTK_get_new_builder 
("gnunet_fs_gtk_select_pseudonym_dialog.glade");
   if (builder == NULL)
     {
       GNUNET_break (0);     
@@ -464,7 +464,7 @@
   builder = NULL;
 
 
-  builder = GNUNET_GTK_get_new_builder ("advertise_pseudonym_dialog.glade");
+  builder = GNUNET_GTK_get_new_builder 
("gnunet_fs_gtk_advertise_pseudonym_dialog.glade");
   if (builder == NULL)
     {
       GNUNET_break (0);
@@ -585,4 +585,4 @@
 }
 
 
-/* end of main_window_adv_pseudonym.c */
+/* end of gnunet-fs-gtk-main_window_adv_pseudonym.c */

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_create_pseudonym.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_create_pseudonym.c      
2011-08-15 14:39:21 UTC (rev 16554)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_create_pseudonym.c      
2011-08-15 14:55:37 UTC (rev 16555)
@@ -19,11 +19,11 @@
 */
 
 /**
- * @file src/main_window_create_pseudonym.c
+ * @file src/fs/gnunet-fs-gtk-main_window_create_pseudonym.c
  * @author Christian Grothoff
  *
  */
-#include "common.h"
+#include "gnunet-fs-gtk-common.h"
 #include "gnunet-fs-gtk.h"
 
 /**
@@ -37,7 +37,7 @@
   const char *name;
   struct GNUNET_FS_Namespace *ns;
 
-  builder = GNUNET_GTK_get_new_builder ("create_namespace_dialog.glade");
+  builder = GNUNET_GTK_get_new_builder 
("gnunet_fs_gtk_create_namespace_dialog.glade");
   if (builder == NULL)
     {
       GNUNET_break (0);
@@ -62,4 +62,4 @@
 }
 
 
-/* end of main_window_create_pseudonym.c */
+/* end of gnunet-fs-gtk-main_window_create_pseudonym.c */

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_download.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_download.c 2011-08-15 
14:39:21 UTC (rev 16554)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_download.c 2011-08-15 
14:55:37 UTC (rev 16555)
@@ -19,11 +19,11 @@
 */
 
 /**
- * @file src/main_window_file_download.c
+ * @file src/fs/gnunet-fs-gtk-main_window_file_download.c
  * @author Christian Grothoff
  */
-#include "common.h"
-#include "download.h"
+#include "gnunet-fs-gtk-common.h"
+#include "gnunet-fs-gtk-download.h"
 #include "gnunet-fs-gtk.h"
 
 static GtkBuilder *builder;
@@ -68,7 +68,7 @@
   struct DownloadContext *dc;
 
   GNUNET_assert (builder == NULL);
-  builder = GNUNET_GTK_get_new_builder ("open_url_dialog.glade");
+  builder = GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_open_url_dialog.glade");
   if (builder == NULL)
     {
       GNUNET_break (0);
@@ -120,11 +120,11 @@
       dc = GNUNET_malloc (sizeof (struct DownloadContext));
       dc->uri = uri;
       dc->anonymity = anonymity;
-      GNUNET_GTK_open_download_as_dialog (dc);
+      GNUNET_FS_GTK_open_download_as_dialog (dc);
       return;
     }
   GNUNET_break (0);
   GNUNET_FS_uri_destroy (uri);
 }
 
-/* end of main_window_file_download.c */
+/* end of gnunet-fs-gtk-main_window_file_download.c */

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_publish.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_publish.c  2011-08-15 
14:39:21 UTC (rev 16554)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_publish.c  2011-08-15 
14:55:37 UTC (rev 16555)
@@ -19,12 +19,12 @@
 */
 
 /**
- * @file src/main_window_file_publish.c
+ * @file src/fs/gnunet-fs-gtk-main_window_file_publish.c
  * @author Christian Grothoff
  */
-#include "common.h"
+#include "gnunet-fs-gtk-common.h"
 #include "gnunet-fs-gtk.h"
-#include "edit_publish_dialog.h"
+#include "gnunet-fs-gtk-edit_publish_dialog.h"
 #include <gnunet/gnunet_util_lib.h>
 
 #define MARKER_DIR_FILE_SIZE "-"
@@ -1353,7 +1353,7 @@
   int do_index;
   GtkSpinButton *sb;
 
-  builder = GNUNET_GTK_get_new_builder ("publish-file-dialog.glade");
+  builder = GNUNET_GTK_get_new_builder 
("gnunet_fs_gtk_publish_file_dialog.glade");
   if (builder == NULL)
     {
       GNUNET_break (0);
@@ -1421,11 +1421,11 @@
                      4, &priority,
                      5, &fip,
                      -1);
-  GNUNET_GTK_edit_publish_dialog (&do_index,
-                                 &short_fn,
-                                 &anonymity_level,
-                                 &priority,
-                                 fip);
+  GNUNET_FS_GTK_edit_publish_dialog (&do_index,
+                                    &short_fn,
+                                    &anonymity_level,
+                                    &priority,
+                                    fip);
   gtk_tree_store_set (GTK_TREE_STORE (tm),
                      &iter,
                      1, do_index,
@@ -1508,7 +1508,7 @@
   GtkSpinButton *sb;
   struct GNUNET_FS_BlockOptions bo;
 
-  builder = GNUNET_GTK_get_new_builder ("publish-directory-dialog.glade");
+  builder = GNUNET_GTK_get_new_builder 
("gnunet_fs_gtk_publish_directory_dialog.glade");
   if (builder == NULL)
     {
       GNUNET_break (0);
@@ -1841,7 +1841,7 @@
   gchar *namespace_uid;
   
   GNUNET_assert (master_builder == NULL);
-  master_builder = GNUNET_GTK_get_new_builder ("publish_dialog.glade");
+  master_builder = GNUNET_GTK_get_new_builder 
("gnunet_fs_gtk_publish_dialog.glade");
   if (master_builder == NULL)
     return;
   tv = GTK_TREE_VIEW (gtk_builder_get_object (master_builder,
@@ -1930,4 +1930,4 @@
 }
 
 
-/* end of main_window_file_publish.c */
+/* end of gnunet-fs-gtk-main_window_file_publish.c */

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_search.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_search.c   2011-08-15 
14:39:21 UTC (rev 16554)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_search.c   2011-08-15 
14:55:37 UTC (rev 16555)
@@ -19,10 +19,10 @@
 */
 
 /**
- * @file src/main_window_file_search.c
+ * @file src/fs/gnunet-fs-gtk-main_window_file_search.c
  * @author Christian Grothoff
  */
-#include "common.h"
+#include "gnunet-fs-gtk-common.h"
 #include "gnunet-fs-gtk.h"
 
 /**
@@ -207,7 +207,7 @@
   GNUNET_HashCode *nsid;
   
   GNUNET_assert (builder == NULL);
-  builder = GNUNET_GTK_get_new_builder ("search_dialog.glade");
+  builder = GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_search_dialog.glade");
   if (builder == NULL)
     return;
   ad = GTK_WIDGET (gtk_builder_get_object (builder,
@@ -240,4 +240,4 @@
   builder = NULL;
 }
 
-/* end of main_window_file_search.c */
+/* end of gnunet-fs-gtk-main_window_file_search.c */

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_open_directory.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_open_directory.c        
2011-08-15 14:39:21 UTC (rev 16554)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_open_directory.c        
2011-08-15 14:55:37 UTC (rev 16555)
@@ -19,11 +19,11 @@
 */
 
 /**
- * @file src/main_window_open_directory.c
+ * @file src/fs/gnunet-fs-gtk-main_window_open_directory.c
  * @author Christian Grothoff
  */
-#include "common.h"
-#include "fs_event_handler.h"
+#include "gnunet-fs-gtk-common.h"
+#include "gnunet-fs-gtk-event_handler.h"
 
 struct AddChildContext
 {
@@ -115,7 +115,7 @@
   char *filename;
   GtkFileFilter *ff;
 
-  builder = GNUNET_GTK_get_new_builder ("open_directory_dialog.glade");
+  builder = GNUNET_GTK_get_new_builder 
("gnunet_fs_gtk_open_directory_dialog.glade");
   if (builder == NULL)
     {
       GNUNET_break (0);
@@ -144,4 +144,4 @@
   g_free (filename);
 }
 
-/* end of main_window_open_directory.c */
+/* end of gnunet-fs-gtk-main_window_open_directory.c */

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_view_toggles.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_view_toggles.c  2011-08-15 
14:39:21 UTC (rev 16554)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_view_toggles.c  2011-08-15 
14:55:37 UTC (rev 16555)
@@ -19,12 +19,12 @@
 */
 
 /**
- * @file src/main_window_view_toggles.c
+ * @file src/fs/gnunet-fs-gtk-main_window_view_toggles.c
  * @author Christian Grothoff
  *
  * This file contains callbacks for the 'view' menu that toggle views.
  */
-#include "common.h"
+#include "gnunet-fs-gtk-common.h"
 #include "gnunet-fs-gtk.h"
 
 
@@ -87,4 +87,4 @@
 }
 
 
-/* end of main_window_view_toggles.c */
+/* end of gnunet-fs-gtk-main_window_view_toggles.c */

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk.c   2011-08-15 14:39:21 UTC (rev 16554)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk.c   2011-08-15 14:55:37 UTC (rev 16555)
@@ -19,12 +19,12 @@
 */
 
 /**
- * @file src/gnunet-gtk.c
- * @brief Main function of gnunet-gtk
+ * @file src/fs/gnunet-fs-gtk.c
+ * @brief Main function of gnunet-fs-gtk
  * @author Christian Grothoff
  */
-#include "common.h"
-#include "fs_event_handler.h"
+#include "gnunet-fs-gtk-common.h"
+#include "gnunet-fs-gtk-event_handler.h"
 
 /**
  * Should gnunet-gtk start in tray mode?