1 files changed, 26 insertions, 20 deletions

diff --git a/src/plugins/fs/search.h b/src/plugins/fs/search.h
index ac0df7ee..f3678982 100644
--- a/src/plugins/fs/search.h
+++ b/src/plugins/fs/search.h
@@ -30,24 +30,29 @@
 #include <GNUnet/gnunet_ecrs_lib.h>
 #include <GNUnet/gnunet_fsui_lib.h>
 
-void * fs_download_started(void * downloadContext,
-                           unsigned long long total,
-                           unsigned int anonymityLevel,
-                           const struct ECRS_URI * uri,
-                           const char * filename,
-                           unsigned long long completed,
-                           cron_t eta);
-
-void fs_download_update(void * downloadContext,
+struct SL;
+
+struct DL;
+
+struct DL *
+fs_download_started(struct FSUI_DownloadList * fsui_dl,
+                    unsigned long long total,
+                    unsigned int anonymityLevel,
+                    const struct 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(void * downloadContext);
+void fs_download_completed(struct DL * downloadContext);
 
-void fs_download_aborted(void * downloadContext);
+void fs_download_aborted(struct DL * downloadContext);
 
-void fs_download_stopped(void * downloadContext);
+void fs_download_stopped(struct DL * downloadContext);
 
 
 /**
@@ -58,7 +63,7 @@ void fs_download_stopped(void * downloadContext);
  * @param path the tree path that selects where to add
  *        the information, NULL for top-level
  */
-void fs_search_result_received(void * searchContext,
+void fs_search_result_received(struct SL * searchContext,
                                const ECRS_FileInfo * info,
                                const struct ECRS_URI * uri);
 
@@ -67,21 +72,22 @@ void fs_search_result_received(void * searchContext,
  *
  * @return internal search context
  */
-void * fs_search_started(struct FSUI_SearchList * list,
-                         const struct ECRS_URI * uri,
-                         unsigned int anonymityLevel,
-                         unsigned int resultCount,
-                         const ECRS_FileInfo * results);
+struct SL * 
+fs_search_started(struct FSUI_SearchList * list,
+                  const struct ECRS_URI * uri,
+                  unsigned int anonymityLevel,
+                  unsigned int resultCount,
+                  const ECRS_FileInfo * results);
 
 /**
  * A search process has been aborted.  Update display.
  */
-void fs_search_aborted(void * searchContext);
+void fs_search_aborted(struct SL * searchContext);
 
 /**
  * A search process has stopped.  Clean up.
  */
-void fs_search_stopped(void * searchContext);
+void fs_search_stopped(struct SL * searchContext);
 
 
 /**