aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2012-01-28 14:39:01 +0000
committerChristian Grothoff <christian@grothoff.org>2012-01-28 14:39:01 +0000
commit7c94d86e4f8673975a53d6b7255308e217d9970c (patch)
tree4f553487cd22f6371a1d5cf96a1306c8cacb62f9
parent44168e4df343175cce4d30862ad74fea465c0c0d (diff)
downloadgnunet-gtk-7c94d86e4f8673975a53d6b7255308e217d9970c.tar.gz
gnunet-gtk-7c94d86e4f8673975a53d6b7255308e217d9970c.zip
-renaming symbols to match naming conventions
-rw-r--r--src/fs/gnunet-fs-gtk-main_window_file_publish.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/fs/gnunet-fs-gtk-main_window_file_publish.c b/src/fs/gnunet-fs-gtk-main_window_file_publish.c
index 8b900699..f4e93fe1 100644
--- a/src/fs/gnunet-fs-gtk-main_window_file_publish.c
+++ b/src/fs/gnunet-fs-gtk-main_window_file_publish.c
@@ -1049,7 +1049,7 @@ directory_scan_cb (void *cls, struct GNUNET_FS_DirScanner *ds,
1049 gtk_progress_bar_pulse (adcc->progress_dialog_bar); 1049 gtk_progress_bar_pulse (adcc->progress_dialog_bar);
1050 switch (reason) 1050 switch (reason)
1051 { 1051 {
1052 case GNUNET_DIR_SCANNER_NEW_FILE: 1052 case GNUNET_FS_DIRSCANNER_NEW_FILE:
1053 if (filename != NULL) 1053 if (filename != NULL)
1054 { 1054 {
1055 if (is_directory) 1055 if (is_directory)
@@ -1060,7 +1060,7 @@ directory_scan_cb (void *cls, struct GNUNET_FS_DirScanner *ds,
1060 GNUNET_free (s); 1060 GNUNET_free (s);
1061 } 1061 }
1062 break; 1062 break;
1063 case GNUNET_DIR_SCANNER_DOES_NOT_EXIST: 1063 case GNUNET_FS_DIRSCANNER_DOES_NOT_EXIST:
1064 if (filename != NULL) 1064 if (filename != NULL)
1065 { 1065 {
1066 GNUNET_asprintf (&s, 1066 GNUNET_asprintf (&s,
@@ -1071,7 +1071,7 @@ directory_scan_cb (void *cls, struct GNUNET_FS_DirScanner *ds,
1071 GNUNET_free (s); 1071 GNUNET_free (s);
1072 } 1072 }
1073 break; 1073 break;
1074 case GNUNET_DIR_SCANNER_ASKED_TO_STOP: 1074 case GNUNET_FS_DIRSCANNER_ASKED_TO_STOP:
1075 if (filename != NULL) 1075 if (filename != NULL)
1076 { 1076 {
1077 GNUNET_asprintf (&s, 1077 GNUNET_asprintf (&s,
@@ -1083,13 +1083,13 @@ directory_scan_cb (void *cls, struct GNUNET_FS_DirScanner *ds,
1083 else 1083 else
1084 insert_progress_dialog_text (adcc, _("Scanner is stopping.\n")); 1084 insert_progress_dialog_text (adcc, _("Scanner is stopping.\n"));
1085 break; 1085 break;
1086 case GNUNET_DIR_SCANNER_SHUTDOWN: 1086 case GNUNET_FS_DIRSCANNER_SHUTDOWN:
1087 insert_progress_dialog_text (adcc, _("Client is shutting down.\n")); 1087 insert_progress_dialog_text (adcc, _("Client is shutting down.\n"));
1088 break; 1088 break;
1089 case GNUNET_DIR_SCANNER_FINISHED: 1089 case GNUNET_FS_DIRSCANNER_FINISHED:
1090 insert_progress_dialog_text (adcc, _("Scanner has finished.\n")); 1090 insert_progress_dialog_text (adcc, _("Scanner has finished.\n"));
1091 break; 1091 break;
1092 case GNUNET_DIR_SCANNER_PROTOCOL_ERROR: 1092 case GNUNET_FS_DIRSCANNER_PROTOCOL_ERROR:
1093 insert_progress_dialog_text (adcc, 1093 insert_progress_dialog_text (adcc,
1094 _("There was a failure communicating with the scanner.\n")); 1094 _("There was a failure communicating with the scanner.\n"));
1095 adcc->keep = 1; 1095 adcc->keep = 1;
@@ -1102,9 +1102,9 @@ directory_scan_cb (void *cls, struct GNUNET_FS_DirScanner *ds,
1102 adcc->keep = 1; 1102 adcc->keep = 1;
1103 break; 1103 break;
1104 } 1104 }
1105 if ((filename == NULL && GNUNET_DIR_SCANNER_FINISHED) 1105 if ((filename == NULL && GNUNET_FS_DIRSCANNER_FINISHED)
1106 || reason == GNUNET_DIR_SCANNER_PROTOCOL_ERROR 1106 || reason == GNUNET_FS_DIRSCANNER_PROTOCOL_ERROR
1107 || reason == GNUNET_DIR_SCANNER_SHUTDOWN) 1107 || reason == GNUNET_FS_DIRSCANNER_SHUTDOWN)
1108 { 1108 {
1109 /* Any of this causes us to try to clean up the scanner */ 1109 /* Any of this causes us to try to clean up the scanner */
1110 adcc->directory_scan_intermediary_result = GNUNET_FS_directory_scan_cleanup (ds); 1110 adcc->directory_scan_intermediary_result = GNUNET_FS_directory_scan_cleanup (ds);