[GNUnet-SVN] r19497 - gnunet-gtk/src/fs

[gnunet]

Author: grothoff
Date: 2012-01-28 15:39:01 +0100 (Sat, 28 Jan 2012)
New Revision: 19497

Modified:
   gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_publish.c
Log:
-renaming symbols to match naming conventions

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_publish.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_publish.c  2012-01-28 
14:38:41 UTC (rev 19496)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_publish.c  2012-01-28 
14:39:01 UTC (rev 19497)
@@ -1049,7 +1049,7 @@
   gtk_progress_bar_pulse (adcc->progress_dialog_bar);
   switch (reason)
   {
-    case GNUNET_DIR_SCANNER_NEW_FILE:
+    case GNUNET_FS_DIRSCANNER_NEW_FILE:
       if (filename != NULL)
       {
         if (is_directory)
@@ -1060,7 +1060,7 @@
         GNUNET_free (s);
       }
       break;
-    case GNUNET_DIR_SCANNER_DOES_NOT_EXIST:
+    case GNUNET_FS_DIRSCANNER_DOES_NOT_EXIST:
       if (filename != NULL)
       {
         GNUNET_asprintf (&s,
@@ -1071,7 +1071,7 @@
         GNUNET_free (s);
       }
       break;
-    case GNUNET_DIR_SCANNER_ASKED_TO_STOP:
+    case GNUNET_FS_DIRSCANNER_ASKED_TO_STOP:
       if (filename != NULL)
       {
         GNUNET_asprintf (&s,
@@ -1083,13 +1083,13 @@
       else
         insert_progress_dialog_text (adcc, _("Scanner is stopping.\n"));
       break;
-    case GNUNET_DIR_SCANNER_SHUTDOWN:
+    case GNUNET_FS_DIRSCANNER_SHUTDOWN:
       insert_progress_dialog_text (adcc, _("Client is shutting down.\n"));
       break;
-    case GNUNET_DIR_SCANNER_FINISHED:
+    case GNUNET_FS_DIRSCANNER_FINISHED:
       insert_progress_dialog_text (adcc, _("Scanner has finished.\n"));
       break;
-    case GNUNET_DIR_SCANNER_PROTOCOL_ERROR:
+    case GNUNET_FS_DIRSCANNER_PROTOCOL_ERROR:
       insert_progress_dialog_text (adcc,
           _("There was a failure communicating with the scanner.\n"));
       adcc->keep = 1;
@@ -1102,9 +1102,9 @@
       adcc->keep = 1;
       break;
   }
-  if ((filename == NULL && GNUNET_DIR_SCANNER_FINISHED)
-      || reason == GNUNET_DIR_SCANNER_PROTOCOL_ERROR
-      || reason == GNUNET_DIR_SCANNER_SHUTDOWN)
+  if ((filename == NULL && GNUNET_FS_DIRSCANNER_FINISHED)
+      || reason == GNUNET_FS_DIRSCANNER_PROTOCOL_ERROR
+      || reason == GNUNET_FS_DIRSCANNER_SHUTDOWN)
   {
     /* Any of this causes us to try to clean up the scanner */
     adcc->directory_scan_intermediary_result = 
GNUNET_FS_directory_scan_cleanup (ds);