implementing listing of indexed files and unindexing from gnunet-fs-gtk (#1945)

1 files changed, 22 insertions, 18 deletions

diff --git a/src/fs/gnunet-fs-gtk_event-handler.c b/src/fs/gnunet-fs-gtk_event-handler.c
index 49483158..3643d379 100644
--- a/src/fs/gnunet-fs-gtk_event-handler.c
+++ b/src/fs/gnunet-fs-gtk_event-handler.c
@@ -27,7 +27,7 @@
 #include "gnunet-fs-gtk_common.h"
 #include "gnunet-fs-gtk_download-save-as.h"
 #include "gnunet-fs-gtk_event-handler.h"
-
+#include "gnunet-fs-gtk_unindex.h"
 
 /**
  * We have a single tab where we display publishing operations.
@@ -1366,7 +1366,7 @@ GNUNET_FS_GTK_search_result_clear_button_clicked (GtkButton * button, gpointer u
   GtkTreeIter iter;
 
   tm = GTK_TREE_MODEL (tab->ts);
-  if (TRUE != gtk_tree_model_get_iter_first (tm, &iter))
+  if (! gtk_tree_model_get_iter_first (tm, &iter))
     return;
   do
   {    
@@ -1386,11 +1386,11 @@ GNUNET_FS_GTK_search_result_clear_button_clicked (GtkButton * button, gpointer u
          directory; clean it up */
       free_search_result (sr);
       /* the above call clobbered our 'iter', restart from the beginning... */
-      if (TRUE != gtk_tree_model_get_iter_first (tm, &iter))
+      if (! gtk_tree_model_get_iter_first (tm, &iter))
         return;
     }
   }
-  while (TRUE == gtk_tree_model_iter_next (tm, &iter));
+  while (gtk_tree_model_iter_next (tm, &iter));
 }
 
 
@@ -3001,26 +3001,30 @@ GNUNET_GTK_fs_event_handler (void *cls,
     close_search_tab (info->value.search.cctx);
     return NULL;
   case GNUNET_FS_STATUS_UNINDEX_START:
-    GNUNET_break (0);
-    break;
+    return info->value.unindex.cctx;
   case GNUNET_FS_STATUS_UNINDEX_RESUME:
-    GNUNET_break (0);
-    break;
+    return GNUNET_FS_GTK_unindex_handle_resume_ (info->value.unindex.uc,
+                                                 info->value.unindex.filename,
+                                                 info->value.unindex.size,
+                                                 info->value.unindex.completed,
+                                                 info->value.unindex.specifics.resume.message);
   case GNUNET_FS_STATUS_UNINDEX_SUSPEND:
-    GNUNET_break (0);
-    break;
+    GNUNET_FS_GTK_unindex_handle_stop_ (info->value.unindex.cctx);
+    return NULL;
   case GNUNET_FS_STATUS_UNINDEX_PROGRESS:
-    GNUNET_break (0);
-    break;
+    GNUNET_FS_GTK_unindex_handle_progress_ (info->value.unindex.cctx,
+                                            info->value.unindex.completed);
+    return info->value.unindex.cctx;
   case GNUNET_FS_STATUS_UNINDEX_ERROR:
-    GNUNET_break (0);
-    break;
+    GNUNET_FS_GTK_unindex_handle_error_ (info->value.unindex.cctx,
+                                         info->value.unindex.specifics.error.message);
+    return info->value.unindex.cctx;
   case GNUNET_FS_STATUS_UNINDEX_COMPLETED:
-    GNUNET_break (0);
-    break;
+    GNUNET_FS_GTK_unindex_handle_completed_ (info->value.unindex.cctx);
+    return info->value.unindex.cctx;
   case GNUNET_FS_STATUS_UNINDEX_STOPPED:
-    GNUNET_break (0);
-    break;
+    GNUNET_FS_GTK_unindex_handle_stop_ (info->value.unindex.cctx);
+    return NULL;
   default:
     GNUNET_break (0);
     break;