[GNUnet-SVN] r6825 - gnunet-qt/src/plugins/fs

[gnunet]

Author: durner
Date: 2008-05-14 13:26:21 -0600 (Wed, 14 May 2008)
New Revision: 6825

Modified:
   gnunet-qt/src/plugins/fs/downloadController.cc
   gnunet-qt/src/plugins/fs/searchController.cc
   gnunet-qt/src/plugins/fs/uploadController.cc
Log:
undo r6824

Modified: gnunet-qt/src/plugins/fs/downloadController.cc
===================================================================
--- gnunet-qt/src/plugins/fs/downloadController.cc      2008-05-14 18:03:56 UTC 
(rev 6824)
+++ gnunet-qt/src/plugins/fs/downloadController.cc      2008-05-14 19:26:21 UTC 
(rev 6825)
@@ -258,7 +258,7 @@
       QStandardItem *item;
       
       item = downloadModel.item(idx.row());
-      GNUNET_FSUI_download_stop(fs->context(), (struct 
GNUNET_FSUI_DownloadList *)
+      GNUNET_FSUI_download_stop((struct GNUNET_FSUI_DownloadList *)
         item->data(Qt::UserRole).value<void *>());      
     }
     else
@@ -268,8 +268,8 @@
 
 void GFSDownloadController::cancel(struct GNUNET_FSUI_DownloadList *handle)
 {
-  GNUNET_FSUI_download_abort(fs->context(), handle);
-  GNUNET_FSUI_download_stop(fs->context(), handle);
+  GNUNET_FSUI_download_abort(handle);
+  GNUNET_FSUI_download_stop(handle);
 }
 
 QAbstractItemModel *GFSDownloadController::model()

Modified: gnunet-qt/src/plugins/fs/searchController.cc
===================================================================
--- gnunet-qt/src/plugins/fs/searchController.cc        2008-05-14 18:03:56 UTC 
(rev 6824)
+++ gnunet-qt/src/plugins/fs/searchController.cc        2008-05-14 19:26:21 UTC 
(rev 6825)
@@ -233,8 +233,8 @@
 {
   GNUNET_FSUI_SearchList *list = searches[uri];
 
-  GNUNET_FSUI_search_abort(fs->context(), list);
-  GNUNET_FSUI_search_stop(fs->context(), list);
+  GNUNET_FSUI_search_abort(list);
+  GNUNET_FSUI_search_stop(list);
 }
 
 void GFSSearchController::download(QStandardItemModel *model, GFSEcrsUri &uri,

Modified: gnunet-qt/src/plugins/fs/uploadController.cc
===================================================================
--- gnunet-qt/src/plugins/fs/uploadController.cc        2008-05-14 18:03:56 UTC 
(rev 6824)
+++ gnunet-qt/src/plugins/fs/uploadController.cc        2008-05-14 19:26:21 UTC 
(rev 6825)
@@ -33,7 +33,7 @@
 #include <GNUnet/gnunet_ecrs_lib.h>
 #include "uploadController.h"
 
-static int getKeyword(const char *data,
+static int getKeyword(const char *data, int,
                      void *list)
 {
   ((QStringList *) list)->append(QString::fromUtf8(data));