fixing compile errors

1 files changed, 13 insertions, 46 deletions

diff --git a/src/plugins/fs/search.h b/src/plugins/fs/search.h
index c161fb35..5b72aafd 100644
--- a/src/plugins/fs/search.h
+++ b/src/plugins/fs/search.h
@@ -29,33 +29,17 @@
 
 #include <GNUnet/gnunet_ecrs_lib.h>
 #include <GNUnet/gnunet_fsui_lib.h>
+#include "fs.h"
 
-struct SL;
-
-struct DL;
-
-struct DL *
-fs_download_started(struct FSUI_DownloadList * fsui_dl,
-                    struct DL * dl_parent,
-                    struct SL * sl_parent,
-                    unsigned long long total,
-                    unsigned int anonymityLevel,
-                    const ECRS_FileInfo * fi,
-                    const char * filename,
-                    unsigned long long completed,
-                    cron_t eta);
-
-void fs_download_update(struct DL * downloadContext,
-                        unsigned long long completed,
-                        const char * data,
-                        unsigned int size);
-
-void fs_download_completed(struct DL * downloadContext);
-
-void fs_download_aborted(struct DL * downloadContext);
-
-void fs_download_stopped(struct DL * downloadContext);
 
+/**
+ * Add the given search result to the search
+ * tree at the specified position.
+ */
+void addEntryToSearchTree(SearchList * searchContext,
+                          DownloadList * downloadParent,
+                          const ECRS_FileInfo * info,
+                          GtkTreeIter * iter);
 
 /**
  * Add the given result to the model (search result
@@ -65,7 +49,7 @@ void fs_download_stopped(struct DL * downloadContext);
  * @param path the tree path that selects where to add
  *        the information, NULL for top-level
  */
-void fs_search_result_received(struct SL * searchContext,
+void fs_search_result_received(SearchList * searchContext,
                                const ECRS_FileInfo * info,
                                const struct ECRS_URI * uri);
 
@@ -74,7 +58,7 @@ void fs_search_result_received(struct SL * searchContext,
  *
  * @return internal search context
  */
-struct SL * 
+SearchList * 
 fs_search_started(struct FSUI_SearchList * list,
                   const struct ECRS_URI * uri,
                   unsigned int anonymityLevel,
@@ -84,28 +68,11 @@ fs_search_started(struct FSUI_SearchList * list,
 /**
  * A search process has been aborted.  Update display.
  */
-void fs_search_aborted(struct SL * searchContext);
+void fs_search_aborted(SearchList * searchContext);
 
 /**
  * A search process has stopped.  Clean up.
  */
-void fs_search_stopped(struct SL * searchContext);
-
-
-/**
- * Initialize the search module.
- */
-void fs_search_start(struct GE_Context * e,
-                     struct GC_Configuration * c);
-
-/**
- * Shutdown the search module.
- */
-void fs_search_stop(void);
-
-
-void on_closeSearchButton_clicked_fs(GtkWidget * searchPage,
-                                     GtkWidget * closeButton);
-
+void fs_search_stopped(SearchList * searchContext);
 
 #endif