diff options
78 files changed, 245 insertions, 245 deletions
diff --git a/gtk/about_dlg.c b/gtk/about_dlg.c index 024225ca0b..a9e21945d4 100644 --- a/gtk/about_dlg.c +++ b/gtk/about_dlg.c @@ -47,20 +47,20 @@ #include "main.h" #include "plugins_dlg.h" -static void about_ethereal_destroy_cb(GtkWidget *, gpointer); +static void about_wireshark_destroy_cb(GtkWidget *, gpointer); /* - * Keep a static pointer to the current "About Ethereal" window, if any, so - * that if somebody tries to do "About Ethereal" while there's already an - * "About Ethereal" window up, we just pop up the existing one, rather than + * Keep a static pointer to the current "About Wireshark" window, if any, so + * that if somebody tries to do "About Wireshark" while there's already an + * "About Wireshark" window up, we just pop up the existing one, rather than * creating a new one. */ -static GtkWidget *about_ethereal_w; +static GtkWidget *about_wireshark_w; static void -about_ethereal(GtkWidget *parent, GtkWidget *main_vb, const char *title) +about_wireshark(GtkWidget *parent, GtkWidget *main_vb, const char *title) { GtkWidget *msg_label, *icon; #if GTK_MAJOR_VERSION >= 2 @@ -90,7 +90,7 @@ splash_new(char *message) win = splash_window_new(); - /* When calling about_ethereal(), we must realize the top-level + /* When calling about_wireshark(), we must realize the top-level widget for the window, otherwise GTK will throw a warning because we don't have a colormap associated with that window and can't handle the pixmap. */ @@ -100,7 +100,7 @@ splash_new(char *message) gtk_container_border_width(GTK_CONTAINER(main_vb), 24); gtk_container_add(GTK_CONTAINER(win), main_vb); - about_ethereal(win, main_vb, "Wireshark - Network Protocol Analyzer"); + about_wireshark(win, main_vb, "Wireshark - Network Protocol Analyzer"); main_lb = gtk_label_new(message); gtk_container_add(GTK_CONTAINER(main_vb), main_lb); @@ -139,7 +139,7 @@ splash_destroy(GtkWidget *win) static GtkWidget * -about_ethereal_page_new(void) +about_wireshark_page_new(void) { GtkWidget *main_vb, *msg_label /*, *icon*/; gchar *message; @@ -148,7 +148,7 @@ about_ethereal_page_new(void) main_vb = gtk_vbox_new(FALSE, 6); gtk_container_border_width(GTK_CONTAINER(main_vb), 12); - about_ethereal(top_level, main_vb, title); + about_wireshark(top_level, main_vb, title); /* Construct the message string */ message = g_strdup_printf( @@ -160,7 +160,7 @@ about_ethereal_page_new(void) "\n" "%s" "\n" - "Ethereal is Open Source Software released under the GNU General Public License.\n" + "Wireshark is Open Source Software released under the GNU General Public License.\n" "\n" "Check the man page and http://www.ethereal.com for more information.", svnversion, get_copyright_info(), comp_info_str->str, @@ -270,7 +270,7 @@ about_folders_page_new(void) void -about_ethereal_cb( GtkWidget *w _U_, gpointer data _U_ ) +about_wireshark_cb( GtkWidget *w _U_, gpointer data _U_ ) { GtkWidget *main_vb, *main_nb, *bbox, *ok_btn; @@ -279,9 +279,9 @@ about_ethereal_cb( GtkWidget *w _U_, gpointer data _U_ ) GtkWidget *authors_page; #endif - if (about_ethereal_w != NULL) { - /* There's already an "About Ethereal" dialog box; reactivate it. */ - reactivate_window(about_ethereal_w); + if (about_wireshark_w != NULL) { + /* There's already an "About Wireshark" dialog box; reactivate it. */ + reactivate_window(about_wireshark_w); return; } @@ -291,28 +291,28 @@ about_ethereal_cb( GtkWidget *w _U_, gpointer data _U_ ) * is the GTK+ 2.x GtkDialog appropriate but the 1.2[.x] one * not? (The GNOME 1.x GnomeAbout widget uses GnomeDialog.) */ - about_ethereal_w = dlg_window_new("About Ethereal"); + about_wireshark_w = dlg_window_new("About Wireshark"); /* set the initial position (must be done, before show is called!) */ /* default position is not appropriate for the about dialog */ #if GTK_MAJOR_VERSION >= 2 - gtk_window_set_position(GTK_WINDOW(about_ethereal_w), GTK_WIN_POS_CENTER_ON_PARENT); + gtk_window_set_position(GTK_WINDOW(about_wireshark_w), GTK_WIN_POS_CENTER_ON_PARENT); #else - gtk_window_set_position(GTK_WINDOW(about_ethereal_w), GTK_WIN_POS_CENTER); + gtk_window_set_position(GTK_WINDOW(about_wireshark_w), GTK_WIN_POS_CENTER); #endif /* setting the size is dangerous here, as making it too short will * clip content on GTK1, so simply use the natural size */ - /*gtk_window_set_default_size(GTK_WINDOW(about_ethereal_w), 600, 400);*/ - gtk_container_border_width(GTK_CONTAINER(about_ethereal_w), 6); + /*gtk_window_set_default_size(GTK_WINDOW(about_wireshark_w), 600, 400);*/ + gtk_container_border_width(GTK_CONTAINER(about_wireshark_w), 6); main_vb = gtk_vbox_new(FALSE, 12); gtk_container_border_width(GTK_CONTAINER(main_vb), 6); - gtk_container_add(GTK_CONTAINER(about_ethereal_w), main_vb); + gtk_container_add(GTK_CONTAINER(about_wireshark_w), main_vb); main_nb = gtk_notebook_new(); gtk_box_pack_start(GTK_BOX(main_vb), main_nb, TRUE, TRUE, 0); - about_page = about_ethereal_page_new(); - page_lb = gtk_label_new("Ethereal"); + about_page = about_wireshark_page_new(); + page_lb = gtk_label_new("Wireshark"); gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), about_page, page_lb); #if GTK_MAJOR_VERSION >= 2 || GTK_MINOR_VERSION >= 3 @@ -336,20 +336,20 @@ about_ethereal_cb( GtkWidget *w _U_, gpointer data _U_ ) gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 0); ok_btn = OBJECT_GET_DATA(bbox, GTK_STOCK_OK); - window_set_cancel_button(about_ethereal_w, ok_btn, window_cancel_button_cb); + window_set_cancel_button(about_wireshark_w, ok_btn, window_cancel_button_cb); - SIGNAL_CONNECT(about_ethereal_w, "delete_event", window_delete_event_cb, NULL); - SIGNAL_CONNECT(about_ethereal_w, "destroy", about_ethereal_destroy_cb, NULL); + SIGNAL_CONNECT(about_wireshark_w, "delete_event", window_delete_event_cb, NULL); + SIGNAL_CONNECT(about_wireshark_w, "destroy", about_wireshark_destroy_cb, NULL); - gtk_widget_show_all(about_ethereal_w); - window_present(about_ethereal_w); + gtk_widget_show_all(about_wireshark_w); + window_present(about_wireshark_w); } static void -about_ethereal_destroy_cb(GtkWidget *win _U_, gpointer user_data _U_) +about_wireshark_destroy_cb(GtkWidget *win _U_, gpointer user_data _U_) { - /* Note that we no longer have an "About Ethereal" dialog box. */ - about_ethereal_w = NULL; + /* Note that we no longer have an "About Wireshark" dialog box. */ + about_wireshark_w = NULL; } diff --git a/gtk/about_dlg.h b/gtk/about_dlg.h index 65070a22a3..7744865690 100644 --- a/gtk/about_dlg.h +++ b/gtk/about_dlg.h @@ -30,7 +30,7 @@ * @ingroup dialog_group */ -/** Create a splash screen showed when Ethereal is started. +/** Create a splash screen showed when Wireshark is started. * * @param message the new message to be displayed * @return the newly created window handle @@ -56,7 +56,7 @@ extern guint splash_destroy(GtkWidget *win); * @param widget parent widget (unused) * @param data unused */ -extern void about_ethereal_cb( GtkWidget *widget, gpointer data); +extern void about_wireshark_cb( GtkWidget *widget, gpointer data); #endif /* __ABOUT_DLG_H__ */ diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c index 4cfd652fcd..4f205d3119 100644 --- a/gtk/capture_dlg.c +++ b/gtk/capture_dlg.c @@ -549,7 +549,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) if (!has_wpcap) { char *detailed_err; - detailed_err = cant_load_winpcap_err("Ethereal"); + detailed_err = cant_load_winpcap_err("Wireshark"); simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", detailed_err); g_free(detailed_err); return; @@ -565,7 +565,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) } /* use user-defined title if preference is set */ - cap_title = create_user_window_title("Ethereal: Capture Options"); + cap_title = create_user_window_title("Wireshark: Capture Options"); cap_open_w = dlg_window_new(cap_title); g_free(cap_title); @@ -1188,7 +1188,7 @@ capture_start_confirmed(void) { ESD_BTN_OK, PRIMARY_TEXT_START "No capture interface selected!" PRIMARY_TEXT_END "\n\n" "To select an interface use:\n\n" - "Capture->Options (until Ethereal is stopped)\n" + "Capture->Options (until Wireshark is stopped)\n" "Edit->Preferences/Capture (permanent, if saved)"); return; } @@ -1239,7 +1239,7 @@ capture_start_cb(GtkWidget *w _U_, gpointer d _U_) #ifdef _WIN32 /* Is WPcap loaded? */ if (!has_wpcap) { - char * err_msg = cant_load_winpcap_err("Ethereal"); + char * err_msg = cant_load_winpcap_err("Wireshark"); simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, err_msg); @@ -1282,7 +1282,7 @@ select_link_type_cb(GtkWidget *w, gpointer data) static void capture_prep_file_cb(GtkWidget *file_bt, GtkWidget *file_te) { - file_selection_browse(file_bt, file_te, "Ethereal: Specify a Capture File", FILE_SELECTION_WRITE_BROWSE); + file_selection_browse(file_bt, file_te, "Wireshark: Specify a Capture File", FILE_SELECTION_WRITE_BROWSE); } @@ -1392,14 +1392,14 @@ capture_dlg_prep(gpointer parent_w) { in that series, don't bind the AF_PACKET socket to an interface until a filter is set, which means they aren't bound at all if no filter is set, which means no packets arrive as input on that - socket, which means Ethereal never sees any packets. */ + socket, which means Wireshark never sees any packets. */ filter_text = gtk_entry_get_text(GTK_ENTRY(filter_te)); if (capture_opts->cfilter) g_free(capture_opts->cfilter); g_assert(filter_text != NULL); capture_opts->cfilter = g_strdup(filter_text); - /* Ethereal always saves to a capture file. */ + /* Wireshark always saves to a capture file. */ capture_opts->saving_to_file = TRUE; g_save_file = gtk_entry_get_text(GTK_ENTRY(file_te)); if (g_save_file && g_save_file[0]) { diff --git a/gtk/capture_file_dlg.c b/gtk/capture_file_dlg.c index 0865e98faf..391a842736 100644 --- a/gtk/capture_file_dlg.c +++ b/gtk/capture_file_dlg.c @@ -440,7 +440,7 @@ file_open_cmd(GtkWidget *w) /* No Apply button, and "OK" just sets our text widget, it doesn't activate it (i.e., it doesn't cause us to try to open the file). */ static construct_args_t args = { - "Ethereal: Read Filter", + "Wireshark: Read Filter", FALSE, FALSE, TRUE @@ -452,7 +452,7 @@ file_open_cmd(GtkWidget *w) return; } - file_open_w = file_selection_new("Ethereal: Open Capture File", + file_open_w = file_selection_new("Wireshark: Open Capture File", FILE_SELECTION_OPEN); #if (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION >= 4) || GTK_MAJOR_VERSION > 2 /* it's annoying, that the file chooser dialog is already shown here, @@ -776,7 +776,7 @@ file_merge_cmd(GtkWidget *w) /* No Apply button, and "OK" just sets our text widget, it doesn't activate it (i.e., it doesn't cause us to try to open the file). */ static construct_args_t args = { - "Ethereal: Read Filter", + "Wireshark: Read Filter", FALSE, FALSE, TRUE @@ -791,7 +791,7 @@ file_merge_cmd(GtkWidget *w) /* Default to saving all packets, in the file's current format. */ filetype = cfile.cd_t; - file_merge_w = file_selection_new("Ethereal: Merge with Capture File", + file_merge_w = file_selection_new("Wireshark: Merge with Capture File", FILE_SELECTION_OPEN); #if (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION >= 4) || GTK_MAJOR_VERSION > 2 /* it's annoying, that the file chooser dialog is already shown here, @@ -1280,7 +1280,7 @@ file_save_as_cmd(action_after_save_e action_after_save, gpointer action_after_sa tooltips = gtk_tooltips_new(); /* build the file selection */ - file_save_as_w = file_selection_new ("Ethereal: Save Capture File As", + file_save_as_w = file_selection_new ("Wireshark: Save Capture File As", FILE_SELECTION_SAVE); /* as the dialog might already be gone, when using this values, we cannot @@ -1638,7 +1638,7 @@ file_color_import_cmd_cb(GtkWidget *w _U_, gpointer data) return; } - file_color_import_w = file_selection_new("Ethereal: Import Color Filters", + file_color_import_w = file_selection_new("Wireshark: Import Color Filters", FILE_SELECTION_OPEN); #if GTK_MAJOR_VERSION < 2 @@ -1799,7 +1799,7 @@ file_color_export_cmd_cb(GtkWidget *w _U_, gpointer data _U_) color_marked = FALSE; filetype = cfile.cd_t; - file_color_export_w = file_selection_new("Ethereal: Export Color Filters", + file_color_export_w = file_selection_new("Wireshark: Export Color Filters", FILE_SELECTION_SAVE); /* Container for each row of widgets */ diff --git a/gtk/capture_if_details_dlg.c b/gtk/capture_if_details_dlg.c index 8302ddfe06..f3939a9ff5 100644 --- a/gtk/capture_if_details_dlg.c +++ b/gtk/capture_if_details_dlg.c @@ -1998,7 +1998,7 @@ capture_if_details_open_win(char *iface) } /* open a new window */ - details_open_w = window_new(GTK_WINDOW_TOPLEVEL, "Ethereal: Interface Details"); + details_open_w = window_new(GTK_WINDOW_TOPLEVEL, "Wireshark: Interface Details"); /* Container for the window contents */ main_vb = gtk_vbox_new(FALSE, 12); diff --git a/gtk/capture_if_dlg.c b/gtk/capture_if_dlg.c index a03851cf06..279b3bb8e5 100644 --- a/gtk/capture_if_dlg.c +++ b/gtk/capture_if_dlg.c @@ -350,7 +350,7 @@ capture_if_cb(GtkWidget *w _U_, gpointer d _U_) if (!has_wpcap) { char *detailed_err; - detailed_err = cant_load_winpcap_err("Ethereal"); + detailed_err = cant_load_winpcap_err("Wireshark"); simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", detailed_err); g_free(detailed_err); return; @@ -366,7 +366,7 @@ capture_if_cb(GtkWidget *w _U_, gpointer d _U_) return; } - cap_if_w = window_new(GTK_WINDOW_TOPLEVEL, "Ethereal: Capture Interfaces"); + cap_if_w = window_new(GTK_WINDOW_TOPLEVEL, "Wireshark: Capture Interfaces"); tooltips = gtk_tooltips_new(); diff --git a/gtk/capture_info_dlg.c b/gtk/capture_info_dlg.c index f1b2e8dfd8..cb939df3f9 100644 --- a/gtk/capture_info_dlg.c +++ b/gtk/capture_info_dlg.c @@ -144,7 +144,7 @@ const gchar *iface) * available, we should still use that. */ descr = get_interface_descriptive_name(iface); - title_iface = g_strdup_printf("Ethereal: Capture from %s", descr); + title_iface = g_strdup_printf("Wireshark: Capture from %s", descr); g_free(descr); cap_w_title = create_user_window_title(title_iface); g_free(title_iface); diff --git a/gtk/capture_prefs.c b/gtk/capture_prefs.c index 7137985ecd..881ac74694 100644 --- a/gtk/capture_prefs.c +++ b/gtk/capture_prefs.c @@ -263,7 +263,7 @@ ifopts_edit_cb(GtkWidget *w, gpointer data _U_) } /* create a new dialog */ - ifopts_edit_dlg = dlg_window_new("Ethereal: Preferences: Interface Options"); + ifopts_edit_dlg = dlg_window_new("Wireshark: Preferences: Interface Options"); gtk_window_set_default_size(GTK_WINDOW(ifopts_edit_dlg), DEF_WIDTH, 300); main_vb = gtk_vbox_new(FALSE, 1); diff --git a/gtk/color_dlg.c b/gtk/color_dlg.c index 19887a7db4..fadcb7b4c3 100644 --- a/gtk/color_dlg.c +++ b/gtk/color_dlg.c @@ -218,7 +218,7 @@ colorize_dialog_new (char *filter) /* Resizing of the dialog window is now reasonably done. * Default size is set so that it should fit into every usual screen resolution. * All other widgets are always packed depending on the current window size. */ - color_win = dlg_window_new ("Ethereal: Coloring Rules"); + color_win = dlg_window_new ("Wireshark: Coloring Rules"); OBJECT_SET_DATA(color_win, "color_win", color_win); gtk_window_set_default_size(GTK_WINDOW(color_win), DEF_WIDTH, DEF_HEIGHT * 2/3); dlg_vbox = gtk_vbox_new (FALSE, 0); @@ -1189,7 +1189,7 @@ edit_color_filter_dialog(GtkWidget *color_filters, tooltips = gtk_tooltips_new (); /* dialog window */ - edit_dialog = dlg_window_new ("Ethereal: Edit Color Filter"); + edit_dialog = dlg_window_new ("Wireshark: Edit Color Filter"); gtk_window_set_default_size(GTK_WINDOW(edit_dialog), 500, -1); OBJECT_SET_DATA(edit_dialog, "edit_dialog", edit_dialog); colorf->edit_dialog = edit_dialog; @@ -1499,11 +1499,11 @@ color_sel_win_new(color_filter_t *colorf, gboolean is_bg) if (is_bg) { color = &colorf->bg_color; - title = g_strdup_printf("Ethereal: Choose background color for \"%s\"", + title = g_strdup_printf("Wireshark: Choose background color for \"%s\"", colorf->filter_name); } else { color = &colorf->fg_color; - title = g_strdup_printf("Ethereal: Choose foreground color for \"%s\"", + title = g_strdup_printf("Wireshark: Choose foreground color for \"%s\"", colorf->filter_name); } color_sel_win = gtk_color_selection_dialog_new(title); diff --git a/gtk/column_prefs.c b/gtk/column_prefs.c index 1bc8b077ef..743ed23427 100644 --- a/gtk/column_prefs.c +++ b/gtk/column_prefs.c @@ -294,7 +294,7 @@ column_prefs_show() { gtk_widget_show(fmt_m); lb = gtk_label_new("Unlike all other preferences, you have to \"Save\" " - "and restart Ethereal to let column changes take effect!"); + "and restart Wireshark to let column changes take effect!"); gtk_misc_set_alignment(GTK_MISC(lb), 0.5, 0.5); gtk_box_pack_start (GTK_BOX (main_vb), lb, FALSE, FALSE, 0); gtk_widget_show(lb); diff --git a/gtk/compat_macros.h b/gtk/compat_macros.h index 78dbcfa940..49d7a6b04b 100644 --- a/gtk/compat_macros.h +++ b/gtk/compat_macros.h @@ -357,42 +357,42 @@ g_signal_stop_emission_by_name(G_OBJECT(widget), name) #define ETHEREAL_STOCK_LABEL_FILTER_OUT_STREAM "Filter Out This Stream" #ifdef HAVE_LIBPCAP -#define ETHEREAL_STOCK_CAPTURE_INTERFACES "Ethereal_Stock_CaptureInterfaces" -#define ETHEREAL_STOCK_CAPTURE_OPTIONS "Ethereal_Stock_CaptureOptionss" -#define ETHEREAL_STOCK_CAPTURE_START "Ethereal_Stock_CaptureStart" -#define ETHEREAL_STOCK_CAPTURE_STOP "Ethereal_Stock_CaptureStop" -#define ETHEREAL_STOCK_CAPTURE_RESTART "Ethereal_Stock_CaptureRestart" -#define ETHEREAL_STOCK_CAPTURE_FILTER "Ethereal_Stock_CaptureFilter" -#define ETHEREAL_STOCK_CAPTURE_FILTER_ENTRY "Ethereal_Stock_CaptureFilter_Entry" +#define ETHEREAL_STOCK_CAPTURE_INTERFACES "Wireshark_Stock_CaptureInterfaces" +#define ETHEREAL_STOCK_CAPTURE_OPTIONS "Wireshark_Stock_CaptureOptionss" +#define ETHEREAL_STOCK_CAPTURE_START "Wireshark_Stock_CaptureStart" +#define ETHEREAL_STOCK_CAPTURE_STOP "Wireshark_Stock_CaptureStop" +#define ETHEREAL_STOCK_CAPTURE_RESTART "Wireshark_Stock_CaptureRestart" +#define ETHEREAL_STOCK_CAPTURE_FILTER "Wireshark_Stock_CaptureFilter" +#define ETHEREAL_STOCK_CAPTURE_FILTER_ENTRY "Wireshark_Stock_CaptureFilter_Entry" #endif -#define ETHEREAL_STOCK_DISPLAY_FILTER "Ethereal_Stock_DisplayFilter" -#define ETHEREAL_STOCK_DISPLAY_FILTER_ENTRY "Ethereal_Stock_DisplayFilter_Entry" -#define ETHEREAL_STOCK_PREFS "Ethereal_Stock_Prefs" -#define ETHEREAL_STOCK_BROWSE "Ethereal_Stock_Browse" -#define ETHEREAL_STOCK_CREATE_STAT "Ethereal_Stock_CreateStat" -#define ETHEREAL_STOCK_EXPORT "Ethereal_Stock_Export" -#define ETHEREAL_STOCK_IMPORT "Ethereal_Stock_Import" -#define ETHEREAL_STOCK_EDIT "Ethereal_Stock_Edit" -#define ETHEREAL_STOCK_ADD_EXPRESSION "Ethereal_Stock_Edit_Add_Expression" -#define ETHEREAL_STOCK_DONT_SAVE "Ethereal_Stock_Continue_without_Saving" -#define ETHEREAL_STOCK_ABOUT "Ethereal_Stock_About" -#define ETHEREAL_STOCK_COLORIZE "Ethereal_Stock_Colorize" -#define ETHEREAL_STOCK_AUTOSCROLL "Ethereal_Stock_Autoscroll" -#define ETHEREAL_STOCK_RESIZE_COLUMNS "Ethereal_Stock_Resize_Columns" -#define ETHEREAL_STOCK_TIME "Ethereal_Stock_Time" -#define ETHEREAL_STOCK_INTERNET "Ethereal_Stock_Internet" -#define ETHEREAL_STOCK_WEB_SUPPORT "Ethereal_Stock_Web_Support" -#define ETHEREAL_STOCK_WIKI "Ethereal_Stock_Wiki" -#define ETHEREAL_STOCK_CONVERSATIONS "Ethereal_Stock_Conversations" -#define ETHEREAL_STOCK_ENDPOINTS "Ethereal_Stock_Endpoints" -#define ETHEREAL_STOCK_GRAPHS "Ethereal_Stock_Graphs" -#define ETHEREAL_STOCK_TELEPHONY "Ethereal_Stock_Telephony" -#define ETHEREAL_STOCK_DECODE_AS "Ethereal_Stock_DecodeAs" -#define ETHEREAL_STOCK_CHECKBOX "Ethereal_Stock_Checkbox" -#define ETHEREAL_STOCK_FILE_SET_LIST "Ethereal_Stock_File_Set_List" -#define ETHEREAL_STOCK_FILE_SET_NEXT "Ethereal_Stock_File_Set_Next" -#define ETHEREAL_STOCK_FILE_SET_PREVIOUS "Ethereal_Stock_File_Set_Previous" -#define ETHEREAL_STOCK_FILTER_OUT_STREAM "Ethereal_Stock_Filter_Out_This_Stream" +#define ETHEREAL_STOCK_DISPLAY_FILTER "Wireshark_Stock_DisplayFilter" +#define ETHEREAL_STOCK_DISPLAY_FILTER_ENTRY "Wireshark_Stock_DisplayFilter_Entry" +#define ETHEREAL_STOCK_PREFS "Wireshark_Stock_Prefs" +#define ETHEREAL_STOCK_BROWSE "Wireshark_Stock_Browse" +#define ETHEREAL_STOCK_CREATE_STAT "Wireshark_Stock_CreateStat" +#define ETHEREAL_STOCK_EXPORT "Wireshark_Stock_Export" +#define ETHEREAL_STOCK_IMPORT "Wireshark_Stock_Import" +#define ETHEREAL_STOCK_EDIT "Wireshark_Stock_Edit" +#define ETHEREAL_STOCK_ADD_EXPRESSION "Wireshark_Stock_Edit_Add_Expression" +#define ETHEREAL_STOCK_DONT_SAVE "Wireshark_Stock_Continue_without_Saving" +#define ETHEREAL_STOCK_ABOUT "Wireshark_Stock_About" +#define ETHEREAL_STOCK_COLORIZE "Wireshark_Stock_Colorize" +#define ETHEREAL_STOCK_AUTOSCROLL "Wireshark_Stock_Autoscroll" +#define ETHEREAL_STOCK_RESIZE_COLUMNS "Wireshark_Stock_Resize_Columns" +#define ETHEREAL_STOCK_TIME "Wireshark_Stock_Time" +#define ETHEREAL_STOCK_INTERNET "Wireshark_Stock_Internet" +#define ETHEREAL_STOCK_WEB_SUPPORT "Wireshark_Stock_Web_Support" +#define ETHEREAL_STOCK_WIKI "Wireshark_Stock_Wiki" +#define ETHEREAL_STOCK_CONVERSATIONS "Wireshark_Stock_Conversations" +#define ETHEREAL_STOCK_ENDPOINTS "Wireshark_Stock_Endpoints" +#define ETHEREAL_STOCK_GRAPHS "Wireshark_Stock_Graphs" +#define ETHEREAL_STOCK_TELEPHONY "Wireshark_Stock_Telephony" +#define ETHEREAL_STOCK_DECODE_AS "Wireshark_Stock_DecodeAs" +#define ETHEREAL_STOCK_CHECKBOX "Wireshark_Stock_Checkbox" +#define ETHEREAL_STOCK_FILE_SET_LIST "Wireshark_Stock_File_Set_List" +#define ETHEREAL_STOCK_FILE_SET_NEXT "Wireshark_Stock_File_Set_Next" +#define ETHEREAL_STOCK_FILE_SET_PREVIOUS "Wireshark_Stock_File_Set_Previous" +#define ETHEREAL_STOCK_FILTER_OUT_STREAM "Wireshark_Stock_Filter_Out_This_Stream" #define BUTTON_NEW_FROM_STOCK(stock_id) \ gtk_button_new_from_stock(stock_id); diff --git a/gtk/dcerpc_stat.c b/gtk/dcerpc_stat.c index 5c5c6ce0ac..e39883250a 100644 --- a/gtk/dcerpc_stat.c +++ b/gtk/dcerpc_stat.c @@ -22,9 +22,9 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* This module provides rpc call/reply SRT statistics to ethereal, +/* This module provides rpc call/reply SRT statistics to Wireshark, * and displays them graphically. - * It is only used by ethereal and not tethereal + * It is only used by Wireshark and not tethereal * * It serves as an example on how to use the tap api. */ @@ -561,7 +561,7 @@ gtk_dcerpcstat_cb(GtkWidget *w _U_, gpointer d _U_) return; } - dlg=dlg_window_new("Ethereal: Compute DCE-RPC SRT statistics"); + dlg=dlg_window_new("Wireshark: Compute DCE-RPC SRT statistics"); gtk_window_set_default_size(GTK_WINDOW(dlg), 400, -1); dlg_box=gtk_vbox_new(FALSE, 10); diff --git a/gtk/decode_as_dlg.c b/gtk/decode_as_dlg.c index 7cc67a4902..3f1f161b07 100644 --- a/gtk/decode_as_dlg.c +++ b/gtk/decode_as_dlg.c @@ -543,7 +543,7 @@ decode_show_cb (GtkWidget * w _U_, gpointer data _U_) return; } - decode_show_w = dlg_window_new("Ethereal: Decode As: Show"); + decode_show_w = dlg_window_new("Wireshark: Decode As: Show"); /* Provide a minimum of a couple of rows worth of data */ gtk_window_set_default_size(GTK_WINDOW(decode_show_w), -1, E_DECODE_MIN_HEIGHT); @@ -1880,7 +1880,7 @@ decode_as_cb (GtkWidget * w _U_, gpointer data _U_) } requested_action = E_DECODE_YES; - decode_w = dlg_window_new("Ethereal: Decode As"); + decode_w = dlg_window_new("Wireshark: Decode As"); /* Provide a minimum of a couple of rows worth of data */ gtk_window_set_default_size(GTK_WINDOW(decode_w), -1, E_DECODE_MIN_HEIGHT); diff --git a/gtk/dfilter_expr_dlg.c b/gtk/dfilter_expr_dlg.c index 39ec91f8f1..fc48ad5291 100644 --- a/gtk/dfilter_expr_dlg.c +++ b/gtk/dfilter_expr_dlg.c @@ -1086,7 +1086,7 @@ dfilter_expr_dlg_new(GtkWidget *filter_te) GtkTreeSelection *l_sel; #endif - window = dlg_window_new("Ethereal: Filter Expression"); + window = dlg_window_new("Wireshark: Filter Expression"); gtk_window_set_default_size(GTK_WINDOW(window), 500, 400); gtk_container_set_border_width(GTK_CONTAINER(window), 5); diff --git a/gtk/dlg_utils.c b/gtk/dlg_utils.c index 54a4de8098..b939453e8c 100644 --- a/gtk/dlg_utils.c +++ b/gtk/dlg_utils.c @@ -332,7 +332,7 @@ static void dlg_destroy_cb(GtkWidget *dialog _U_, gpointer data _U_) } -/* Create a dialog box window that belongs to Ethereal's main window. */ +/* Create a dialog box window that belongs to Wireshark's main window. */ GtkWidget * dlg_window_new(const gchar *title) { diff --git a/gtk/dlg_utils.h b/gtk/dlg_utils.h index 79d4c4f9ee..71f515a0c9 100644 --- a/gtk/dlg_utils.h +++ b/gtk/dlg_utils.h @@ -29,7 +29,7 @@ * * Normal dialogs are created using dlg_window_new(). * - * - "About" about_ethereal_cb() + * - "About" about_wireshark_cb() * - "Capture Options" capture_prep() * - "Capture" capture_info_ui_create() * - "Interface Options" ifopts_edit_cb() @@ -70,7 +70,7 @@ #define __DLG_UTILS_H__ -/** Create a dialog box window that belongs to Ethereal's main window. +/** Create a dialog box window that belongs to Wireshark's main window. * If you want to create a window, use window_new() instead. * See window_new() for general window usage. * diff --git a/gtk/expert_comp_table.c b/gtk/expert_comp_table.c index 4a8bfcb674..2d32103dd1 100644 --- a/gtk/expert_comp_table.c +++ b/gtk/expert_comp_table.c @@ -284,7 +284,7 @@ error_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint call if (action != 6 && action != 7) { if (err->procedures[selection].fvalue_value==NULL) { if (action != 2 && action != 3 && action != 4) { - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Ethereal cannot create a filter on this item - %s, try using find instead.", err->procedures[selection].entries[2]); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Wireshark cannot create a filter on this item - %s, try using find instead.", err->procedures[selection].entries[2]); return; } } diff --git a/gtk/expert_dlg.c b/gtk/expert_dlg.c index fe086fe634..3fca66afc0 100644 --- a/gtk/expert_dlg.c +++ b/gtk/expert_dlg.c @@ -114,7 +114,7 @@ static void expert_dlg_display_reset(expert_tapdata_t * etd) gtk_clist_clear(etd->table); gtk_clist_columns_autosize(etd->table); - gtk_window_set_title(GTK_WINDOW(etd->win), "Ethereal: ? Expert Infos"); + gtk_window_set_title(GTK_WINDOW(etd->win), "Wireshark: ? Expert Infos"); gtk_label_set_text(GTK_LABEL(etd->label), "Please wait ..."); } @@ -275,7 +275,7 @@ expert_dlg_draw(void *data) gtk_label_set_text(GTK_LABEL(etd->label), title); g_free(title); - title = g_strdup_printf("Ethereal: %u Expert Info%s", + title = g_strdup_printf("Wireshark: %u Expert Info%s", etd->disp_events, plurality(etd->disp_events, "", "s")); gtk_window_set_title(GTK_WINDOW(etd->win), title); @@ -513,7 +513,7 @@ expert_dlg_init(const char *optarg, void* userdata _U_) etd->error_events = 0; etd->severity_report_level = PI_CHAT; - etd->win=window_new(GTK_WINDOW_TOPLEVEL, "Ethereal: Expert Info"); + etd->win=window_new(GTK_WINDOW_TOPLEVEL, "Wireshark: Expert Info"); gtk_window_set_default_size(GTK_WINDOW(etd->win), 650, 600); vbox=gtk_vbox_new(FALSE, 3); diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c index 0e1a8da3d7..d234f7004e 100644 --- a/gtk/file_dlg.c +++ b/gtk/file_dlg.c @@ -66,7 +66,7 @@ static void file_selection_browse_destroy_cb(GtkWidget *win, GtkWidget* file_te) /* Keys ... */ #define E_FS_CALLER_PTR_KEY "fs_caller_ptr" -/* Create a file selection dialog box window that belongs to Ethereal's +/* Create a file selection dialog box window that belongs to Wireshark's main window. */ #if (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION >= 4) || GTK_MAJOR_VERSION > 2 GtkWidget * diff --git a/gtk/file_dlg.h b/gtk/file_dlg.h index ead49086c2..ea90a3c911 100644 --- a/gtk/file_dlg.h +++ b/gtk/file_dlg.h @@ -59,7 +59,7 @@ typedef enum { FILE_SELECTION_WRITE_BROWSE /**< browse for a file to write to */ } file_selection_action_t; -/** Create a file selection dialog box window that belongs to Ethereal's +/** Create a file selection dialog box window that belongs to Wireshark's * main window. See window_new() for usage. * * @param title the title for the new file selection dialog diff --git a/gtk/fileset_dlg.c b/gtk/fileset_dlg.c index a0a01b0bd6..09940c8ca8 100644 --- a/gtk/fileset_dlg.c +++ b/gtk/fileset_dlg.c @@ -210,7 +210,7 @@ fileset_dlg_add_file(fileset_entry *entry) { gtk_widget_set_sensitive(fs_lb, entry->current); gtk_widget_show(fs_lb); - title = g_strdup_printf("Ethereal: %u File%s in Set", row, plurality(row, "", "s")); + title = g_strdup_printf("Wireshark: %u File%s in Set", row, plurality(row, "", "s")); gtk_window_set_title(GTK_WINDOW(fs_w), title); g_free(title); @@ -257,7 +257,7 @@ fileset_init_table(GtkWidget *parent) gtk_widget_hide(fs_tb); - gtk_window_set_title(GTK_WINDOW(fs_w), "Ethereal: 0 Files in Set"); + gtk_window_set_title(GTK_WINDOW(fs_w), "Wireshark: 0 Files in Set"); gtk_label_set(GTK_LABEL(fs_dir_lb), "No capture file loaded!"); diff --git a/gtk/filter_dlg.c b/gtk/filter_dlg.c index 162032fabc..fbfc527011 100644 --- a/gtk/filter_dlg.c +++ b/gtk/filter_dlg.c @@ -103,7 +103,7 @@ capture_filter_construct_cb(GtkWidget *w, gpointer user_data _U_) /* No Apply button, and "OK" just sets our text widget, it doesn't activate it (i.e., it doesn't cause us to try to open the file). */ static construct_args_t args = { - "Ethereal: Capture Filter", + "Wireshark: Capture Filter", FALSE, FALSE, FALSE @@ -193,7 +193,7 @@ cfilter_dialog_cb(GtkWidget *w _U_) /* No Apply button, and there's no text widget to set, much less activate, on "OK". */ static construct_args_t args = { - "Ethereal: Capture Filter", + "Wireshark: Capture Filter", FALSE, FALSE, FALSE @@ -222,7 +222,7 @@ void dfilter_dialog_cb(GtkWidget *w _U_) { static construct_args_t args = { - "Ethereal: Display Filter", + "Wireshark: Display Filter", TRUE, TRUE, FALSE diff --git a/gtk/find_dlg.c b/gtk/find_dlg.c index 624494f2b7..82aeb09d3d 100644 --- a/gtk/find_dlg.c +++ b/gtk/find_dlg.c @@ -123,7 +123,7 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_) /* No Apply button, but "OK" not only sets our text widget, it activates it (i.e., it causes us to do the search). */ static construct_args_t args = { - "Ethereal: Search Filter", + "Wireshark: Search Filter", FALSE, TRUE, FALSE @@ -135,7 +135,7 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_) return; } - find_frame_w = dlg_window_new("Ethereal: Find Packet"); + find_frame_w = dlg_window_new("Wireshark: Find Packet"); tooltips = gtk_tooltips_new (); diff --git a/gtk/flow_graph.c b/gtk/flow_graph.c index bc440aaa5d..fe6340c323 100644 --- a/gtk/flow_graph.c +++ b/gtk/flow_graph.c @@ -481,7 +481,7 @@ static void flow_graph_dlg_create (void) GtkTooltips *tooltips = gtk_tooltips_new(); - flow_graph_dlg_w=window_new(GTK_WINDOW_TOPLEVEL, "Ethereal: Flow Graph"); + flow_graph_dlg_w=window_new(GTK_WINDOW_TOPLEVEL, "Wireshark: Flow Graph"); gtk_window_set_default_size(GTK_WINDOW(flow_graph_dlg_w), 350, 150); diff --git a/gtk/follow_dlg.c b/gtk/follow_dlg.c index c7d6a02a39..ffa54523cc 100644 --- a/gtk/follow_dlg.c +++ b/gtk/follow_dlg.c @@ -1097,7 +1097,7 @@ follow_save_as_cmd_cb(GtkWidget *w _U_, gpointer data) return; } - new_win = file_selection_new("Ethereal: Save TCP Follow Stream As", + new_win = file_selection_new("Wireshark: Save TCP Follow Stream As", FILE_SELECTION_SAVE); follow_info->follow_save_as_w = new_win; diff --git a/gtk/funnel_stat.c b/gtk/funnel_stat.c index 99de2c04b7..77d13d711c 100644 --- a/gtk/funnel_stat.c +++ b/gtk/funnel_stat.c @@ -27,7 +27,7 @@ */ /* - * Most of the code here has been harvested from other ethereal gtk modules. + * Most of the code here has been harvested from other Wireshark gtk modules. * most from prefs_dlg.c and about_dlg.c */ diff --git a/gtk/goto_dlg.c b/gtk/goto_dlg.c index 33f2a3f440..7f0784c40d 100644 --- a/gtk/goto_dlg.c +++ b/gtk/goto_dlg.c @@ -51,7 +51,7 @@ goto_frame_cb(GtkWidget *w _U_, gpointer d _U_) GtkWidget *goto_frame_w, *main_vb, *fnumber_hb, *fnumber_lb, *fnumber_te, *bbox, *ok_bt, *cancel_bt, *help_bt; - goto_frame_w = dlg_window_new("Ethereal: Go To Packet"); + goto_frame_w = dlg_window_new("Wireshark: Go To Packet"); /* Container for each row of widgets */ main_vb = gtk_vbox_new(FALSE, 3); diff --git a/gtk/graph_analysis.c b/gtk/graph_analysis.c index e1b0bbbeeb..35dfa82e28 100644 --- a/gtk/graph_analysis.c +++ b/gtk/graph_analysis.c @@ -1,5 +1,5 @@ /* graph_analysis.c - * Graphic Analysis addition for ethereal + * Graphic Analysis addition for Wireshark * * $Id$ * @@ -73,7 +73,7 @@ /* XXX FIXME */ /* GTK-1.x does not have GDK_IS_DRAWABLE so just define is as always being true - * so that ethereal compiles. + * so that Wireshark compiles. * At later stage we should implement it as a real fallback for gtk-1.x * but for the time being us very few gtk-1.2 users at elast can compile. */ @@ -564,7 +564,7 @@ on_save_bt_clicked (GtkButton *button _U_, return; } - save_to_file_w = gtk_file_selection_new("Ethereal: Save graph to file"); + save_to_file_w = gtk_file_selection_new("Wireshark: Save graph to file"); /* Container for each row of widgets */ vertb = gtk_vbox_new(FALSE, 0); diff --git a/gtk/graph_analysis.h b/gtk/graph_analysis.h index 7fe5b02ce3..b8716c1f6d 100644 --- a/gtk/graph_analysis.h +++ b/gtk/graph_analysis.h @@ -1,5 +1,5 @@ /* graph_analysis.h - * Graphic Analysis addition for ethereal + * Graphic Analysis addition for Wireshark * * $Id$ * diff --git a/gtk/gtkglobals.h b/gtk/gtkglobals.h index 09cf5056ef..3099a06974 100644 --- a/gtk/gtkglobals.h +++ b/gtk/gtkglobals.h @@ -29,7 +29,7 @@ * * @section intro Introduction * - * Ethereal uses GTK (the Gimp ToolKit) as it's user interface toolkit. + * Wireshark uses GTK (the Gimp ToolKit) as its user interface toolkit. * * See Modules for a list of submodules. * diff --git a/gtk/gui_utils.c b/gtk/gui_utils.c index 552a8a789f..6020459766 100644 --- a/gtk/gui_utils.c +++ b/gtk/gui_utils.c @@ -99,11 +99,11 @@ static gboolean window_geom_load(const gchar *name, window_geometry_t *geom); specified by the WM_NAME property of a window or the resource or class name specified by the WM_CLASS property and base the choice of icon for the window on one of those; WM_CLASS for - Ethereal's windows has a resource name of "ethereal" and a class + Wireshark's windows has a resource name of "ethereal" and a class name of "Ethereal". However, the way that's done is window-manager- specific, and there's no way to determine what size a particular window manager would want, so there's no way to automate this as - part of the installation of Ethereal. + part of the installation of Wireshark. */ static void window_icon_realize_cb (GtkWidget *win, gpointer data _U_) @@ -126,7 +126,7 @@ window_icon_realize_cb (GtkWidget *win, gpointer data _U_) /* Create a new window, of the specified type, with the specified title - (if any) and the Ethereal icon. */ + (if any) and the Wireshark icon. */ GtkWidget * window_new(GtkWindowType type, const gchar *title) { diff --git a/gtk/gui_utils.h b/gtk/gui_utils.h index b6b42fb76f..017c31a2f1 100644 --- a/gtk/gui_utils.h +++ b/gtk/gui_utils.h @@ -96,7 +96,7 @@ * @todo Move these window functions to a new file win_utils.h? * @{ */ -/** Create a new window with the Ethereal icon. +/** Create a new window with the Wireshark icon. * If you want to create a dialog, use dlg_window_new() instead. * * @param type window type, typical GTK_WINDOW_TOPLEVEL @@ -275,7 +275,7 @@ extern void simple_list_append(GtkWidget *list, ...); extern void set_tree_styles_all(void); /** Convert an xpm picture into a GtkWidget showing it. - * Beware: Ethereal's main window must already be visible! + * Beware: Wireshark's main window must already be visible! * * @param xpm the character array containing the picture * @return a newly created GtkWidget showing the picture diff --git a/gtk/h225_counter.c b/gtk/h225_counter.c index d9536f3d5c..447fac787d 100644 --- a/gtk/h225_counter.c +++ b/gtk/h225_counter.c @@ -1,5 +1,5 @@ /* h225_counter.c - * h225 message counter for ethereal + * H.225 message counter for Wireshark * Copyright 2003 Lars Roland * * $Id$ @@ -520,7 +520,7 @@ gtk_h225counter_init(const char *optarg, void *userdata _U_) h225counter_reset(hs); - hs->win=window_new(GTK_WINDOW_TOPLEVEL, "Ethereal: H225 counters"); + hs->win=window_new(GTK_WINDOW_TOPLEVEL, "Wireshark: H.225 counters"); gtk_window_set_default_size(GTK_WINDOW(hs->win), 400, 200); hs->vbox=gtk_vbox_new(FALSE, 3); diff --git a/gtk/h225_ras_srt.c b/gtk/h225_ras_srt.c index d911928544..ae471316d6 100644 --- a/gtk/h225_ras_srt.c +++ b/gtk/h225_ras_srt.c @@ -1,5 +1,5 @@ /* h225_ras_srt.c - * h225 RAS Service Response Time statistics for ethereal + * H.225 RAS Service Response Time statistics for Wireshar * Copyright 2003 Lars Roland * * $Id$ diff --git a/gtk/help_dlg.c b/gtk/help_dlg.c index f64898cdf4..64429ddbd5 100644 --- a/gtk/help_dlg.c +++ b/gtk/help_dlg.c @@ -132,7 +132,7 @@ void help_dialog(void) return; } - help_w = window_new_with_geom(GTK_WINDOW_TOPLEVEL, "Ethereal: Help", "help"); + help_w = window_new_with_geom(GTK_WINDOW_TOPLEVEL, "Wireshark: Help", "help"); gtk_window_set_default_size(GTK_WINDOW(help_w), DEF_WIDTH, DEF_HEIGHT); gtk_container_border_width(GTK_CONTAINER(help_w), 2); diff --git a/gtk/help_dlg.h b/gtk/help_dlg.h index 33e788a3a2..4676af1257 100644 --- a/gtk/help_dlg.h +++ b/gtk/help_dlg.h @@ -5,7 +5,7 @@ * Laurent Deniel <laurent.deniel@free.fr> * * Wireshark - Network traffic analyzer - * By Gerald Combs <gerald@zing.org> + * By Gerald Combs <gerald@wireshark.org> * Copyright 2000 Gerald Combs * * This program is free software; you can redistribute it and/or diff --git a/gtk/io_stat.c b/gtk/io_stat.c index 863e000c5d..4d3beac0b9 100644 --- a/gtk/io_stat.c +++ b/gtk/io_stat.c @@ -176,7 +176,7 @@ io_stat_set_title(io_stat_t *io) if(!io->window){ return; } - title = g_strdup_printf("Ethereal IO Graphs: %s", cf_get_display_name(&cfile)); + title = g_strdup_printf("Wireshark IO Graphs: %s", cf_get_display_name(&cfile)); gtk_window_set_title(GTK_WINDOW(io->window), title); g_free(title); } @@ -1782,7 +1782,7 @@ create_filter_box(io_stat_graph_t *gio, GtkWidget *box, int num) /* filter prefs dialog */ gio->filter_bt=BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_DISPLAY_FILTER_ENTRY); - g_snprintf(str, 256, "Ethereal: Display Filter IO-Stat (Filter:%d)", num); + g_snprintf(str, 256, "Wireshark: Display Filter IO-Stat (Filter:%d)", num); if(gio->args->title){ g_free( (gpointer) (gio->args->title) ); } diff --git a/gtk/isprint.h b/gtk/isprint.h index c1dd32cefb..32ab151052 100644 --- a/gtk/isprint.h +++ b/gtk/isprint.h @@ -30,7 +30,7 @@ /** * XXX - "isprint()" can return "true" for non-ASCII characters, but * those don't work with GTK+ 1.3 or later, as they take UTF-8 strings - * as input. Until we fix up Ethereal to properly handle non-ASCII + * as input. Until we fix up Wireshark to properly handle non-ASCII * characters in all output (both GUI displays and text printouts) * in those versions of GTK+, we work around the problem by escaping * all characters that aren't printable ASCII. diff --git a/gtk/layout_prefs.c b/gtk/layout_prefs.c index c3a34c159d..ae6450ad75 100644 --- a/gtk/layout_prefs.c +++ b/gtk/layout_prefs.c @@ -557,7 +557,7 @@ layout_prefs_fetch(GtkWidget *w) void layout_prefs_apply(GtkWidget *w _U_) { - set_main_window_name("The Ethereal Network Analyzer"); + set_main_window_name("The Wireshark Network Analyzer"); main_widgets_rearrange(); } diff --git a/gtk/main.c b/gtk/main.c index c1df9c3b1e..4d64ce84ef 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -156,7 +156,7 @@ /* * Files under personal and global preferences directories in which - * GTK settings for Ethereal are stored. + * GTK settings for Wireshark are stored. */ #define RC_FILE "gtkrc" @@ -1119,7 +1119,7 @@ print_usage(gboolean print_ver) { if (print_ver) { output = stdout; - fprintf(output, "Ethereal " VERSION "%s\n" + fprintf(output, "Wireshark " VERSION "%s\n" "Interactively dump and analyze network traffic.\n" "See http://www.ethereal.com for more information.\n" "\n" @@ -1139,7 +1139,7 @@ print_usage(gboolean print_ver) { fprintf(output, " -s <snaplen> packet snapshot length (def: 65535)\n"); fprintf(output, " -p don't capture in promiscuous mode\n"); fprintf(output, " -k start capturing immediately (def: do nothing)\n"); - fprintf(output, " -Q quit Ethereal after capturing\n"); + fprintf(output, " -Q quit Wireshark after capturing\n"); fprintf(output, " -S update packet display when new packets are captured\n"); fprintf(output, " -l turn on automatic scrolling while -S is in use\n"); #ifdef _WIN32 @@ -1167,7 +1167,7 @@ print_usage(gboolean print_ver) { fprintf(output, "\n"); fprintf(output, "Processing:\n"); - fprintf(output, " -R <read filter> packet filter in Ethereal display filter syntax\n"); + fprintf(output, " -R <read filter> packet filter in Wireshark display filter syntax\n"); fprintf(output, " -n disable all name resolutions (def: all enabled)\n"); fprintf(output, " -N <name resolve flags> enable specific name resolution(s): \"mntC\"\n"); @@ -1271,7 +1271,7 @@ update_cb(gpointer data _U_) } #else -/* if these three functions are copied to gtk1 ethereal, since gtk1 does not +/* if these three functions are copied to gtk1 Wireshark, since gtk1 does not use threads all updte_thread_mutex can be dropped and protect/unprotect would just be empty functions. @@ -1353,7 +1353,7 @@ set_display_filename(capture_file *cf) g_free(status_msg); /* window title */ - win_name = g_strdup_printf("%s - Ethereal", name_ptr); + win_name = g_strdup_printf("%s - Wireshark", name_ptr); set_main_window_name(win_name); g_free(win_name); } @@ -1389,7 +1389,7 @@ main_cf_cb_file_closing(capture_file *cf) statusbar_pop_file_msg(); /* Restore the standard title bar message. */ - set_main_window_name("The Ethereal Network Analyzer"); + set_main_window_name("The Wireshark Network Analyzer"); /* Disable all menu items that make sense only if you have a capture. */ set_menus_for_capture_file(FALSE); @@ -1501,10 +1501,10 @@ main_cf_cb_live_capture_prepared(capture_options *capture_opts) if(capture_opts->iface) { - title = g_strdup_printf("%s: Capturing - Ethereal", + title = g_strdup_printf("%s: Capturing - Wireshark", get_interface_descriptive_name(capture_opts->iface)); } else { - title = g_strdup_printf("Capturing - Ethereal"); + title = g_strdup_printf("Capturing - Wireshark"); } set_main_window_name(title); g_free(title); @@ -1536,10 +1536,10 @@ main_cf_cb_live_capture_update_started(capture_options *capture_opts) /* We've done this in "prepared" above, but it will be cleared while switching to the next multiple file. */ if(capture_opts->iface) { - title = g_strdup_printf("%s: Capturing - Ethereal", + title = g_strdup_printf("%s: Capturing - Wireshark", get_interface_descriptive_name(capture_opts->iface)); } else { - title = g_strdup_printf("Capturing - Ethereal"); + title = g_strdup_printf("Capturing - Wireshark"); } set_main_window_name(title); g_free(title); @@ -1709,7 +1709,7 @@ main_cf_cb_live_capture_fixed_finished(capture_file *cf _U_) /* Restore the standard title bar message */ /* (just in case we have trouble opening the capture file). */ - set_main_window_name("The Ethereal Network Analyzer"); + set_main_window_name("The Wireshark Network Analyzer"); #if GTK_MAJOR_VERSION >= 2 if(icon_list == NULL) { @@ -2132,12 +2132,12 @@ main(int argc, char *argv[]) #endif /* We won't come till here, if we had a "console only" command line parameter. */ - splash_win = splash_new("Loading Ethereal ..."); + splash_win = splash_new("Loading Wireshark ..."); if (init_progfile_dir_error != NULL) { simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK, - "Can't get pathname of Ethereal: %s.\n" + "Can't get pathname of Wireshark: %s.\n" "It won't be possible to capture traffic.\n" - "Report this to the Ethereal developers.", + "Report this to the Wireshark developers.", init_progfile_dir_error); g_free(init_progfile_dir_error); } @@ -2508,7 +2508,7 @@ main(int argc, char *argv[]) if (arg_error) { #ifndef HAVE_LIBPCAP if (capture_option_specified) { - cmdarg_err("This version of Ethereal was not built with support for capturing packets."); + cmdarg_err("This version of Wireshark was not built with support for capturing packets."); } #endif print_usage(FALSE); @@ -2887,7 +2887,7 @@ create_console(void) the message(s) we put in there). */ atexit(destroy_console); - SetConsoleTitle(_T("Ethereal Debug Console")); + SetConsoleTitle(_T("Wireshark Debug Console")); } } @@ -3241,9 +3241,9 @@ welcome_new(void) gtk_box_pack_start(GTK_BOX(item_hb), icon, FALSE, FALSE, 5); #if GTK_MAJOR_VERSION < 2 - message = "Welcome to Ethereal!"; + message = "Welcome to Wireshark!"; #else - message = "<span weight=\"bold\" size=\"25000\">" "Welcome to Ethereal!" "</span>"; + message = "<span weight=\"bold\" size=\"25000\">" "Welcome to Wireshark!" "</span>"; #endif w = gtk_label_new(message); #if GTK_MAJOR_VERSION >= 2 @@ -3442,19 +3442,19 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs) GList *dfilter_list = NULL; GtkTooltips *tooltips; GtkAccelGroup *accel; - gchar *title; + gchar *title; /* Display filter construct dialog has an Apply button, and "OK" not only sets our text widget, it activates it (i.e., it causes us to filter the capture). */ static construct_args_t args = { - "Ethereal: Display Filter", + "Wireshark: Display Filter", TRUE, TRUE, FALSE }; /* use user-defined title if preference is set */ - title = create_user_window_title("The Ethereal Network Analyzer"); + title = create_user_window_title("The Wireshark Network Analyzer"); /* Main window */ top_level = window_new(GTK_WINDOW_TOPLEVEL, title); diff --git a/gtk/mcast_stream_dlg.c b/gtk/mcast_stream_dlg.c index ee5be8e20c..6d4f1dcbcc 100644 --- a/gtk/mcast_stream_dlg.c +++ b/gtk/mcast_stream_dlg.c @@ -403,7 +403,7 @@ mcast_on_params (GtkButton *button _U_, return; } - mcast_params_dlg = window_new(GTK_WINDOW_TOPLEVEL, "Ethereal: Set parameters for Multicast Stream Analysis"); + mcast_params_dlg = window_new(GTK_WINDOW_TOPLEVEL, "Wireshark: Set parameters for Multicast Stream Analysis"); gtk_window_set_default_size(GTK_WINDOW(mcast_params_dlg), 210, 210); gtk_widget_show(mcast_params_dlg); @@ -495,7 +495,7 @@ static void mcaststream_dlg_create (void) GtkWidget *column_lb; int i; - mcaststream_dlg_w = dlg_window_new("Ethereal: Multicast Streams"); + mcaststream_dlg_w = dlg_window_new("Wireshark: Multicast Streams"); gtk_window_set_default_size(GTK_WINDOW(mcaststream_dlg_w), 620, 400); main_vb = gtk_vbox_new (FALSE, 0); diff --git a/gtk/menu.c b/gtk/menu.c index 5eded936c6..525790045f 100644 --- a/gtk/menu.c +++ b/gtk/menu.c @@ -412,7 +412,7 @@ static GtkItemFactoryEntry menu_items[] = ITEM_FACTORY_ENTRY("/Help/Ethereal Online/Example Files", NULL, topic_menu_cb, ONLINEPAGE_SAMPLE_FILES, NULL, NULL), #endif ITEM_FACTORY_ENTRY("/Help/<separator>", NULL, NULL, 0, "<Separator>", NULL), - ITEM_FACTORY_STOCK_ENTRY("/Help/_About Ethereal", NULL, about_ethereal_cb, + ITEM_FACTORY_STOCK_ENTRY("/Help/_About Wireshark", NULL, about_wireshark_cb, 0, ETHEREAL_STOCK_ABOUT) }; diff --git a/gtk/mgcp_stat.c b/gtk/mgcp_stat.c index dad9b86455..4e0caae9c6 100644 --- a/gtk/mgcp_stat.c +++ b/gtk/mgcp_stat.c @@ -1,5 +1,5 @@ /* mgcp_stat.c - * mgcp-statistics for ethereal + * mgcp-statistics for Wireshark * Copyright 2003 Lars Roland * * $Id$ diff --git a/gtk/packet_list.c b/gtk/packet_list.c index 61b697d210..d9b6038058 100644 --- a/gtk/packet_list.c +++ b/gtk/packet_list.c @@ -427,7 +427,7 @@ packet_list_set_sel_browse(gboolean val) static GtkSelectionMode mode = GTK_SELECTION_MULTIPLE; /* Yeah, GTK uses "browse" in the case where we do not, but oh well. I - * think "browse" in Ethereal makes more sense than "SINGLE" in GTK+ */ + * think "browse" in Wireshark makes more sense than "SINGLE" in GTK+ */ new_mode = val ? GTK_SELECTION_SINGLE : GTK_SELECTION_BROWSE; if (mode == new_mode) { diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c index c1bf01a74d..4c25781a44 100644 --- a/gtk/prefs_dlg.c +++ b/gtk/prefs_dlg.c @@ -436,7 +436,7 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_) if the user presses "Cancel". */ copy_prefs(&saved_prefs, &prefs); - prefs_w = dlg_window_new("Ethereal: Preferences"); + prefs_w = dlg_window_new("Wireshark: Preferences"); /* * Unfortunately, we can't arrange that a GtkTable widget wrap an event box @@ -1299,7 +1299,7 @@ prefs_main_save_cb(GtkWidget *save_bt _U_, gpointer parent_w) 1) by saving the preferences they presumably indicate that they like them; - 2) the next time they fire Ethereal up, those preferences will + 2) the next time they fire Wireshark up, those preferences will apply; 3) we'd have to buffer "must_redissect" so that if they do diff --git a/gtk/print_dlg.c b/gtk/print_dlg.c index 131b02b5e9..0638b99467 100644 --- a/gtk/print_dlg.c +++ b/gtk/print_dlg.c @@ -153,7 +153,7 @@ file_print_cmd(gboolean print_selected) args->range.process = range_process_selected; } - print_win = open_print_dialog("Ethereal: Print", output_action_print, args); + print_win = open_print_dialog("Wireshark: Print", output_action_print, args); SIGNAL_CONNECT(print_win, "destroy", print_destroy_cb, &print_win); } @@ -213,7 +213,7 @@ export_text_cmd_cb(GtkWidget *widget _U_, gpointer data _U_) /* init the printing range */ packet_range_init(&args->range); - export_text_win = open_print_dialog("Ethereal: Export as \"Plain Text\" File", output_action_export_text, args); + export_text_win = open_print_dialog("Wireshark: Export as \"Plain Text\" File", output_action_export_text, args); SIGNAL_CONNECT(export_text_win, "destroy", print_destroy_cb, &export_text_win); } @@ -262,7 +262,7 @@ export_ps_cmd_cb(GtkWidget *widget _U_, gpointer data _U_) /* init the printing range */ packet_range_init(&args->range); - export_ps_win = open_print_dialog("Ethereal: Export as \"PostScript\" file", output_action_export_ps, args); + export_ps_win = open_print_dialog("Wireshark: Export as \"PostScript\" file", output_action_export_ps, args); SIGNAL_CONNECT(export_ps_win, "destroy", print_destroy_cb, &export_ps_win); } @@ -311,7 +311,7 @@ export_psml_cmd_cb(GtkWidget *widget _U_, gpointer data _U_) /* init the printing range */ packet_range_init(&args->range); - export_psml_win = open_print_dialog("Ethereal: Export as \"PSML\" file", output_action_export_psml, args); + export_psml_win = open_print_dialog("Wireshark: Export as \"PSML\" file", output_action_export_psml, args); SIGNAL_CONNECT(export_psml_win, "destroy", print_destroy_cb, &export_psml_win); } @@ -360,7 +360,7 @@ export_pdml_cmd_cb(GtkWidget *widget _U_, gpointer data _U_) /* init the printing range */ packet_range_init(&args->range); - export_pdml_win = open_print_dialog("Ethereal: Export as \"PDML\" file", output_action_export_pdml, args); + export_pdml_win = open_print_dialog("Wireshark: Export as \"PDML\" file", output_action_export_pdml, args); SIGNAL_CONNECT(export_pdml_win, "destroy", print_destroy_cb, &export_pdml_win); } @@ -407,14 +407,14 @@ export_csv_cmd_cb(GtkWidget *widget _U_, gpointer data _U_) /* init the printing range */ packet_range_init(&args->range); - export_csv_win = open_print_dialog("Ethereal: Export as \"Comma Separated Values\" File", output_action_export_csv, args); + export_csv_win = open_print_dialog("Wireshark: Export as \"Comma Separated Values\" File", output_action_export_csv, args); SIGNAL_CONNECT(export_csv_win, "destroy", print_destroy_cb, &export_csv_win); } static void print_browse_file_cb(GtkWidget *file_bt, GtkWidget *file_te) { - file_selection_browse(file_bt, file_te, "Ethereal: Print to File", + file_selection_browse(file_bt, file_te, "Wireshark: Print to File", FILE_SELECTION_WRITE_BROWSE); } diff --git a/gtk/print_prefs.c b/gtk/print_prefs.c index 1e6598c158..1e971aa7fb 100644 --- a/gtk/print_prefs.c +++ b/gtk/print_prefs.c @@ -137,7 +137,7 @@ GtkWidget * printer_prefs_show(void) static void printer_browse_file_cb(GtkWidget *file_bt, GtkWidget *file_te) { - file_selection_browse(file_bt, file_te, "Ethereal: Print to a File", + file_selection_browse(file_bt, file_te, "Wireshark: Print to a File", FILE_SELECTION_WRITE_BROWSE); } diff --git a/gtk/proto_dlg.c b/gtk/proto_dlg.c index 248e333cf4..1799b99bfe 100644 --- a/gtk/proto_dlg.c +++ b/gtk/proto_dlg.c @@ -113,7 +113,7 @@ proto_cb(GtkWidget *w _U_, gpointer data _U_) return; } - proto_w = dlg_window_new("Ethereal: Enabled Protocols"); + proto_w = dlg_window_new("Wireshark: Enabled Protocols"); gtk_window_set_default_size(GTK_WINDOW(proto_w), DEF_WIDTH * 2/3, DEF_HEIGHT); /* Container for each row of widgets */ diff --git a/gtk/proto_draw.c b/gtk/proto_draw.c index 8c688c0012..8511daa4db 100644 --- a/gtk/proto_draw.c +++ b/gtk/proto_draw.c @@ -971,7 +971,7 @@ void savehex_cb(GtkWidget * w _U_, gpointer data _U_) /* * Build the dialog box we need. */ - savehex_dlg = file_selection_new("Ethereal: Export Selected Packet Bytes", FILE_SELECTION_SAVE); + savehex_dlg = file_selection_new("Wireshark: Export Selected Packet Bytes", FILE_SELECTION_SAVE); /* label */ label = g_strdup_printf("Will save %u %s of raw binary data to specified file.", @@ -1569,7 +1569,7 @@ set_ptree_sel_browse(GtkWidget *tree, gboolean val) selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree)); #endif /* Yeah, GTK uses "browse" in the case where we do not, but oh well. - I think "browse" in Ethereal makes more sense than "SINGLE" in + I think "browse" in Wireshark makes more sense than "SINGLE" in GTK+ */ if (val) { #if GTK_MAJOR_VERSION < 2 diff --git a/gtk/proto_hier_stats_dlg.c b/gtk/proto_hier_stats_dlg.c index 00a6b4f1d1..29db845fc3 100644 --- a/gtk/proto_hier_stats_dlg.c +++ b/gtk/proto_hier_stats_dlg.c @@ -324,7 +324,7 @@ proto_hier_stats_cb(GtkWidget *w _U_, gpointer d _U_) return; } - dlg = window_new(GTK_WINDOW_TOPLEVEL, "Ethereal: Protocol Hierarchy Statistics"); + dlg = window_new(GTK_WINDOW_TOPLEVEL, "Wireshark: Protocol Hierarchy Statistics"); vbox = gtk_vbox_new(FALSE, 5); gtk_container_border_width(GTK_CONTAINER(vbox), 5); diff --git a/gtk/recent.c b/gtk/recent.c index 054279ef26..f4c3c226d9 100644 --- a/gtk/recent.c +++ b/gtk/recent.c @@ -133,9 +133,9 @@ write_recent(void) return FALSE; } - fputs("# Recent settings file for Ethereal " VERSION ".\n" + fputs("# Recent settings file for Wireshark " VERSION ".\n" "#\n" - "# This file is regenerated each time Ethereal is quit.\n" + "# This file is regenerated each time Wireshark is quit.\n" "# So be careful, if you want to make manual changes here.\n" "\n" "######## Recent capture files (latest last), cannot be altered through command line ########\n" diff --git a/gtk/rpc_progs.c b/gtk/rpc_progs.c index 5b226748e1..b5d225b4c1 100644 --- a/gtk/rpc_progs.c +++ b/gtk/rpc_progs.c @@ -22,8 +22,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* This module provides rpc call/reply SRT statistics to tethereal. - * It is only used by tethereal and not ethereal +/* This module provides rpc call/reply SRT statistics to Wireshark. + * It is only used by Wireshark and not Tethereal * * It serves as an example on how to use the tap api. */ diff --git a/gtk/rpc_stat.c b/gtk/rpc_stat.c index 42c57c7fc3..e2e90c1dc8 100644 --- a/gtk/rpc_stat.c +++ b/gtk/rpc_stat.c @@ -23,7 +23,7 @@ */ /* This module provides rpc call/reply SRT (Server Response Time) statistics - * to ethereal. + * to Wireshark. * * It serves as an example on how to use the tap api. */ @@ -427,7 +427,7 @@ gtk_rpcstat_cb(GtkWidget *w _U_, gpointer d _U_) return; } - dlg=dlg_window_new("Ethereal: Compute ONC-RPC SRT statistics"); + dlg=dlg_window_new("Wireshark: Compute ONC-RPC SRT statistics"); gtk_window_set_default_size(GTK_WINDOW(dlg), 300, -1); dlg_box=gtk_vbox_new(FALSE, 10); diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c index 2cd698fe91..4b37fc7941 100644 --- a/gtk/rtp_analysis.c +++ b/gtk/rtp_analysis.c @@ -1,5 +1,5 @@ /* rtp_analysis.c - * RTP analysis addition for ethereal + * RTP analysis addition for Wireshark * * $Id$ * @@ -2408,7 +2408,7 @@ static void save_csv_as_cb(GtkWidget *bt _U_, user_data_t *user_data _U_) return; } - user_data->dlg.save_csv_as_w = gtk_file_selection_new("Ethereal: Save Data As CSV"); + user_data->dlg.save_csv_as_w = gtk_file_selection_new("Wireshark: Save Data As CSV"); /* Container for each row of widgets */ vertb = gtk_vbox_new(FALSE, 0); @@ -2992,7 +2992,7 @@ static void on_save_bt_clicked(GtkWidget *bt _U_, user_data_t *user_data _U_) } /* XXX - use file_selection from dlg_utils instead! */ - user_data->dlg.save_voice_as_w = gtk_file_selection_new("Ethereal: Save Payload As ..."); + user_data->dlg.save_voice_as_w = gtk_file_selection_new("Wireshark: Save Payload As ..."); /* Container for each row of widgets */ vertb = gtk_vbox_new(FALSE, 0); @@ -3411,7 +3411,7 @@ static void create_rtp_dialog(user_data_t* user_data) column_arrows *col_arrows_fwd; column_arrows *col_arrows_rev; - window = window_new(GTK_WINDOW_TOPLEVEL, "Ethereal: RTP Stream Analysis"); + window = window_new(GTK_WINDOW_TOPLEVEL, "Wireshark: RTP Stream Analysis"); gtk_window_set_default_size(GTK_WINDOW(window), 700, 400); /* Container for each row of widgets */ diff --git a/gtk/rtp_analysis.h b/gtk/rtp_analysis.h index 8535ef7b35..f84407054d 100644 --- a/gtk/rtp_analysis.h +++ b/gtk/rtp_analysis.h @@ -1,5 +1,5 @@ /* rtp_analysis.h - * RTP analysis addition for ethereal + * RTP analysis addition for Wireshark * * $Id$ * diff --git a/gtk/rtp_stream.c b/gtk/rtp_stream.c index 39c7b19e12..61ac216b78 100644 --- a/gtk/rtp_stream.c +++ b/gtk/rtp_stream.c @@ -1,5 +1,5 @@ /* rtp_stream.c - * RTP streams summary addition for ethereal + * RTP streams summary addition for Wireshark * * $Id$ * diff --git a/gtk/rtp_stream.h b/gtk/rtp_stream.h index 1ba4a1ac23..c5493c1a2f 100644 --- a/gtk/rtp_stream.h +++ b/gtk/rtp_stream.h @@ -1,5 +1,5 @@ /* rtp_stream.h - * RTP streams summary addition for ethereal + * RTP streams summary addition for Wireshark * * $Id$ * diff --git a/gtk/rtp_stream_dlg.c b/gtk/rtp_stream_dlg.c index 8b5f7f8a2d..dc75ba1833 100644 --- a/gtk/rtp_stream_dlg.c +++ b/gtk/rtp_stream_dlg.c @@ -1,5 +1,5 @@ /* rtp_stream_dlg.c - * RTP streams summary addition for ethereal + * RTP streams summary addition for Wireshark * * $Id$ * @@ -315,7 +315,7 @@ rtpstream_on_save (GtkButton *button _U_, } /* XXX - use file_selection from dlg_utils instead! */ - rtpstream_save_dlg = gtk_file_selection_new("Ethereal: Save selected stream in rtpdump ('-F dump') format"); + rtpstream_save_dlg = gtk_file_selection_new("Wireshark: Save selected stream in rtpdump ('-F dump') format"); /* Container for each row of widgets */ vertb = gtk_vbox_new(FALSE, 0); @@ -663,7 +663,7 @@ static void rtpstream_dlg_create (void) GtkWidget *column_lb; int i; - rtpstream_dlg_w = dlg_window_new("Ethereal: RTP Streams"); + rtpstream_dlg_w = dlg_window_new("Wireshark: RTP Streams"); gtk_window_set_default_size(GTK_WINDOW(rtpstream_dlg_w), 620, 200); main_vb = gtk_vbox_new (FALSE, 0); diff --git a/gtk/rtp_stream_dlg.h b/gtk/rtp_stream_dlg.h index 2884b690e5..47592905c3 100644 --- a/gtk/rtp_stream_dlg.h +++ b/gtk/rtp_stream_dlg.h @@ -1,5 +1,5 @@ /* rtp_stream_dlg.h - * RTP streams summary addition for ethereal + * RTP streams summary addition for Wireshark * * $Id$ * diff --git a/gtk/scsi_stat.c b/gtk/scsi_stat.c index b7b5f4d9fc..db8445f00b 100644 --- a/gtk/scsi_stat.c +++ b/gtk/scsi_stat.c @@ -23,7 +23,7 @@ */ /* This module provides rpc call/reply SRT (Server Response Time) statistics - * to ethereal. + * to Wireshark. */ #ifdef HAVE_CONFIG_H @@ -313,7 +313,7 @@ gtk_scsistat_cb(GtkWidget *w _U_, gpointer d _U_) return; } - dlg=dlg_window_new("Ethereal: Compute SCSI SRT statistics"); + dlg=dlg_window_new("Wireshark: Compute SCSI SRT statistics"); gtk_window_set_default_size(GTK_WINDOW(dlg), 300, -1); dlg_box=gtk_vbox_new(FALSE, 10); diff --git a/gtk/sctp_chunk_stat.c b/gtk/sctp_chunk_stat.c index eecbf55b53..b95c9903a7 100644 --- a/gtk/sctp_chunk_stat.c +++ b/gtk/sctp_chunk_stat.c @@ -1,5 +1,5 @@ /* sctp_chunk_stat.c - * SCTP chunk counter for ethereal + * SCTP chunk counter for Wireshark * Copyright 2005 Oleg Terletsky oleg.terletsky@comverse.com * * $Id$ @@ -299,7 +299,7 @@ sctpstat_init(const char *optarg, void *userdata _U_) hs->number_of_packets = 0; sctpstat_reset(hs); - hs->win=window_new(GTK_WINDOW_TOPLEVEL, "Ethereal: SCTP Chunk Statistics"); + hs->win=window_new(GTK_WINDOW_TOPLEVEL, "Wireshark: SCTP Chunk Statistics"); gtk_window_set_default_size(GTK_WINDOW(hs->win), 600, 200); hs->vbox=gtk_vbox_new(FALSE, 3); diff --git a/gtk/sctp_error_dlg.c b/gtk/sctp_error_dlg.c index 0489770d15..b9f09f1c16 100644 --- a/gtk/sctp_error_dlg.c +++ b/gtk/sctp_error_dlg.c @@ -152,7 +152,7 @@ gtk_sctperror_dlg(void) GtkWidget *column_lb; int i; - sctp_error_dlg_w = window_new (GTK_WINDOW_TOPLEVEL, "Ethereal: SCTP Associations"); + sctp_error_dlg_w = window_new (GTK_WINDOW_TOPLEVEL, "Wireshark: SCTP Associations"); gtk_window_set_position (GTK_WINDOW (sctp_error_dlg_w), GTK_WIN_POS_CENTER); SIGNAL_CONNECT(sctp_error_dlg_w, "destroy", dlg_destroy,NULL); diff --git a/gtk/sctp_stat_dlg.c b/gtk/sctp_stat_dlg.c index fc51798a33..18dc0d36fa 100644 --- a/gtk/sctp_stat_dlg.c +++ b/gtk/sctp_stat_dlg.c @@ -447,7 +447,7 @@ gtk_sctpstat_dlg(void) GtkWidget *column_lb; gint i; - sctp_stat_dlg_w = window_new (GTK_WINDOW_TOPLEVEL, "Ethereal: SCTP Associations"); + sctp_stat_dlg_w = window_new (GTK_WINDOW_TOPLEVEL, "Wireshark: SCTP Associations"); gtk_window_set_position (GTK_WINDOW (sctp_stat_dlg_w), GTK_WIN_POS_CENTER); SIGNAL_CONNECT(sctp_stat_dlg_w, "destroy", dlg_destroy,NULL); diff --git a/gtk/simple_dialog.c b/gtk/simple_dialog.c index acbc186c48..da04a1ae1d 100644 --- a/gtk/simple_dialog.c +++ b/gtk/simple_dialog.c @@ -123,14 +123,14 @@ display_simple_dialog(gint type, gint btn_mask, char *message) * shouldn't say "error", as that provides no useful information. * * So we give it a title on Win32, and don't give it one on UN*X. - * For now, we give it a Win32 title of just "Ethereal"; we should + * For now, we give it a Win32 title of just "Wireshark"; we should * arguably take an argument for the title. */ if(btn_mask == ESD_BTN_NONE) { win = splash_window_new(); } else { #ifdef _WIN32 - win = dlg_window_new("Ethereal"); + win = dlg_window_new("Wireshark"); #else win = dlg_window_new(""); #endif diff --git a/gtk/ssl-dlg.c b/gtk/ssl-dlg.c index 44787804ce..6bbb6b641e 100644 --- a/gtk/ssl-dlg.c +++ b/gtk/ssl-dlg.c @@ -914,7 +914,7 @@ follow_save_as_cmd_cb(GtkWidget *w _U_, gpointer data) return; } - new_win = file_selection_new("Ethereal: Save SSL Follow Stream As", + new_win = file_selection_new("Wireshark: Save SSL Follow Stream As", FILE_SELECTION_SAVE); follow_info->follow_save_as_w = new_win; diff --git a/gtk/summary_dlg.c b/gtk/summary_dlg.c index 828b4ddef4..ae6af94a7f 100644 --- a/gtk/summary_dlg.c +++ b/gtk/summary_dlg.c @@ -121,7 +121,7 @@ summary_open_cb(GtkWidget *w _U_, gpointer d _U_) seconds = summary.stop_time - summary.start_time; disp_seconds = summary.filtered_stop - summary.filtered_start; - sum_open_w = window_new(GTK_WINDOW_TOPLEVEL, "Ethereal: Summary"); + sum_open_w = window_new(GTK_WINDOW_TOPLEVEL, "Wireshark: Summary"); /* Container for each row of widgets */ main_vb = gtk_vbox_new(FALSE, 12); diff --git a/gtk/supported_protos_dlg.c b/gtk/supported_protos_dlg.c index 1099d667f0..30d8437354 100644 --- a/gtk/supported_protos_dlg.c +++ b/gtk/supported_protos_dlg.c @@ -43,11 +43,11 @@ static const char *proto_supported = "The following %d protocols (and packet types) are currently\n" -"supported by Ethereal:\n\n"; +"supported by Wireshark:\n\n"; static const char *dfilter_supported = "The following per-protocol fields are currently supported by\n" -"Ethereal and can be used in display filters:\n"; +"Wireshark and can be used in display filters:\n"; @@ -92,7 +92,7 @@ void supported_cb(GtkWidget *w _U_, gpointer data _U_) return; } - supported_w = window_new(GTK_WINDOW_TOPLEVEL, "Ethereal: Supported Protocols"); + supported_w = window_new(GTK_WINDOW_TOPLEVEL, "Wireshark: Supported Protocols"); gtk_window_set_default_size(GTK_WINDOW(supported_w), DEF_WIDTH * 2/3, DEF_HEIGHT * 2/3); gtk_container_border_width(GTK_CONTAINER(supported_w), 2); diff --git a/gtk/t38_analysis.c b/gtk/t38_analysis.c index 55f99fbb0f..83ab77397f 100644 --- a/gtk/t38_analysis.c +++ b/gtk/t38_analysis.c @@ -1,5 +1,5 @@ /* t38_analysis.c - * t38 fax analysis for ethereal + * T.38 fax analysis for Wireshark * * $Id$ * diff --git a/gtk/tap_dfilter_dlg.c b/gtk/tap_dfilter_dlg.c index 4c5c7ee47e..0c5eb56abe 100644 --- a/gtk/tap_dfilter_dlg.c +++ b/gtk/tap_dfilter_dlg.c @@ -94,7 +94,7 @@ void tap_dfilter_dlg_update (void) while(dialog != NULL) { if(dialog->dlg) { - title = g_strdup_printf("Ethereal: %s: %s", dialog->cont.win_title , cf_get_display_name(&cfile)); + title = g_strdup_printf("Wireshark: %s: %s", dialog->cont.win_title , cf_get_display_name(&cfile)); gtk_window_set_title(GTK_WINDOW(dialog->dlg), title); g_free(title); } @@ -183,7 +183,7 @@ tap_dfilter_dlg_cb(GtkWidget *w _U_, gpointer data) return; } - title = g_strdup_printf("Ethereal: %s: %s", current_dlg->cont.win_title , cf_get_display_name(&cfile)); + title = g_strdup_printf("Wireshark: %s: %s", current_dlg->cont.win_title , cf_get_display_name(&cfile)); current_dlg->dlg=dlg_window_new(title); gtk_window_set_default_size(GTK_WINDOW(current_dlg->dlg), 300, -1); diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c index ccd990284c..26cec19772 100644 --- a/gtk/tcp_graph.c +++ b/gtk/tcp_graph.c @@ -472,7 +472,7 @@ static int rint (double ); /* compiler template for Windows */ static char helptext[] = #ifndef _WIN32 "Here's what you can do:\n\ -- Left Mouse Button selects segment in ethereal's packet list\n\ +- Left Mouse Button selects segment in Wireshark's packet list\n\ - Middle Mouse Button zooms in\n\ - <shift>-Middle Button zooms out\n\ - Right Mouse Button moves the graph (if zoomed in)\n\ @@ -483,7 +483,7 @@ static char helptext[] = "; #else /* _WIN32 */ "Here's what you can do:\n\ -- <ctrl>-Left Mouse Button selects segment in ethereal's packet list\n\ +- <ctrl>-Left Mouse Button selects segment in Wireshark's packet list\n\ - Left Mouse Button zooms in\n\ - <shift>-Left Mouse Button zooms out\n\ - Right Mouse Button moves the graph (if zoomed in)\n\ @@ -536,7 +536,7 @@ static void create_text_widget (struct graph *g) GtkWidget *streamwindow, *txt_scrollw, *box; debug(DBS_FENTRY) puts ("create_text_widget()"); - streamwindow = dlg_window_new ("Ethereal: Packet chain"); + streamwindow = dlg_window_new ("Wireshark: Packet chain"); gtk_widget_set_name (streamwindow, "Packet chain"); WIDGET_SET_SIZE(streamwindow, TXT_WIDTH, TXT_HEIGHT); gtk_container_border_width (GTK_CONTAINER(streamwindow), 2); @@ -833,7 +833,7 @@ static void control_panel_create (struct graph *g) control_panel_add_graph_type_page (g, notebook); g_snprintf (window_title, WINDOW_TITLE_LENGTH, - "Graph %d - Control - Ethereal", refnum); + "Graph %d - Control - Wireshark", refnum); toplevel = dlg_window_new ("tcp-graph-control"); gtk_window_set_title(GTK_WINDOW(toplevel), window_title); diff --git a/gtk/toolbar.c b/gtk/toolbar.c index 9711eb4ce6..25c26763f5 100644 --- a/gtk/toolbar.c +++ b/gtk/toolbar.c @@ -24,11 +24,11 @@ */ /* - * This file implements a "main" toolbar for Ethereal (suitable for gtk1 and + * This file implements a "main" toolbar for Wireshark (suitable for gtk1 and * gtk2). * * As it is desirable to have the same toolbar implementation for gtk1 and gtk2 - * in Ethereal, only those library calls available in the gtk1 libraries + * in Wireshark, only those library calls available in the gtk1 libraries * are used inside this file. * * Hint: gtk2 in comparison to gtk1 has a better way to handle with "common" @@ -108,7 +108,7 @@ #include "../image/toolbar/capture_filter_24.xpm" #endif /* HAVE_LIBPCAP */ #include "../image/toolbar/display_filter_24.xpm" -/* these icons are standard stock icons, but used for ethereal specific stock icon labels */ +/* these icons are standard stock icons, but used for Wireshark specific stock icon labels */ #if GTK_MAJOR_VERSION >= 2 #include "../image/toolbar/stock_add_24.xpm" #endif @@ -166,7 +166,7 @@ typedef struct stock_pixmap_tag{ } stock_pixmap_t; /* generate application specific stock items */ -static void ethereal_stock_icons(void) { +static void wireshark_stock_icons(void) { GtkIconFactory * factory; gint32 i; @@ -486,7 +486,7 @@ toolbar_new(void) #if GTK_MAJOR_VERSION >= 2 /* create application specific stock icons */ - ethereal_stock_icons(); + wireshark_stock_icons(); #endif /* this function should be only called once! */ diff --git a/gtk/voip_calls.c b/gtk/voip_calls.c index fd1f6967e6..cbf06e795e 100644 --- a/gtk/voip_calls.c +++ b/gtk/voip_calls.c @@ -1,5 +1,5 @@ /* voip_calls.c - * VoIP calls summary addition for ethereal + * VoIP calls summary addition for Wireshark * * $Id$ * diff --git a/gtk/voip_calls.h b/gtk/voip_calls.h index 6a8caa70a4..407e6a47cc 100644 --- a/gtk/voip_calls.h +++ b/gtk/voip_calls.h @@ -1,5 +1,5 @@ /* voip_calls.h - * VoIP calls summary addition for ethereal + * VoIP calls summary addition for Wireshark * * $Id$ * @@ -45,19 +45,19 @@ /* defines voip call state */ typedef enum _voip_call_state { VOIP_CALL_SETUP, - VOIP_RINGING, + VOIP_RINGING, VOIP_IN_CALL, VOIP_CANCELLED, VOIP_COMPLETED, VOIP_REJECTED, - VOIP_UNKNOWN + VOIP_UNKNOWN } voip_call_state; extern const char *voip_call_state_name[7]; typedef enum _voip_call_active_state { - VOIP_ACTIVE, - VOIP_INACTIVE + VOIP_ACTIVE, + VOIP_INACTIVE } voip_call_active_state; typedef enum _voip_protocol { diff --git a/gtk/voip_calls_dlg.c b/gtk/voip_calls_dlg.c index 17ebda4a57..8c925c630b 100644 --- a/gtk/voip_calls_dlg.c +++ b/gtk/voip_calls_dlg.c @@ -1,5 +1,5 @@ /* voip_calls_dlg.c - * VoIP calls summary addition for ethereal + * VoIP calls summary addition for Wireshark * * $Id$ * @@ -555,7 +555,7 @@ static void voip_calls_dlg_create (void) GtkWidget *column_lb; int i; - voip_calls_dlg_w=window_new(GTK_WINDOW_TOPLEVEL, "Ethereal: VoIP Calls"); + voip_calls_dlg_w=window_new(GTK_WINDOW_TOPLEVEL, "Wireshark: VoIP Calls"); gtk_window_set_default_size(GTK_WINDOW(voip_calls_dlg_w), 840, 350); diff --git a/gtk/voip_calls_dlg.h b/gtk/voip_calls_dlg.h index eeda170c1b..1c16e53ff9 100644 --- a/gtk/voip_calls_dlg.h +++ b/gtk/voip_calls_dlg.h @@ -1,5 +1,5 @@ /* voip_calls_dlg.h - * VoIP conversations addition for ethereal + * VoIP conversations addition for Wireshark * * $Id$ * diff --git a/gtk/webbrowser.c b/gtk/webbrowser.c index e0be890eb3..debd00bff1 100644 --- a/gtk/webbrowser.c +++ b/gtk/webbrowser.c @@ -21,11 +21,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* Ethereal - this file is copied from "The GIMP" V2.0.2 +/* Wireshark - this file is copied from "The GIMP" V2.0.2 * You will find the original file in the gimp distribution zip under: * \plug-ins\common\webbrowser.c * - * It was modified to suit the Ethereal environment (#if 0)! + * It was modified to suit the Wireshark environment (#if 0)! */ #include "config.h" @@ -43,8 +43,8 @@ /* * For GNOME 2.x, we might be able to use "gnome_url_show()" (when we offer - * the ability to build a GNOMEified Ethereal as well as a GTK+-only - * Ethereal). + * the ability to build a GNOMEified Wireshark as well as a GTK+-only + * Wireshark). */ #if defined(G_OS_WIN32) @@ -197,7 +197,7 @@ browser_open_url (const gchar *url) XXX - has to be improved */ simple_dialog(ESD_TYPE_INFO, ESD_BTN_OK, PRIMARY_TEXT_START "Web browser access not implemented." PRIMARY_TEXT_END - "\n\nThis Ethereal version (using the GLib 1.x toolkit) can't access web browsers. " + "\n\nThis Wireshark version (using the GLib 1.x toolkit) can't access web browsers. " "\n\nYou may try to open the following URL in your web browser: \n\n" "%s", url); diff --git a/gtk/win32-file-dlg.c b/gtk/win32-file-dlg.c index 83411e0c95..519b677f1b 100644 --- a/gtk/win32-file-dlg.c +++ b/gtk/win32-file-dlg.c @@ -79,14 +79,14 @@ typedef enum { */ #define FILE_TYPES_OPEN \ _T("Accellent 5Views (*.5vw)\0") _T("*.5vw\0") \ - _T("Ethereal/tcpdump (*.cap, *.pcap)\0") _T("*.cap;*.pcap\0") \ + _T("Wireshark/tcpdump (*.cap, *.pcap)\0") _T("*.cap;*.pcap\0") \ _T("Novell LANalyzer (*.tr1)\0") _T("*.tr1\0") \ _T("NG/NAI Sniffer (*.cap, *.enc, *.trc)\0") _T("*.cap;*.enc;*.trc\0") \ _T("Sun snoop (*.snoop)\0") _T("*.snoop\0") \ _T("WildPackets EtherPeek (*.pkt)\0") _T("*.pkt\0") \ _T("All Files (*.*)\0") _T("*.*\0") -#define FILE_OPEN_DEFAULT 2 /* Ethereal/tcpdump */ +#define FILE_OPEN_DEFAULT 2 /* Wireshark/tcpdump */ #define FILE_TYPES_SAVE FILE_TYPES_OPEN @@ -174,7 +174,7 @@ win32_open_file (HWND h_wnd) { } else { ofn.lpstrInitialDir = NULL; } - ofn.lpstrTitle = _T("Ethereal: Select a capture file"); + ofn.lpstrTitle = _T("Wireshark: Select a capture file"); ofn.Flags = OFN_ENABLESIZING | OFN_ENABLETEMPLATE | OFN_EXPLORER | OFN_NOCHANGEDIR | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_ENABLEHOOK; @@ -227,7 +227,7 @@ win32_save_as_file(HWND h_wnd, action_after_save_e action_after_save, gpointer a } else { ofn.lpstrInitialDir = NULL; } - ofn.lpstrTitle = _T("Ethereal: Save file as"); + ofn.lpstrTitle = _T("Wireshark: Save file as"); ofn.Flags = OFN_ENABLESIZING | OFN_ENABLETEMPLATE | OFN_EXPLORER | OFN_NOCHANGEDIR | OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST | OFN_ENABLEHOOK; @@ -318,7 +318,7 @@ win32_merge_file (HWND h_wnd) { } else { ofn.lpstrInitialDir = NULL; } - ofn.lpstrTitle = _T("Ethereal: Merge with capture file"); + ofn.lpstrTitle = _T("Wireshark: Merge with capture file"); ofn.Flags = OFN_ENABLESIZING | OFN_ENABLETEMPLATE | OFN_EXPLORER | OFN_NOCHANGEDIR | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_ENABLEHOOK; @@ -420,7 +420,7 @@ win32_export_file(HWND h_wnd, export_type_e export_type) { } else { ofn.lpstrInitialDir = NULL; } - ofn.lpstrTitle = _T("Ethereal: Export"); + ofn.lpstrTitle = _T("Wireshark: Export"); ofn.Flags = OFN_ENABLESIZING | OFN_ENABLETEMPLATE | OFN_EXPLORER | OFN_NOCHANGEDIR | OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST | OFN_ENABLEHOOK; @@ -519,7 +519,7 @@ win32_export_raw_file(HWND h_wnd) { } else { ofn.lpstrInitialDir = NULL; } - ofn.lpstrTitle = _T("Ethereal: Export Raw Data"); + ofn.lpstrTitle = _T("Wireshark: Export Raw Data"); ofn.Flags = OFN_ENABLESIZING | OFN_ENABLETEMPLATE | OFN_EXPLORER | OFN_NOCHANGEDIR | OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST | OFN_ENABLEHOOK; @@ -577,7 +577,7 @@ win32_export_color_file(HWND h_wnd) { ofn.lpstrFileTitle = NULL; ofn.nMaxFileTitle = 0; ofn.lpstrInitialDir = NULL; - ofn.lpstrTitle = _T("Ethereal: Export Color Filters"); + ofn.lpstrTitle = _T("Wireshark: Export Color Filters"); ofn.Flags = OFN_ENABLESIZING | OFN_EXPLORER | OFN_NOCHANGEDIR | OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST | OFN_ENABLEHOOK; @@ -618,7 +618,7 @@ win32_import_color_file(HWND h_wnd) { ofn.lpstrFileTitle = NULL; ofn.nMaxFileTitle = 0; ofn.lpstrInitialDir = NULL; - ofn.lpstrTitle = _T("Ethereal: Import Color Filters"); + ofn.lpstrTitle = _T("Wireshark: Import Color Filters"); ofn.Flags = OFN_ENABLESIZING | OFN_EXPLORER | OFN_NOCHANGEDIR | OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST | OFN_ENABLEHOOK; diff --git a/gtk/wsp_stat.c b/gtk/wsp_stat.c index 08250e5087..6b52fb3ff3 100644 --- a/gtk/wsp_stat.c +++ b/gtk/wsp_stat.c @@ -344,10 +344,10 @@ gtk_wspstat_init(const char *optarg, void *userdata _U_) sp->pdu_stats=g_malloc( (sp->num_pdus+1) * sizeof( wsp_pdu_t) ); if(filter){ sp->filter=g_strdup(filter); - title=g_strdup_printf("Ethereal: WAP-WSP statistics with filter: %s", filter); + title=g_strdup_printf("Wireshark: WAP-WSP statistics with filter: %s", filter); } else { sp->filter=NULL; - title=g_strdup("Ethereal: WAP-WSP statistics"); + title=g_strdup("Wireshark: WAP-WSP statistics"); } for (i=0;i<=sp->num_pdus; i++) { |