diff options
| -rw-r--r-- | capture.c | 18 | ||||
| -rw-r--r-- | file.c | 38 | ||||
| -rw-r--r-- | gtk/capture_dlg.c | 10 | ||||
| -rw-r--r-- | gtk/color_dlg.c | 12 | ||||
| -rw-r--r-- | gtk/color_filters.c | 18 | ||||
| -rw-r--r-- | gtk/dfilter_expr_dlg.c | 10 | ||||
| -rw-r--r-- | gtk/file_dlg.c | 4 | ||||
| -rw-r--r-- | gtk/filter_prefs.c | 4 | ||||
| -rw-r--r-- | gtk/find_dlg.c | 20 | ||||
| -rw-r--r-- | gtk/follow_dlg.c | 18 | ||||
| -rw-r--r-- | gtk/goto_dlg.c | 4 | ||||
| -rw-r--r-- | gtk/gui_prefs.c | 10 | ||||
| -rw-r--r-- | gtk/help_dlg.c | 4 | ||||
| -rw-r--r-- | gtk/main.c | 14 | ||||
| -rw-r--r-- | gtk/print_dlg.c | 12 | ||||
| -rw-r--r-- | gtk/rtp_analysis.c | 24 | ||||
| -rw-r--r-- | gtk/rtp_stream.c | 10 | ||||
| -rw-r--r-- | gtk/simple_dialog.c | 4 | ||||
| -rw-r--r-- | gtk/tcp_graph.c | 4 | ||||
| -rw-r--r-- | proto_hier_stats.c | 4 | ||||
| -rw-r--r-- | simple_dialog.h | 4 |
21 files changed, 123 insertions, 123 deletions
@@ -1,7 +1,7 @@ /* capture.c * Routines for packet capture windows * - * $Id: capture.c,v 1.229 2004/01/31 01:32:51 guy Exp $ + * $Id: capture.c,v 1.230 2004/01/31 02:25:43 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -315,14 +315,14 @@ do_capture(const char *save_file) } if (cfile.save_file_fd == -1) { if (is_tempfile) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, "The temporary file to which the capture would be saved (\"%s\")" "could not be opened: %s.", capfile_name, strerror(errno)); } else { if (capture_opts.ringbuffer_on) { ringbuf_error_cleanup(); } - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, file_open_error_message(errno, TRUE), capfile_name); } g_free(capfile_name); @@ -413,7 +413,7 @@ do_capture(const char *save_file) unlink(cfile.save_file); g_free(cfile.save_file); cfile.save_file = NULL; - simple_dialog(ESD_TYPE_CRIT, NULL, "Couldn't create sync pipe: %s", + simple_dialog(ESD_TYPE_ERROR, NULL, "Couldn't create sync pipe: %s", strerror(error)); return FALSE; } @@ -449,7 +449,7 @@ do_capture(const char *save_file) unlink(cfile.save_file); g_free(cfile.save_file); cfile.save_file = NULL; - simple_dialog(ESD_TYPE_CRIT, NULL, "Couldn't create sync pipe: %s", + simple_dialog(ESD_TYPE_ERROR, NULL, "Couldn't create sync pipe: %s", strerror(error)); return FALSE; } @@ -513,7 +513,7 @@ do_capture(const char *save_file) unlink(cfile.save_file); g_free(cfile.save_file); cfile.save_file = NULL; - simple_dialog(ESD_TYPE_CRIT, NULL, "Couldn't create child process: %s", + simple_dialog(ESD_TYPE_ERROR, NULL, "Couldn't create child process: %s", strerror(error)); return FALSE; } @@ -577,7 +577,7 @@ do_capture(const char *save_file) "Capture child process failed: EOF reading its error message."); wait_for_child(FALSE); } else - simple_dialog(ESD_TYPE_CRIT, NULL, msg); + simple_dialog(ESD_TYPE_ERROR, NULL, msg); g_free(msg); } @@ -797,7 +797,7 @@ cap_pipe_input_cb(gint source, gpointer user_data) msglen -= chars_to_copy; } *r = '\0'; - simple_dialog(ESD_TYPE_CRIT, NULL, msg); + simple_dialog(ESD_TYPE_ERROR, NULL, msg); g_free(msg); break; default : @@ -2023,7 +2023,7 @@ popup_errmsg(const char *errmsg) send_errmsg_to_parent(errmsg); } else { /* Display the dialog box ourselves; there's no parent. */ - simple_dialog(ESD_TYPE_CRIT, NULL, "%s", errmsg); + simple_dialog(ESD_TYPE_ERROR, NULL, "%s", errmsg); } } @@ -1,7 +1,7 @@ /* file.c * File I/O routines * - * $Id: file.c,v 1.351 2004/01/26 06:43:00 ulfl Exp $ + * $Id: file.c,v 1.352 2004/01/31 02:25:43 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -213,7 +213,7 @@ cf_open(char *fname, gboolean is_tempfile, capture_file *cf) return (0); fail: - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, cf_open_error_message(err, err_info, FALSE, 0), fname); return (err); } @@ -506,7 +506,7 @@ cf_read(capture_file *cf) break; } snprintf(err_str, sizeof err_str, errmsg); - simple_dialog(ESD_TYPE_CRIT, NULL, err_str); + simple_dialog(ESD_TYPE_ERROR, NULL, err_str); return (READ_ERROR); } else return (READ_SUCCESS); @@ -960,7 +960,7 @@ filter_packets(capture_file *cf, gchar *dftext) dftext = g_strdup(dftext); if (!dfilter_compile(dftext, &dfcode)) { /* The attempt failed; report an error. */ - simple_dialog(ESD_TYPE_CRIT, NULL, dfilter_error_msg); + simple_dialog(ESD_TYPE_ERROR, NULL, dfilter_error_msg); g_free(dftext); return 0; } @@ -1165,7 +1165,7 @@ rescan_packets(capture_file *cf, const char *action, const char *action_item, if (!wtap_seek_read (cf->wth, fdata->file_off, &cf->pseudo_header, cf->pd, fdata->cap_len, &err, &err_info)) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, cf_read_error_message(err, err_info), cf->filename); break; } @@ -1377,7 +1377,7 @@ process_specified_packets(capture_file *cf, packet_range_t *range, if (!wtap_seek_read(cf->wth, fdata->file_off, &pseudo_header, pd, fdata->cap_len, &err, &err_info)) { /* Attempt to get the packet failed. */ - simple_dialog(ESD_TYPE_CRIT, NULL, cf_read_error_message(err, err_info), + simple_dialog(ESD_TYPE_ERROR, NULL, cf_read_error_message(err, err_info), cf->filename); ret = PSP_FAILED; break; @@ -2237,7 +2237,7 @@ find_packet(capture_file *cf, cf->pd, fdata->cap_len, &err, &err_info)) { /* Read error. Report the error, and go back to the frame where we started. */ - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, cf_read_error_message(err, err_info), cf->filename); new_fd = start_fd; break; @@ -2286,14 +2286,14 @@ goto_frame(capture_file *cf, guint fnumber) if (fdata == NULL) { /* we didn't find a packet with that packet number */ - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, "There is no packet with that packet number."); return FALSE; /* we failed to go to that packet */ } if (!fdata->flags.passed_dfilter) { /* that packet currently isn't displayed */ /* XXX - add it to the set of displayed packets? */ - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, "That packet is not currently being displayed."); return FALSE; /* we failed to go to that packet */ } @@ -2408,7 +2408,7 @@ select_packet(capture_file *cf, int row) /* Get the data in that frame. */ if (!wtap_seek_read (cf->wth, fdata->file_off, &cf->pseudo_header, cf->pd, fdata->cap_len, &err, &err_info)) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, cf_read_error_message(err, err_info), cf->filename); return; } @@ -2516,7 +2516,7 @@ save_packet(capture_file *cf _U_, frame_data *fdata, /* and save the packet */ if (!wtap_dump(args->pdh, &hdr, pseudo_header, pd, &err)) { - simple_dialog(ESD_TYPE_CRIT, NULL, cf_write_error_message(err), + simple_dialog(ESD_TYPE_ERROR, NULL, cf_write_error_message(err), args->fname); return FALSE; } @@ -2554,7 +2554,7 @@ cf_save(char *fname, capture_file *cf, packet_range_t *range, guint save_format) stat(cf->filename, &infile); stat(fname, &outfile); if (infile.st_ino == outfile.st_ino) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, "Can't save over current capture file: %s!", cf->filename); goto fail; @@ -2594,7 +2594,7 @@ cf_save(char *fname, capture_file *cf, packet_range_t *range, guint save_format) be if we didn't have permission to remove the file from the temporary directory, and that might be fixable - but is it worth requiring the user to go off and fix it?) */ - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, file_rename_error_message(errno), fname); goto fail; } @@ -2621,7 +2621,7 @@ cf_save(char *fname, capture_file *cf, packet_range_t *range, guint save_format) we have to do it by writing the packets out in Wiretap. */ pdh = wtap_dump_open(fname, save_format, cf->lnk_t, cf->snap, &err); if (pdh == NULL) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, cf_open_error_message(err, NULL, TRUE, save_format), fname); goto fail; } @@ -2937,7 +2937,7 @@ copy_binary_file(char *from_filename, char *to_filename) from_fd = open(from_filename, O_RDONLY | O_BINARY); if (from_fd < 0) { err = errno; - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, file_open_error_message(err, TRUE), from_filename); goto done; } @@ -2950,7 +2950,7 @@ copy_binary_file(char *from_filename, char *to_filename) to_fd = open(to_filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0644); if (to_fd < 0) { err = errno; - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, file_open_error_message(err, TRUE), to_filename); close(from_fd); goto done; @@ -2963,7 +2963,7 @@ copy_binary_file(char *from_filename, char *to_filename) err = errno; else err = WTAP_ERR_SHORT_WRITE; - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, file_write_error_message(err), to_filename); close(from_fd); close(to_fd); @@ -2972,7 +2972,7 @@ copy_binary_file(char *from_filename, char *to_filename) } if (nread < 0) { err = errno; - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, "An error occurred while reading from the file \"%s\": %s.", from_filename, strerror(err)); close(from_fd); @@ -2982,7 +2982,7 @@ copy_binary_file(char *from_filename, char *to_filename) close(from_fd); if (close(to_fd) < 0) { err = errno; - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, file_write_error_message(err), to_filename); goto done; } diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c index 20efc68a60..241b84ba61 100644 --- a/gtk/capture_dlg.c +++ b/gtk/capture_dlg.c @@ -1,7 +1,7 @@ /* capture_dlg.c * Routines for packet capture windows * - * $Id: capture_dlg.c,v 1.98 2004/01/29 23:11:37 ulfl Exp $ + * $Id: capture_dlg.c,v 1.99 2004/01/31 02:25:43 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -302,7 +302,7 @@ capture_prep(void) #ifdef _WIN32 /* Is WPcap loaded? */ if (!has_wpcap) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, "Unable to load WinPcap (wpcap.dll); Ethereal will not be able\n" "to capture packets.\n\n" "In order to capture packets, WinPcap must be installed; see\n" @@ -956,7 +956,7 @@ capture_prep_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) { if_text = g_strstrip(entry_text); if_name = get_if_name(if_text); if (*if_name == '\0') { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, "You didn't specify an interface on which to capture packets."); g_free(entry_text); return; @@ -1048,11 +1048,11 @@ capture_prep_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) { !(capture_opts.sync_mode); if (capture_opts.ringbuffer_on) { if (save_file == NULL) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, "You must specify a save file if you want to use the ring buffer."); return; } else if (!capture_opts.has_autostop_filesize) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, "You must specify a file size at which to rotate the capture files\n" "if you want to use the ring buffer."); g_free(save_file); diff --git a/gtk/color_dlg.c b/gtk/color_dlg.c index f5df18d6a6..5fe875a61b 100644 --- a/gtk/color_dlg.c +++ b/gtk/color_dlg.c @@ -1,7 +1,7 @@ /* color_dlg.c * Definitions for dialog boxes for color filters * - * $Id: color_dlg.c,v 1.36 2004/01/25 13:47:08 ulfl Exp $ + * $Id: color_dlg.c,v 1.37 2004/01/31 02:25:44 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1084,7 +1084,7 @@ static void color_save_cb(GtkButton *button _U_, gpointer user_data _U_) { if (!write_filters()) - simple_dialog(ESD_TYPE_CRIT, NULL, "Could not open filter file: %s", + simple_dialog(ESD_TYPE_ERROR, NULL, "Could not open filter file: %s", strerror(errno)); } @@ -1103,7 +1103,7 @@ color_clear_cb(GtkWidget *widget, gpointer user_data _U_) } if (!revert_filters()) - simple_dialog(ESD_TYPE_CRIT, NULL, "Could not delete filter file: %s", + simple_dialog(ESD_TYPE_ERROR, NULL, "Could not delete filter file: %s", strerror(errno)); /* colorize list */ @@ -1462,7 +1462,7 @@ edit_color_filter_ok_cb (GtkButton *button, filter_text = g_strdup(gtk_entry_get_text(GTK_ENTRY(filt_text_entry))); if(strchr(filter_name,'@') || strchr(filter_text,'@')){ - simple_dialog(ESD_TYPE_CRIT, NULL, "Filter names and strings must not" + simple_dialog(ESD_TYPE_ERROR, NULL, "Filter names and strings must not" " use the '@' character. Filter unchanged."); g_free(filter_name); g_free(filter_text); @@ -1470,7 +1470,7 @@ edit_color_filter_ok_cb (GtkButton *button, } if(!dfilter_compile(filter_text, &compiled_filter)) { - simple_dialog(ESD_TYPE_CRIT, NULL, "Filter \"%s\" did not compile correctly.\n" + simple_dialog(ESD_TYPE_ERROR, NULL, "Filter \"%s\" did not compile correctly.\n" " Please try again. Filter unchanged.\n%s\n", filter_name, dfilter_error_msg); } else { @@ -1662,7 +1662,7 @@ color_sel_ok_cb (GtkButton *button _U_, #endif if ( ! get_color(&new_color) ){ - simple_dialog(ESD_TYPE_CRIT, NULL, "Could not allocate color. Try again."); + simple_dialog(ESD_TYPE_ERROR, NULL, "Could not allocate color. Try again."); } else { /* Find the "Edit color filter" dialog box with which this is associated. */ diff --git a/gtk/color_filters.c b/gtk/color_filters.c index 0dbd0a4981..f65c23ed56 100644 --- a/gtk/color_filters.c +++ b/gtk/color_filters.c @@ -1,7 +1,7 @@ /* color_filters.c * Routines for color filters * - * $Id: color_filters.c,v 1.5 2004/01/09 20:20:42 obiot Exp $ + * $Id: color_filters.c,v 1.6 2004/01/31 02:25:44 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -180,14 +180,14 @@ read_filters_file(FILE *f, gpointer arg) /* we got a filter */ if (!dfilter_compile(filter_exp, &temp_dfilter)) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, "Could not compile color filter %s from saved filters.\n%s", name, dfilter_error_msg); continue; } if (!get_color(&fg_color)) { /* oops */ - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, "Could not allocate foreground color " "specified in input file for %s.", name); dfilter_free(temp_dfilter); @@ -195,7 +195,7 @@ read_filters_file(FILE *f, gpointer arg) } if (!get_color(&bg_color)) { /* oops */ - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, "Could not allocate background color " "specified in input file for %s.", name); dfilter_free(temp_dfilter); @@ -238,7 +238,7 @@ read_filters(void) path = get_persconffile_path("colorfilters", FALSE); if ((f = fopen(path, "r")) == NULL) { if (errno != ENOENT) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, "Could not open filter file\n\"%s\": %s.", path, strerror(errno)); } @@ -265,7 +265,7 @@ read_global_filters(void) path = get_datafile_path("colorfilters"); if ((f = fopen(path, "r")) == NULL) { if (errno != ENOENT) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, "Could not open global filter file\n\"%s\": %s.", path, strerror(errno)); } @@ -289,7 +289,7 @@ read_other_filters(gchar *path, gpointer arg) gboolean ret; if ((f = fopen(path, "r")) == NULL) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, "Could not open\n%s\nfor reading: %s.", path, strerror(errno)); return FALSE; @@ -361,7 +361,7 @@ write_filters(void) path = get_persconffile_path("colorfilters", TRUE); if ((f = fopen(path, "w+")) == NULL) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, "Could not open\n%s\nfor writing: %s.", path, strerror(errno)); return FALSE; @@ -407,7 +407,7 @@ write_other_filters(gchar *path, gboolean only_marked) FILE *f; if ((f = fopen(path, "w+")) == NULL) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, "Could not open\n%s\nfor writing: %s.", path, strerror(errno)); return FALSE; diff --git a/gtk/dfilter_expr_dlg.c b/gtk/dfilter_expr_dlg.c index d51dc658ae..8c2472615f 100644 --- a/gtk/dfilter_expr_dlg.c +++ b/gtk/dfilter_expr_dlg.c @@ -7,7 +7,7 @@ * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> and * Guy Harris <guy@alum.mit.edu> * - * $Id: dfilter_expr_dlg.c,v 1.47 2004/01/26 21:02:36 obiot Exp $ + * $Id: dfilter_expr_dlg.c,v 1.48 2004/01/31 02:25:44 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -778,7 +778,7 @@ dfilter_report_bad_value(char *format, ...) vsnprintf(error_msg_buf, sizeof error_msg_buf, format, args); va_end(args); - simple_dialog(ESD_TYPE_CRIT | ESD_TYPE_MODAL, NULL, + simple_dialog(ESD_TYPE_ERROR | ESD_TYPE_MODAL, NULL, "%s", error_msg_buf); } @@ -900,11 +900,11 @@ dfilter_expr_dlg_accept_cb(GtkWidget *w, gpointer filter_te_arg) can_compare = TRUE; /* not a comparison */ if (!can_compare) { if (range_str == NULL) { - simple_dialog(ESD_TYPE_CRIT | ESD_TYPE_MODAL, NULL, + simple_dialog(ESD_TYPE_ERROR | ESD_TYPE_MODAL, NULL, "That field cannot be tested with \"%s\".", item_str); } else { - simple_dialog(ESD_TYPE_CRIT | ESD_TYPE_MODAL, NULL, + simple_dialog(ESD_TYPE_ERROR | ESD_TYPE_MODAL, NULL, "Ranges of that field cannot be tested with \"%s\".", item_str); } @@ -924,7 +924,7 @@ dfilter_expr_dlg_accept_cb(GtkWidget *w, gpointer filter_te_arg) * This field takes a value, but they didn't supply * one. */ - simple_dialog(ESD_TYPE_CRIT | ESD_TYPE_MODAL, NULL, + simple_dialog(ESD_TYPE_ERROR | ESD_TYPE_MODAL, NULL, "That field must be compared with a value, " "but you didn't specify a value with which to " "compare it."); diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c index 07db63e4bf..af423b85b5 100644 --- a/gtk/file_dlg.c +++ b/gtk/file_dlg.c @@ -1,7 +1,7 @@ /* file_dlg.c * Dialog boxes for handling files * - * $Id: file_dlg.c,v 1.85 2004/01/29 23:11:37 ulfl Exp $ + * $Id: file_dlg.c,v 1.86 2004/01/31 02:25:44 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -383,7 +383,7 @@ file_open_ok_cb(GtkWidget *w, GtkFileSelection *fs) { rfilter = (gchar *)gtk_entry_get_text(GTK_ENTRY(filter_te)); if (!dfilter_compile(rfilter, &rfcode)) { g_free(cf_name); - simple_dialog(ESD_TYPE_CRIT, NULL, dfilter_error_msg); + simple_dialog(ESD_TYPE_ERROR, NULL, dfilter_error_msg); return; } diff --git a/gtk/filter_prefs.c b/gtk/filter_prefs.c index 947a14496e..b25fe75a12 100644 --- a/gtk/filter_prefs.c +++ b/gtk/filter_prefs.c @@ -3,7 +3,7 @@ * (This used to be a notebook page under "Preferences", hence the * "prefs" in the file name.) * - * $Id: filter_prefs.c,v 1.57 2004/01/26 18:51:04 ulfl Exp $ + * $Id: filter_prefs.c,v 1.58 2004/01/31 02:25:45 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -844,7 +844,7 @@ filter_dlg_save_cb(GtkWidget *save_bt _U_, gpointer data) filter_type = NULL; break; } - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, "Could not save to your %s filter file\n\"%s\": %s.", filter_type, f_path, strerror(f_save_errno)); g_free(f_path); diff --git a/gtk/find_dlg.c b/gtk/find_dlg.c index 45b8c40278..313e2f6efb 100644 --- a/gtk/find_dlg.c +++ b/gtk/find_dlg.c @@ -1,7 +1,7 @@ /* find_dlg.c * Routines for "find frame" window * - * $Id: find_dlg.c,v 1.43 2004/01/21 21:19:32 ulfl Exp $ + * $Id: find_dlg.c,v 1.44 2004/01/31 02:25:45 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -548,7 +548,7 @@ find_frame_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) */ bytes = convert_string_to_hex(filter_text, &nbytes); if (bytes == NULL) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, "You didn't specify a valid hex string."); return; } @@ -564,7 +564,7 @@ find_frame_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) else if (strcmp(string_type, "ASCII Unicode") == 0) scs_type = SCS_UNICODE; else { - simple_dialog(ESD_TYPE_CRIT, NULL, "You didn't choose a valid character set."); + simple_dialog(ESD_TYPE_ERROR, NULL, "You didn't choose a valid character set."); return; } string = convert_string_case(filter_text, case_type); @@ -574,14 +574,14 @@ find_frame_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) */ if (!dfilter_compile(filter_text, &sfcode)) { /* The attempt failed; report an error. */ - simple_dialog(ESD_TYPE_CRIT, NULL, dfilter_error_msg); + simple_dialog(ESD_TYPE_ERROR, NULL, dfilter_error_msg); return; } /* Was it empty? */ if (sfcode == NULL) { /* Yes - complain. */ - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, "You didn't specify a valid filter expression."); return; } @@ -606,7 +606,7 @@ find_frame_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) g_free(bytes); if (!found_packet) { /* We didn't find a packet */ - simple_dialog(ESD_TYPE_CRIT, NULL, "No packet contained those bytes."); + simple_dialog(ESD_TYPE_ERROR, NULL, "No packet contained those bytes."); g_free(bytes); return; } @@ -618,7 +618,7 @@ find_frame_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) g_free(string); if (!found_packet) { /* We didn't find the packet. */ - simple_dialog(ESD_TYPE_CRIT, NULL, "No packet contained that string in its dissected display."); + simple_dialog(ESD_TYPE_ERROR, NULL, "No packet contained that string in its dissected display."); return; } } else if (cfile.summary_data) { @@ -627,7 +627,7 @@ find_frame_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) g_free(string); if (!found_packet) { /* We didn't find the packet. */ - simple_dialog(ESD_TYPE_CRIT, NULL, "No packet contained that string in its Info column."); + simple_dialog(ESD_TYPE_ERROR, NULL, "No packet contained that string in its Info column."); return; } } else { @@ -636,7 +636,7 @@ find_frame_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) g_free(string); if (!found_packet) { /* We didn't find the packet. */ - simple_dialog(ESD_TYPE_CRIT, NULL, "No packet contained that string in its data."); + simple_dialog(ESD_TYPE_ERROR, NULL, "No packet contained that string in its data."); return; } } @@ -645,7 +645,7 @@ find_frame_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) dfilter_free(sfcode); if (!found_packet) { /* We didn't find a packet */ - simple_dialog(ESD_TYPE_CRIT, NULL, "No packet matched that filter."); + simple_dialog(ESD_TYPE_ERROR, NULL, "No packet matched that filter."); g_free(bytes); return; } diff --git a/gtk/follow_dlg.c b/gtk/follow_dlg.c index efa9770aac..976aba6b9e 100644 --- a/gtk/follow_dlg.c +++ b/gtk/follow_dlg.c @@ -1,6 +1,6 @@ /* follow_dlg.c * - * $Id: follow_dlg.c,v 1.40 2004/01/26 22:34:55 guy Exp $ + * $Id: follow_dlg.c,v 1.41 2004/01/31 02:25:45 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -164,7 +164,7 @@ follow_stream_cb(GtkWidget * w, gpointer data _U_) /* we got tcp so we can follow */ if (cfile.edt->pi.ipproto != 6) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, "Error following stream. Please make\n" "sure you have a TCP packet selected."); return; @@ -756,7 +756,7 @@ follow_print_stream(GtkWidget * w _U_, gpointer data) to_file = TRUE; break; default: /* "Can't happen" */ - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, "Couldn't figure out where to send the print " "job. Check your preferences."); return; @@ -765,10 +765,10 @@ follow_print_stream(GtkWidget * w _U_, gpointer data) fh = open_print_dest(to_file, print_dest); if (fh == NULL) { if (to_file) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, file_open_error_message(errno, TRUE), prefs.pr_file); } else { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, "Couldn't run print command %s.", prefs.pr_cmd); } return; @@ -796,10 +796,10 @@ follow_print_stream(GtkWidget * w _U_, gpointer data) goto print_error; if (!close_print_dest(to_file, fh)) { if (to_file) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, file_write_error_message(errno), prefs.pr_file); } else { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, "Error closing print destination."); } } @@ -807,10 +807,10 @@ follow_print_stream(GtkWidget * w _U_, gpointer data) print_error: if (to_file) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, file_write_error_message(errno), prefs.pr_file); } else { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, "Error writing to print command: %s", strerror(errno)); } /* XXX - cancel printing? */ diff --git a/gtk/goto_dlg.c b/gtk/goto_dlg.c index 1a7d8d8394..1f9fab9d8c 100644 --- a/gtk/goto_dlg.c +++ b/gtk/goto_dlg.c @@ -1,7 +1,7 @@ /* goto_dlg.c * Routines for "go to packet" window * - * $Id: goto_dlg.c,v 1.23 2004/01/21 21:19:33 ulfl Exp $ + * $Id: goto_dlg.c,v 1.24 2004/01/31 02:25:45 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -122,7 +122,7 @@ goto_frame_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) XXX - what about negative numbers (which "strtoul()" allows)? Can we hack up signal handlers for the widget to make it reject attempts to type in characters other than digits? */ - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, "The packet number you entered isn't a valid number."); return; } diff --git a/gtk/gui_prefs.c b/gtk/gui_prefs.c index 04ba3e7f0e..444e3d14c2 100644 --- a/gtk/gui_prefs.c +++ b/gtk/gui_prefs.c @@ -1,7 +1,7 @@ /* gui_prefs.c * Dialog box for GUI preferences * - * $Id: gui_prefs.c,v 1.60 2004/01/24 01:02:54 guy Exp $ + * $Id: gui_prefs.c,v 1.61 2004/01/31 02:25:45 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -336,7 +336,7 @@ font_fetch(void) /* No font was selected; let the user know, but don't tear down the font selection dialog, so they can try again. */ - simple_dialog(ESD_TYPE_CRIT | ESD_TYPE_MODAL, NULL, + simple_dialog(ESD_TYPE_ERROR | ESD_TYPE_MODAL, NULL, "You have not selected a font."); return FALSE; } @@ -354,7 +354,7 @@ font_fetch(void) /* Oops, that font didn't work. Tell the user, but don't tear down the font selection dialog, so that they can try again. */ - simple_dialog(ESD_TYPE_CRIT | ESD_TYPE_MODAL, NULL, + simple_dialog(ESD_TYPE_ERROR | ESD_TYPE_MODAL, NULL, "The font you selected cannot be loaded."); g_free(font_name); @@ -374,7 +374,7 @@ font_fetch(void) /* Oops, that font didn't work. Tell the user, but don't tear down the font selection dialog, so that they can try again. */ - simple_dialog(ESD_TYPE_CRIT | ESD_TYPE_MODAL, NULL, + simple_dialog(ESD_TYPE_ERROR | ESD_TYPE_MODAL, NULL, "The font you selected doesn't have a boldface version."); g_free(font_name); @@ -474,7 +474,7 @@ gui_prefs_apply(GtkWidget *w _U_) case FA_FONT_NOT_AVAILABLE: /* We assume this means that the specified size isn't available. */ - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, "That font font isn't available at the specified zoom level;\n" "turning zooming off."); recent.gui_zoom_level = 0; diff --git a/gtk/help_dlg.c b/gtk/help_dlg.c index 440d5d589e..1ad6fc081d 100644 --- a/gtk/help_dlg.c +++ b/gtk/help_dlg.c @@ -1,6 +1,6 @@ /* help_dlg.c * - * $Id: help_dlg.c,v 1.43 2004/01/25 21:27:16 ulfl Exp $ + * $Id: help_dlg.c,v 1.44 2004/01/31 02:25:45 ulfl Exp $ * * Laurent Deniel <laurent.deniel@free.fr> * @@ -139,7 +139,7 @@ void help_cb(GtkWidget *w _U_, gpointer data _U_) help_toc_file_path = get_datafile_path(HELP_DIR G_DIR_SEPARATOR_S "toc"); help_toc_file = fopen(help_toc_file_path, "r"); if (help_toc_file == NULL) { - simple_dialog(ESD_TYPE_CRIT, ESD_BTN_OK, "Could not open file \"%s\": %s", + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Could not open file \"%s\": %s", help_toc_file_path, strerror(errno)); g_free(help_toc_file_path); return; diff --git a/gtk/main.c b/gtk/main.c index e190293974..5b83794d49 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1,6 +1,6 @@ /* main.c * - * $Id: main.c,v 1.379 2004/01/29 23:11:37 ulfl Exp $ + * $Id: main.c,v 1.380 2004/01/31 02:25:45 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -325,7 +325,7 @@ view_zoom_in_cb(GtkWidget *w _U_, gpointer d _U_) case FA_FONT_NOT_AVAILABLE: /* We assume this means that the specified size isn't available. */ - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, "Your current font isn't available in the next larger size.\n"); recent.gui_zoom_level = save_gui_zoom_level; /* undo zoom */ break; @@ -351,7 +351,7 @@ view_zoom_out_cb(GtkWidget *w _U_, gpointer d _U_) case FA_FONT_NOT_AVAILABLE: /* We assume this means that the specified size isn't available. */ - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, "Your current font isn't available in the next smaller size.\n"); recent.gui_zoom_level = save_gui_zoom_level; /* undo zoom */ break; @@ -378,7 +378,7 @@ view_zoom_100_cb(GtkWidget *w _U_, gpointer d _U_) case FA_FONT_NOT_AVAILABLE: /* We assume this means that the specified size isn't available. XXX - this "shouldn't happen". */ - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, "Your current font couldn't be reloaded at the size you selected.\n"); recent.gui_zoom_level = save_gui_zoom_level; /* undo zoom */ break; @@ -585,7 +585,7 @@ get_text_from_packet_list(gpointer data) if (fdata != NULL) { if (!wtap_seek_read(cfile.wth, fdata->file_off, &cfile.pseudo_header, cfile.pd, fdata->cap_len, &err, &err_info)) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, cf_read_error_message(err, err_info), cfile.filename); return NULL; } @@ -2402,7 +2402,7 @@ main(int argc, char *argv[]) if (cf_name) { if (rfilter != NULL) { if (!dfilter_compile(rfilter, &rfcode)) { - simple_dialog(ESD_TYPE_CRIT, NULL, dfilter_error_msg); + simple_dialog(ESD_TYPE_ERROR, NULL, dfilter_error_msg); rfilter_parse_failed = TRUE; } } @@ -3027,7 +3027,7 @@ font_apply(void) { * We just report that for now as a font not available in * multiple sizes. */ - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, "Your current font isn't available in any other sizes.\n"); return FA_FONT_NOT_RESIZEABLE; } diff --git a/gtk/print_dlg.c b/gtk/print_dlg.c index c08c686e25..aad57ad399 100644 --- a/gtk/print_dlg.c +++ b/gtk/print_dlg.c @@ -1,7 +1,7 @@ /* print_dlg.c * Dialog boxes for printing * - * $Id: print_dlg.c,v 1.57 2004/01/25 00:58:13 guy Exp $ + * $Id: print_dlg.c,v 1.58 2004/01/31 02:25:46 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -786,7 +786,7 @@ print_ok_cb(GtkWidget *ok_bt, gpointer parent_w) g_dest = gtk_entry_get_text(GTK_ENTRY(OBJECT_GET_DATA(ok_bt, PRINT_FILE_TE_KEY))); if (!g_dest[0]) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, "Printing to file, but no file specified."); return; } @@ -842,19 +842,19 @@ print_ok_cb(GtkWidget *ok_bt, gpointer parent_w) case PP_OPEN_ERROR: if (print_args.to_file) - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, file_open_error_message(errno, TRUE), print_args.dest); else - simple_dialog(ESD_TYPE_CRIT, NULL, "Couldn't run print command %s.", + simple_dialog(ESD_TYPE_ERROR, NULL, "Couldn't run print command %s.", print_args.dest); break; case PP_WRITE_ERROR: if (print_args.to_file) - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, file_write_error_message(errno), print_args.dest); else - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, "Error writing to print command: %s", strerror(errno)); break; } diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c index ebaf6273b9..6d2c48a9d1 100644 --- a/gtk/rtp_analysis.c +++ b/gtk/rtp_analysis.c @@ -1,7 +1,7 @@ /* rtp_analysis.c * RTP analysis addition for ethereal * - * $Id: rtp_analysis.c,v 1.28 2004/01/27 18:05:32 obiot Exp $ + * $Id: rtp_analysis.c,v 1.29 2004/01/31 02:25:46 ulfl Exp $ * * Copyright 2003, Alcatel Business Systems * By Lars Ruoff <lars.ruoff@gmx.net> @@ -966,7 +966,7 @@ static void save_csv_as_ok_cb(GtkWidget *bt _U_, gpointer fs /*user_data_t *user if (GTK_TOGGLE_BUTTON(forw)->active || GTK_TOGGLE_BUTTON(both)->active) { fp = fopen(g_dest, "w"); if (fp == NULL) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, file_open_error_message(errno, TRUE), g_dest); return; } @@ -974,7 +974,7 @@ static void save_csv_as_ok_cb(GtkWidget *bt _U_, gpointer fs /*user_data_t *user if (GTK_TOGGLE_BUTTON(both)->active) { fprintf(fp, "Forward\n"); if (ferror(fp)) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, file_write_error_message(errno), g_dest); fclose(fp); return; @@ -990,7 +990,7 @@ static void save_csv_as_ok_cb(GtkWidget *bt _U_, gpointer fs /*user_data_t *user } fprintf(fp,"\n"); if (ferror(fp)) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, file_write_error_message(errno), g_dest); fclose(fp); return; @@ -1006,7 +1006,7 @@ static void save_csv_as_ok_cb(GtkWidget *bt _U_, gpointer fs /*user_data_t *user } fprintf(fp,"\n"); if (ferror(fp)) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, file_write_error_message(errno), g_dest); fclose(fp); return; @@ -1014,7 +1014,7 @@ static void save_csv_as_ok_cb(GtkWidget *bt _U_, gpointer fs /*user_data_t *user } if (fclose(fp) == EOF) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, file_write_error_message(errno), g_dest); return; } @@ -1025,14 +1025,14 @@ static void save_csv_as_ok_cb(GtkWidget *bt _U_, gpointer fs /*user_data_t *user if (GTK_TOGGLE_BUTTON(both)->active) { fp = fopen(g_dest, "a"); if (fp == NULL) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, file_open_error_message(errno, TRUE), g_dest); return; } fprintf(fp, "\nReverse\n"); if (ferror(fp)) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, file_write_error_message(errno), g_dest); fclose(fp); return; @@ -1040,7 +1040,7 @@ static void save_csv_as_ok_cb(GtkWidget *bt _U_, gpointer fs /*user_data_t *user } else { fp = fopen(g_dest, "w"); if (fp == NULL) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, file_open_error_message(errno, TRUE), g_dest); return; @@ -1055,7 +1055,7 @@ static void save_csv_as_ok_cb(GtkWidget *bt _U_, gpointer fs /*user_data_t *user } fprintf(fp,"\n"); if (ferror(fp)) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, file_write_error_message(errno), g_dest); fclose(fp); return; @@ -1071,14 +1071,14 @@ static void save_csv_as_ok_cb(GtkWidget *bt _U_, gpointer fs /*user_data_t *user } fprintf(fp,"\n"); if (ferror(fp)) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, file_write_error_message(errno), g_dest); fclose(fp); return; } } if (fclose(fp) == EOF) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, file_write_error_message(errno), g_dest); return; } diff --git a/gtk/rtp_stream.c b/gtk/rtp_stream.c index e2053c0493..2b641e550b 100644 --- a/gtk/rtp_stream.c +++ b/gtk/rtp_stream.c @@ -1,7 +1,7 @@ /* rtp_stream.c * RTP streams summary addition for ethereal * - * $Id: rtp_stream.c,v 1.8 2004/01/26 19:16:30 obiot Exp $ + * $Id: rtp_stream.c,v 1.9 2004/01/31 02:25:46 ulfl Exp $ * * Copyright 2003, Alcatel Business Systems * By Lars Ruoff <lars.ruoff@gmx.net> @@ -283,14 +283,14 @@ gboolean rtpstream_save(rtp_stream_info_t* stream, const gchar *filename) /* open file for saving */ the_tapinfo_struct.save_file = fopen(filename, "wb"); if (the_tapinfo_struct.save_file==NULL) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, file_open_error_message(errno, TRUE), filename); return FALSE; } rtp_write_header(stream, the_tapinfo_struct.save_file); if (ferror(the_tapinfo_struct.save_file)) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, file_write_error_message(errno), filename); fclose(the_tapinfo_struct.save_file); return FALSE; @@ -308,14 +308,14 @@ gboolean rtpstream_save(rtp_stream_info_t* stream, const gchar *filename) remove_tap_listener_rtp_stream(); if (ferror(the_tapinfo_struct.save_file)) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, file_write_error_message(errno), filename); fclose(the_tapinfo_struct.save_file); return FALSE; } if (fclose(the_tapinfo_struct.save_file) == EOF) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, file_write_error_message(errno), filename); return FALSE; } diff --git a/gtk/simple_dialog.c b/gtk/simple_dialog.c index eba8bb74fb..256d63f1c2 100644 --- a/gtk/simple_dialog.c +++ b/gtk/simple_dialog.c @@ -1,7 +1,7 @@ /* simple_dialog.c * Simple message dialog box routines. * - * $Id: simple_dialog.c,v 1.18 2004/01/31 01:28:10 ulfl Exp $ + * $Id: simple_dialog.c,v 1.19 2004/01/31 02:25:46 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -81,7 +81,7 @@ simple_dialog(gint type, gint btn_mask, gchar *msg_format, ...) { icon = stock_dialog_warning_48_xpm; win = dlg_window_new("Ethereal: Warning"); break; - case ESD_TYPE_CRIT : + case ESD_TYPE_ERROR: icon = stock_dialog_error_48_xpm; win = dlg_window_new("Ethereal: Error"); break; diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c index f33d91754b..2c0a2c4f1a 100644 --- a/gtk/tcp_graph.c +++ b/gtk/tcp_graph.c @@ -3,7 +3,7 @@ * By Pavel Mores <pvl@uh.cz> * Win32 port: rwh@unifiedtech.com * - * $Id: tcp_graph.c,v 1.47 2004/01/25 21:55:11 guy Exp $ + * $Id: tcp_graph.c,v 1.48 2004/01/31 02:25:46 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1795,7 +1795,7 @@ static void graph_segment_list_get (struct graph *g) for (ptr=cfile.plist; ptr; ptr=ptr->next) { if (!wtap_seek_read (cfile.wth, ptr->file_off, &pseudo_header, pd, ptr->cap_len, &err, &err_info)) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, cf_read_error_message(err, err_info), cfile.filename); break; diff --git a/proto_hier_stats.c b/proto_hier_stats.c index 6490d40b53..f98d8d75a6 100644 --- a/proto_hier_stats.c +++ b/proto_hier_stats.c @@ -1,7 +1,7 @@ /* proto_hier_stats.c * Routines for calculating statistics based on protocol. * - * $Id: proto_hier_stats.c,v 1.23 2004/01/25 21:55:10 guy Exp $ + * $Id: proto_hier_stats.c,v 1.24 2004/01/31 02:25:43 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -133,7 +133,7 @@ process_frame(frame_data *frame, column_info *cinfo, ph_stats_t* ps) /* Load the frame from the capture file */ if (!wtap_seek_read(cfile.wth, frame->file_off, &phdr, pd, frame->cap_len, &err, &err_info)) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_ERROR, NULL, cf_read_error_message(err, err_info), cfile.filename); return FALSE; /* failure */ } diff --git a/simple_dialog.h b/simple_dialog.h index c57ddb2ea9..f3834222e9 100644 --- a/simple_dialog.h +++ b/simple_dialog.h @@ -2,7 +2,7 @@ * Definitions for dialog box routines with toolkit-independent APIs but * toolkit-dependent implementations. * - * $Id: simple_dialog.h,v 1.5 2004/01/29 23:07:17 ulfl Exp $ + * $Id: simple_dialog.h,v 1.6 2004/01/31 02:25:43 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -34,7 +34,7 @@ extern "C" { /* Dialog type. */ #define ESD_TYPE_INFO 0x00 #define ESD_TYPE_WARN 0x01 -#define ESD_TYPE_CRIT 0x02 +#define ESD_TYPE_ERROR 0x02 #define ESD_TYPE_QUEST 0x03 /* Flag to be ORed with the dialog type, to specify that the dialog is |