[GNUnet-SVN] r3576 - GNUnet/src/applications/fs/ecrs gnunet-gtk/src/plugins/fs

[grothoff]

Author: grothoff
Date: 2006-10-29 20:20:28 -0800 (Sun, 29 Oct 2006)
New Revision: 3576

Modified:
   GNUnet/src/applications/fs/ecrs/upload.c
   gnunet-gtk/src/plugins/fs/fs.c
Log:
bugfixes

Modified: GNUnet/src/applications/fs/ecrs/upload.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/upload.c    2006-10-30 04:08:26 UTC (rev 
3575)
+++ GNUnet/src/applications/fs/ecrs/upload.c    2006-10-30 04:20:28 UTC (rev 
3576)
@@ -424,6 +424,8 @@
   FREENONNULL(iblocks[treedepth]);
   FREE(iblocks);
   FREE(dblock);
+  if (upcb != NULL)
+    upcb(filesize, filesize, eta, upcbClosure);
   CLOSE(fd);
   connection_destroy(sock);
   return OK;

Modified: gnunet-gtk/src/plugins/fs/fs.c
===================================================================
--- gnunet-gtk/src/plugins/fs/fs.c      2006-10-30 04:08:26 UTC (rev 3575)
+++ gnunet-gtk/src/plugins/fs/fs.c      2006-10-30 04:20:28 UTC (rev 3576)
@@ -146,22 +146,28 @@
                     event->data.UploadProgress.completed);
     break;
   case FSUI_upload_completed:
+    printf("FSUI: Upload completed\n");
     fs_upload_complete(event->data.UploadCompleted.uc.cctx,
                       event->data.UploadCompleted.uri);
     break;
   case FSUI_upload_error:
+    printf("FSUI: Upload error\n");
     fs_upload_error(event->data.UploadError.uc.cctx);
     break;
   case FSUI_upload_aborted:
+    printf("FSUI: Upload aborted\n");
     fs_upload_error(event->data.UploadAborted.uc.cctx);
     break;
   case FSUI_upload_stopped:
+    printf("FSUI: Upload stopped\n");
     fs_upload_stopped(event->data.UploadStopped.uc.cctx);
     break;
   case FSUI_upload_suspended:
+    printf("FSUI: Upload suspended\n");
     fs_upload_stopped(event->data.UploadSuspended.uc.cctx);
     break;
   case FSUI_upload_started:
+    printf("FSUI: Upload started\n");
     ret = fs_upload_started(event->data.UploadStarted.uc.pos,
                            event->data.UploadStarted.uc.pcctx,
                            event->data.UploadStarted.filename,
@@ -170,6 +176,7 @@
                            0);
     break;
   case FSUI_upload_resumed:
+    printf("FSUI: Upload resumed\n");
     ret = fs_upload_started(event->data.UploadResumed.uc.pos,
                            event->data.UploadResumed.uc.pcctx,
                            event->data.UploadResumed.filename,
@@ -340,8 +347,8 @@
     gtk_tree_store_new(UPLOAD_NUM,
                       G_TYPE_STRING, /* filename */
                       G_TYPE_INT,    /* progress */
-                      G_TYPE_STRING,
-                      G_TYPE_POINTER);  /* URI (as string) - after completion 
*/
+                      G_TYPE_STRING, /* URI as string */
+                      G_TYPE_POINTER);  /* UploadList */
   gtk_tree_view_set_model(uploadList,
                          GTK_TREE_MODEL(upload_summary));
   gtk_tree_selection_set_mode(gtk_tree_view_get_selection(uploadList),