aboutsummaryrefslogtreecommitdiffstats
path: root/gtk/file_dlg.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2005-02-05 12:50:47 +0000
committerGuy Harris <guy@alum.mit.edu>2005-02-05 12:50:47 +0000
commitfa3e5609abf9c87862207239177e62f491476027 (patch)
tree4c0708acb2b9e723f33135ba031b4809171c48d9 /gtk/file_dlg.c
parent3e07757e58905e8451b57b5a8b642f80f0049643 (diff)
Put "cf_status_t" back.
svn path=/trunk/; revision=13303
Diffstat (limited to 'gtk/file_dlg.c')
-rw-r--r--gtk/file_dlg.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c
index 8f35fd916f..53b1295990 100644
--- a/gtk/file_dlg.c
+++ b/gtk/file_dlg.c
@@ -715,14 +715,14 @@ file_open_ok_cb(GtkWidget *w, gpointer fs) {
switch (cf_read(&cfile)) {
- case CF_OK:
- case CF_ERROR:
+ case CF_READ_OK:
+ case CF_READ_ERROR:
/* Just because we got an error, that doesn't mean we were unable
to read any of the file; we handle what we could get from the
file. */
break;
- case CF_ABORTED:
+ case CF_READ_ABORTED:
/* The user bailed out of re-reading the capture file; the
capture file has been closed - just free the capture file name
string and return (without changing the last containing
@@ -1086,14 +1086,14 @@ file_merge_ok_cb(GtkWidget *w, gpointer fs) {
switch (cf_read(&cfile)) {
- case CF_OK:
- case CF_ERROR:
+ case CF_READ_OK:
+ case CF_READ_ERROR:
/* Just because we got an error, that doesn't mean we were unable
to read any of the file; we handle what we could get from the
file. */
break;
- case CF_ABORTED:
+ case CF_READ_ABORTED:
/* The user bailed out of re-reading the capture file; the
capture file has been closed - just free the capture file name
string and return (without changing the last containing