1 files changed, 7 insertions, 8 deletions

diff --git a/src/fs/gnunet-fs-gtk-event_handler.c b/src/fs/gnunet-fs-gtk-event_handler.c
index 05463f34..3b53fca5 100644
--- a/src/fs/gnunet-fs-gtk-event_handler.c
+++ b/src/fs/gnunet-fs-gtk-event_handler.c
@@ -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 @@ start_download (GtkTreeView *tree_view,
   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 @@ setup_search (struct GNUNET_FS_SearchContext *sc,
       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 @@ setup_publish (struct GNUNET_FS_PublishContext *pc,
       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 @@ GNUNET_GTK_main_window_notebook_switch_page_cb (GtkWidget * dummy,
 
 
 
-/* end of fs_event_handler.c */
+/* end of gnunet-fs-gtk-event_handler.c */