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

[gnunet]

Author: grothoff
Date: 2008-04-24 00:04:28 -0600 (Thu, 24 Apr 2008)
New Revision: 6748

Modified:
   gnunet-qt/src/plugins/fs/downloadController.cc
   gnunet-qt/src/plugins/fs/searchController.cc
   gnunet-qt/src/plugins/fs/uploadController.cc
Log:
update to latest ECRS/FSUI APIs in HEAD

Modified: gnunet-qt/src/plugins/fs/downloadController.cc
===================================================================
--- gnunet-qt/src/plugins/fs/downloadController.cc      2008-04-24 06:02:15 UTC 
(rev 6747)
+++ gnunet-qt/src/plugins/fs/downloadController.cc      2008-04-24 06:04:28 UTC 
(rev 6748)
@@ -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-04-24 06:02:15 UTC 
(rev 6747)
+++ gnunet-qt/src/plugins/fs/searchController.cc        2008-04-24 06:04:28 UTC 
(rev 6748)
@@ -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-04-24 06:02:15 UTC 
(rev 6747)
+++ gnunet-qt/src/plugins/fs/uploadController.cc        2008-04-24 06:04:28 UTC 
(rev 6748)
@@ -33,7 +33,8 @@
 #include <GNUnet/gnunet_ecrs_lib.h>
 #include "uploadController.h"
 
-static int getKeyword(const char *data, void *list)
+static int getKeyword(const char *data, int,
+                     void *list)
 {
   ((QStringList *) list)->append(QString::fromUtf8(data));
   
@@ -178,7 +179,8 @@
       idx--;
     }
     
-    keywordURI = GNUNET_ECRS_keyword_strings_to_uri((const char **) keys);
+    keywordURI = GNUNET_ECRS_keyword_command_line_to_uri(NULL, 
keywords.count(),
+                                                        (const char **) keys);
     
     // upload
     handle = GNUNET_FSUI_upload_start(fs->context(), strPath.toLocal8Bit(),