Get rid of a bunch of "Ethereal"s and "ethereal"s in comments, GUI

strings, and function names.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18205 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/gtk/about_dlg.c b/gtk/about_dlg.c
index 024225ca0bc5c38bda27d0aea0ee935f5c269328..a9e21945d4700bace04e9140351fe475c92490da 100644 (file)
--- a/gtk/about_dlg.c
+++ b/gtk/about_dlg.c
@@ -47,20 +47,20 @@
 #include "main.h"
 #include "plugins_dlg.h"
 
 #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.
  */
  * creating a new one.
  */

-static GtkWidget *about_ethereal_w;
+static GtkWidget *about_wireshark_w;

 
 
 static void
 
 
 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
 {
   GtkWidget   *msg_label, *icon;
 #if GTK_MAJOR_VERSION >= 2


@@ -90,7 +90,7 @@ splash_new(char *message)
 
     win = splash_window_new();
 
 
     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. */
        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);
 
     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);
 
     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 *
 
 
 static GtkWidget *

-about_ethereal_page_new(void)
+about_wireshark_page_new(void)

 {
   GtkWidget   *main_vb, *msg_label /*, *icon*/;
   gchar       *message;
 {
   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);
 
   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(
 
   /* Construct the message string */
   message = g_strdup_printf(


@@ -160,7 +160,7 @@ about_ethereal_page_new(void)
        "\n"
        "%s"
        "\n"
        "\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,
        "\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
 
 
 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;
 
 {
   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
 
   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;
   }
 
     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.)
    */
    * 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
   /* 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
 #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 */
 #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);
 
   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);
 
 
   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
   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);
   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
 }
 
 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 65070a22a39a0c73ff020746a7e70da15ba69725..7744865690bbe24b50616bb2cf3e454e0391bc84 100644 (file)
--- a/gtk/about_dlg.h
+++ b/gtk/about_dlg.h
@@ -30,7 +30,7 @@
  *  @ingroup dialog_group
  */
 
  *  @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
  *
  * @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
  */
  * @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__ */
 
 
 #endif /* __ABOUT_DLG_H__ */

diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c
index 4cfd652fcd254e3fae5c28fbc624c02f530ae508..4f205d3119066a300dd87ae949fa9b770a21cff0 100644 (file)
--- 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;
 
   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;
     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 */
   }
 
   /* 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);
 
   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"
                         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;
         }
                         "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) {
 #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);
 
          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)
 {
 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
      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);
 
   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]) {
   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 0865e98faff29d5a10af52c22386e936033b6b2a..391a84273698e68b6f20c44d7e127df4ef0206c3 100644 (file)
--- 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 = {
   /* 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
        FALSE,
        FALSE,
     TRUE


@@ -452,7 +452,7 @@ file_open_cmd(GtkWidget *w)
     return;
   }
 
     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,
                                    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 = {
   /* 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
        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;
 
   /* 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,
                                    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 */
   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
                                        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;
   }
 
     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
                                            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;
 
   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 */
                                            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 8302ddfe061dcf6cdb4bc73bd0f21039322efee6..f3939a9ff58683a965cdc74d4ce1255d7b67f369 100644 (file)
--- 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 */
     }
 
     /* 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);
 
     /* 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 a03851cf0688252148c609d93dc2b0134be1e7fc..279b3bb8e5247b08bd81ca667ebe2c8cef274049 100644 (file)
--- 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;
 
   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;
     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;
   }
 
     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();
 
 
   tooltips = gtk_tooltips_new();
 

diff --git a/gtk/capture_info_dlg.c b/gtk/capture_info_dlg.c
index f1b2e8dfd88b699933fb54447fca00aba7c725a9..cb939df3f9474dbbec0d12e46768fd4b4986cbb0 100644 (file)
--- 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);
    * 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);
   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 7137985ecdf4717716e0715e26cf0f762debb3bb..881ac7469411a371bb5605ed0efbc4c82125a5ee 100644 (file)
--- 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 */
        }
        
        /* 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);
     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 19887a7db40a628c2d5305e0732e6b1cbeb9f7e5..fadcb7b4c316f0b097fb0ca22263dfff45d0a69a 100644 (file)
--- 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. */
   /* 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);
   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 */
     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;
     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;
 
   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;
         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);
         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 1bc8b077ef6d0f818014df3e7861230f0140afa2..743ed2342753840ef0478132186c18116d04c6c0 100644 (file)
--- 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\" "
   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);
   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 78dbcfa940b7ee8aad9fa3aeded33b9847f0e106..49d7a6b04b2d8c9c12c8d61a60c96f3f7df3323c 100644 (file)
--- 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_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
 #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);
 
 #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 5c5c6ce0ac17d1a9d5bf45f65076f0531eb97da2..e39883250a5b298c836a166ff6074213ef1430a3 100644 (file)
--- 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.
  */
 
  * 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.
  * 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.
  */
  *
  * 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;
        }
 
                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);
        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 7cc67a490272190bb98e37e04b828c065e118ea9..3f1f161b073c9fc5b5338b2169590de6ca4dd14c 100644 (file)
--- 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;
     }
 
        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);
 
        /* 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;
     }
 
     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);
 
        /* 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 39ec91f8f10f15d2ea9f2e3697120369d4b7e636..fc48ad52914820d3d570f9520e2005071dcf5733 100644 (file)
--- 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
 
     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);
 
        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 54a4de80983ee1a72682e72bd69f93af8a214372..b939453e8c6e9cd16ee564d066e0b24d71272834 100644 (file)
--- 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)
 {
 GtkWidget *
 dlg_window_new(const gchar *title)
 {

diff --git a/gtk/dlg_utils.h b/gtk/dlg_utils.h
index 79d4c4f9ee6432967dae899c8daa954a54ba5d90..71f515a0c95235c054b484707b9f6b838e0070d4 100644 (file)
--- a/gtk/dlg_utils.h
+++ b/gtk/dlg_utils.h
@@ -29,7 +29,7 @@
  *
  * Normal dialogs are created using dlg_window_new().
  *
  *
  * 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()
  * - "Capture Options" capture_prep()
  * - "Capture" capture_info_ui_create()
  * - "Interface Options" ifopts_edit_cb()


@@ -70,7 +70,7 @@
 #define __DLG_UTILS_H__
 
 
 #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.
  *
  * 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 4a8bfcb674f2f46417892a851fdd6f795a89081f..2d32103dd171d6e60c79572c622980baba7e57ab 100644 (file)
--- 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) {
     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;
             }
         }
                 return;
             }
         }

diff --git a/gtk/expert_dlg.c b/gtk/expert_dlg.c
index fe086fe6342e78d8a18ae889b6b07708a67c72b6..3fca66afc0bb85e683cad5f3f6c9163acda1b2fe 100644 (file)
--- 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_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 ...");
 }
 
        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);
 
        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);
                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->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);
        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 0e1a8da3d7b9331817fa7694c984f5dc10a0ed82..d234f7004e5dd1a4d17faead1b9ce44ded2a145b 100644 (file)
--- 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"
 
 /* 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 *
    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 ead49086c2cc9c856569dc925900a64c3a5f340b..ea90a3c9113442388ca3e6d40f881e6f9c460ebf 100644 (file)
--- 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;
 
        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
  *  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 a0a01b0bd642414eedf72d1378b177ae7de8aba0..09940c8ca879434a4a8dddd9b5306f63e6ffb82c 100644 (file)
--- 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);
 
     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);
 
     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_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!");
 
 
   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 162032fabc15e9bd51631c9df48e21d6f32c3af6..fbfc527011b3f2a679c616037f90d303ff994f39 100644 (file)
--- 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 = {
        /* 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
                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 = {
        /* 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
                FALSE,
                FALSE,
         FALSE


@@ -222,7 +222,7 @@ void
 dfilter_dialog_cb(GtkWidget *w _U_)
 {
        static construct_args_t args = {
 dfilter_dialog_cb(GtkWidget *w _U_)
 {
        static construct_args_t args = {

-               "Ethereal: Display Filter",
+               "Wireshark: Display Filter",

                TRUE,
                TRUE,
         FALSE
                TRUE,
                TRUE,
         FALSE

diff --git a/gtk/find_dlg.c b/gtk/find_dlg.c
index 624494f2b777f6b46afb3deb762984f30c35385f..82aeb09d3db0602c350d6640c9662948bf3a3da1 100644 (file)
--- 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 = {
   /* 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
        FALSE,
        TRUE,
     FALSE


@@ -135,7 +135,7 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_)
     return;
   }
 
     return;
   }
 

-  find_frame_w = dlg_window_new("Ethereal: Find Packet");
+  find_frame_w = dlg_window_new("Wireshark: Find Packet");

 
   tooltips = gtk_tooltips_new ();
 
 
   tooltips = gtk_tooltips_new ();
 

diff --git a/gtk/flow_graph.c b/gtk/flow_graph.c
index bc440aaa5dbab959ddbb629a1ce214fbd886c98b..fe6340c32323eec0d3e7727c64db45ed441e4ba5 100644 (file)
--- 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();
 
 
        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);
 
 
        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 c7d6a02a39b208e92a8f4123b276bbdcf017ed3a..ffa54523cc93b44d2d9f57e5947abf0f2a606fb1 100644 (file)
--- 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;
     }
 
        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;
 
                                  FILE_SELECTION_SAVE);
     follow_info->follow_save_as_w = new_win;
 

diff --git a/gtk/funnel_stat.c b/gtk/funnel_stat.c
index 99de2c04b741ce5802d66642da810838b74a79c4..77d13d711cf46243645b4f98853fb56297e00a59 100644 (file)
--- 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
  */
 
  * most from prefs_dlg.c and about_dlg.c
  */
 

diff --git a/gtk/goto_dlg.c b/gtk/goto_dlg.c
index 33f2a3f440a9e124db73bc5306739d46aa34211d..7f0784c40d4691cefd7c4e1a9f6dbb7e8031e1b1 100644 (file)
--- 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;
 
   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);
 
   /* 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 e1b0bbbeebebdac7adb2b53885bf7fbdcc12dd82..35dfa82e2835fb78bb7281bac58b2d786001b5ab 100644 (file)
--- a/gtk/graph_analysis.c
+++ b/gtk/graph_analysis.c
@@ -1,5 +1,5 @@
 /* graph_analysis.c
 /* graph_analysis.c

- * Graphic Analysis addition for ethereal
+ * Graphic Analysis addition for Wireshark

  *
  * $Id$
  *
  *
  * $Id$
  *


@@ -73,7 +73,7 @@
 
 /* XXX FIXME */
 /* GTK-1.x does not have GDK_IS_DRAWABLE so just define is as always being true
 
 /* 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.
  */
  * 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;
        }
 
                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);
 
        /* 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 7fe5b02ce32d913abe40c68dea3bbc2a1dbfb36b..b8716c1f6df82669a2fb1ecd4c123472fd8b7c06 100644 (file)
--- a/gtk/graph_analysis.h
+++ b/gtk/graph_analysis.h
@@ -1,5 +1,5 @@
 /* graph_analysis.h
 /* graph_analysis.h

- * Graphic Analysis addition for ethereal
+ * Graphic Analysis addition for Wireshark

  *
  * $Id$
  *
  *
  * $Id$
  *

diff --git a/gtk/gtkglobals.h b/gtk/gtkglobals.h
index 09cf5056eff23ed4fb09eb24462fb56297bf78a9..3099a069743218be1030a7787942e168842f28f2 100644 (file)
--- a/gtk/gtkglobals.h
+++ b/gtk/gtkglobals.h
@@ -29,7 +29,7 @@
  *
  * @section intro Introduction
  *
  *
  * @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.
  *
  *
  * See Modules for a list of submodules.
  *

diff --git a/gtk/gui_utils.c b/gtk/gui_utils.c
index 552a8a789f534a3bbbaffbc9e6daeda9f7065a00..6020459766f7e6b2d3770bb6baf982bed91e6175 100644 (file)
--- 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
    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
    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_)
    */
 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
 
 
 /* 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)
 {
 GtkWidget *
 window_new(GtkWindowType type, const gchar *title)
 {

diff --git a/gtk/gui_utils.h b/gtk/gui_utils.h
index b6b42fb76f1ba0bbf018d188420e2a950fbf716e..017c31a2f1b9d337a705eae8f521dab0b164b2e8 100644 (file)
--- 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?
  *  @{ */
 
  *  @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 
  *  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.
 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
  *
  * @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 d9536f3d5c0d18cdce7c69f57d632c544246923f..447fac787dfcb7620bbb02101ddb3712e87a2872 100644 (file)
--- a/gtk/h225_counter.c
+++ b/gtk/h225_counter.c
@@ -1,5 +1,5 @@
 /* h225_counter.c
 /* h225_counter.c

- * h225 message counter for ethereal
+ * H.225 message counter for Wireshark

  * Copyright 2003 Lars Roland
  *
  * $Id$
  * Copyright 2003 Lars Roland
  *
  * $Id$


@@ -520,7 +520,7 @@ gtk_h225counter_init(const char *optarg, void *userdata _U_)
 
        h225counter_reset(hs);
 
 
        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);
        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 d9119285448b9a8e8235177d591d9298b16db54e..ae471316d6d0f7734bb34e8636747ec71db0b669 100644 (file)
--- a/gtk/h225_ras_srt.c
+++ b/gtk/h225_ras_srt.c
@@ -1,5 +1,5 @@
 /* h225_ras_srt.c
 /* 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$
  * Copyright 2003 Lars Roland
  *
  * $Id$

diff --git a/gtk/help_dlg.c b/gtk/help_dlg.c
index f64898cdf4c801d74f747a548fcef4984eb5e153..64429ddbd564cbfcc9426a38deec4a35e411a1aa 100644 (file)
--- a/gtk/help_dlg.c
+++ b/gtk/help_dlg.c
@@ -132,7 +132,7 @@ void help_dialog(void)
     return;
   }
 
     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);
 
   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 33e788a3a2e3390e900a9827c850a7f405da519a..4676af12572d13be59bab7d2876f2c54c9da72cb 100644 (file)
--- a/gtk/help_dlg.h
+++ b/gtk/help_dlg.h
@@ -5,7 +5,7 @@
  * Laurent Deniel <laurent.deniel@free.fr>
  *
  * Wireshark - Network traffic analyzer
  * 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
  * 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 863e000c5dfffe593d30a38121a64a47282cfb77..4d3beac0b9b727c12b7f28cdb93587ed11d83a4e 100644 (file)
--- 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;
        }
        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);
 }
        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);
 
        /* 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) );
        }
        if(gio->args->title){
                g_free( (gpointer) (gio->args->title) );
        }

diff --git a/gtk/isprint.h b/gtk/isprint.h
index c1dd32cefb597b8cc7741f835685be613b023117..32ab15105274aef5ceb8b93a1c70362772fc443a 100644 (file)
--- 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
 /**
  * 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.
  * 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 c3a34c159db85b3195ae9c561d0fcdd0936a4d4b..ae6450ad75ef88d53d0d3b2a1acbf245270d3d91 100644 (file)
--- 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_)
 {
 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();
 }
 
     main_widgets_rearrange();
 }
 

diff --git a/gtk/main.c b/gtk/main.c
index c1df9c3b1ef4e4a4f51444687aead0331a6cbe82..4d64ce84ef1c7a73571e1fcca041d9e5b4e1e071 100644 (file)
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -156,7 +156,7 @@
 
 /*
  * Files under personal and global preferences directories in which
 
 /*
  * 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"
 
  */
 #define RC_FILE "gtkrc"
 


@@ -1119,7 +1119,7 @@ print_usage(gboolean print_ver) {
 
   if (print_ver) {
     output = stdout;
 
   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"
         "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, "  -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
   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, "\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");
 
   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
 
 }
 #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.
 
    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 */
   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);
 }
   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. */
     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);
 
     /* 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) {
 
 
     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 {
                             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);
     }
     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) {
     /* 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 {
                             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);
     }
     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). */
 
     /* 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) {
 
 #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. */
 #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,
   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"
         "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);
   }
         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) {
   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);
     }
 #endif
     print_usage(FALSE);


@@ -2887,7 +2887,7 @@ create_console(void)
        the message(s) we put in there). */
     atexit(destroy_console);
 
        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
     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
 #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
 #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;
     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 = {
     /* 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 */
         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);
 
     /* 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 ee5be8e20c73779dde4d8cf3cc107aca8d00b3bc..6d4f1dcbccd119f78becd8ccd2465a79e2822bac 100644 (file)
--- a/gtk/mcast_stream_dlg.c
+++ b/gtk/mcast_stream_dlg.c
@@ -403,7 +403,7 @@ mcast_on_params                      (GtkButton       *button _U_,
                 return;
         }
 
                 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);
         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;
 
     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);
     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 5eded936c61d1398f75f828feab407c443229041..525790045f9f8f2d8071d1edcb843b115a1bac05 100644 (file)
--- 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_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)
 };
 
                        0, ETHEREAL_STOCK_ABOUT)
 };
 

diff --git a/gtk/mgcp_stat.c b/gtk/mgcp_stat.c
index dad9b86455aaaa19b38445099a0de0d108e4199e..4e0caae9c6780d0c71cdf688769896797f84f564 100644 (file)
--- a/gtk/mgcp_stat.c
+++ b/gtk/mgcp_stat.c
@@ -1,5 +1,5 @@
 /* mgcp_stat.c
 /* mgcp_stat.c

- * mgcp-statistics for ethereal
+ * mgcp-statistics for Wireshark

  * Copyright 2003 Lars Roland
  *
  * $Id$
  * Copyright 2003 Lars Roland
  *
  * $Id$

diff --git a/gtk/packet_list.c b/gtk/packet_list.c
index 61b697d2100838038c7c80e8fbe2dee44e52eba5..d9b6038058ab5d99544fb0d93e7853fdd2566abb 100644 (file)
--- 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
         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) {
         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 c1bf01a74d0bbe77cfa4d761ba20aaf15c0e1fd7..4c25781a44173298d36a4ea9dd40c65212e28b97 100644 (file)
--- 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);
 
      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
 
   /*
    * 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;
 
        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
           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 131b02b5e965eb24c4afd4be2691b48215ca98f0..0638b99467666bdd2dc3357a321570e8285a5438 100644 (file)
--- 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;
   }
 
       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);
 }
 
   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);
 
   /* 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);
 }
 
   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);
 
   /* 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);
 }
 
   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);
 
   /* 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);
 }
 
   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);
 
   /* 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);
 }
 
   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);
 
   /* 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)
 {
   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);
 }
 
                           FILE_SELECTION_WRITE_BROWSE);
 }
 

diff --git a/gtk/print_prefs.c b/gtk/print_prefs.c
index 1e6598c15838af3098b37a74f452af0958c71c4c..1e971aa7fb3b94202673f22995b7dc610e48c1b1 100644 (file)
--- 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)
 {
 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);
 }
 
                           FILE_SELECTION_WRITE_BROWSE);
 }
 

diff --git a/gtk/proto_dlg.c b/gtk/proto_dlg.c
index 248e333cf40ce763a944da85627f642130f62824..1799b99bfe43bc323a1429ec4270822179c4d283 100644 (file)
--- a/gtk/proto_dlg.c
+++ b/gtk/proto_dlg.c
@@ -113,7 +113,7 @@ proto_cb(GtkWidget *w _U_, gpointer data _U_)
     return;
   }
 
     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 */
   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 8c688c0012f42fc99f466293e9ff2312868ea632..8511daa4dbc2f1930c28034f55a703465a97a426 100644 (file)
--- 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.
         */
        /*
         * 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.",
 
     /* 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.
     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
        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 00a6b4f1d1b888f142c4da29a9bbcb7efa52801a..29db845fc35bca2801648328d26ef5c232b83b9f 100644 (file)
--- 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;
        }
 
                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);
 
        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 054279ef261a6009363d34d84745c9f06897ce61..f4c3c226d98b74fb40c71e6446c3880e72c6c588 100644 (file)
--- a/gtk/recent.c
+++ b/gtk/recent.c
@@ -133,9 +133,9 @@ write_recent(void)
     return FALSE;
   }
 
     return FALSE;
   }
 

-  fputs("# Recent settings file for Ethereal " VERSION ".\n"
+  fputs("# Recent settings file for Wireshark " VERSION ".\n"

     "#\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"
     "# 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 5b226748e111232f31e175e395286a22fc684747..b5d225b4c17abadaec2b6db88c5a420fcf2f21e5 100644 (file)
--- 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.
  */
 
  * 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.
  */
  *
  * 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 42c57c7fc3032d95e2d0f749786afe0b8ef740c5..e2e90c1dc8ab757b0d6f34a706ccd365261b5f0a 100644 (file)
--- 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 
  */
 
 /* 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.
  */
  *
  * 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;
        }
 
                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);
        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 2cd698fe91ca59e53612c72a9c7b814f5aab3fa4..4b37fc794166e226b8aba18307087c77ddebb70f 100644 (file)
--- a/gtk/rtp_analysis.c
+++ b/gtk/rtp_analysis.c
@@ -1,5 +1,5 @@
 /* rtp_analysis.c
 /* rtp_analysis.c

- * RTP analysis addition for ethereal
+ * RTP analysis addition for Wireshark

  *
  * $Id$
  *
  *
  * $Id$
  *


@@ -2408,7 +2408,7 @@ static void save_csv_as_cb(GtkWidget *bt _U_, user_data_t *user_data _U_)
                return;
        }
        
                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);
        
        /* 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! */
        }
        
     /* 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);
        
        /* 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;
        
        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 */
        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 8535ef7b359542179e5690ca83bd0795c14c8209..f84407054d06ba61b9ec33f7b3c8b510b334cc9c 100644 (file)
--- a/gtk/rtp_analysis.h
+++ b/gtk/rtp_analysis.h
@@ -1,5 +1,5 @@
 /* rtp_analysis.h
 /* rtp_analysis.h

- * RTP analysis addition for ethereal
+ * RTP analysis addition for Wireshark

  *
  * $Id$
  *
  *
  * $Id$
  *

diff --git a/gtk/rtp_stream.c b/gtk/rtp_stream.c
index 39c7b19e121a290d285204ad4779a7c3c375f0b0..61ac216b78ef8f8aee23be8ec2a4cce4c8ae1fcc 100644 (file)
--- a/gtk/rtp_stream.c
+++ b/gtk/rtp_stream.c
@@ -1,5 +1,5 @@
 /* rtp_stream.c
 /* rtp_stream.c

- * RTP streams summary addition for ethereal
+ * RTP streams summary addition for Wireshark

  *
  * $Id$
  *
  *
  * $Id$
  *

diff --git a/gtk/rtp_stream.h b/gtk/rtp_stream.h
index 1ba4a1ac23672915c259ab1904fc01bcaf3c5791..c5493c1a2fff62dae60a663697696f4789363d59 100644 (file)
--- a/gtk/rtp_stream.h
+++ b/gtk/rtp_stream.h
@@ -1,5 +1,5 @@
 /* rtp_stream.h
 /* rtp_stream.h

- * RTP streams summary addition for ethereal
+ * RTP streams summary addition for Wireshark

  *
  * $Id$
  *
  *
  * $Id$
  *

diff --git a/gtk/rtp_stream_dlg.c b/gtk/rtp_stream_dlg.c
index 8b5f7f8a2d03a81a57106916dede658e5e36d513..dc75ba1833150148bbe04b9ea63f20a0e361558d 100644 (file)
--- a/gtk/rtp_stream_dlg.c
+++ b/gtk/rtp_stream_dlg.c
@@ -1,5 +1,5 @@
 /* rtp_stream_dlg.c
 /* rtp_stream_dlg.c

- * RTP streams summary addition for ethereal
+ * RTP streams summary addition for Wireshark

  *
  * $Id$
  *
  *
  * $Id$
  *


@@ -315,7 +315,7 @@ rtpstream_on_save                      (GtkButton       *button _U_,
        }
 
        /* XXX - use file_selection from dlg_utils instead! */
        }
 
        /* 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);
 
        /* 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;
 
     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);
     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 2884b690e5336187f04fbd869f1e3849c4cca4b7..47592905c35d8cfdb5e4bbb080892fdb90ae9966 100644 (file)
--- a/gtk/rtp_stream_dlg.h
+++ b/gtk/rtp_stream_dlg.h
@@ -1,5 +1,5 @@
 /* rtp_stream_dlg.h
 /* rtp_stream_dlg.h

- * RTP streams summary addition for ethereal
+ * RTP streams summary addition for Wireshark

  *
  * $Id$
  *
  *
  * $Id$
  *

diff --git a/gtk/scsi_stat.c b/gtk/scsi_stat.c
index b7b5f4d9fc7e45b0444ca40d88420411a3fd3565..db8445f00bc5abda021304c42118007088698189 100644 (file)
--- 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 
  */
 
 /* This module provides rpc call/reply SRT (Server Response Time) statistics 

- * to ethereal.
+ * to Wireshark.

  */
 
 #ifdef HAVE_CONFIG_H
  */
 
 #ifdef HAVE_CONFIG_H


@@ -313,7 +313,7 @@ gtk_scsistat_cb(GtkWidget *w _U_, gpointer d _U_)
                return;
        }
 
                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);
        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 eecbf55b537a66093f22aa9f18966948e9c47325..b95c9903a7972e9f41cc578a8216623215e2cbbe 100644 (file)
--- a/gtk/sctp_chunk_stat.c
+++ b/gtk/sctp_chunk_stat.c
@@ -1,5 +1,5 @@
 /* sctp_chunk_stat.c
 /* sctp_chunk_stat.c

- * SCTP chunk counter for ethereal
+ * SCTP chunk counter for Wireshark

  * Copyright 2005 Oleg Terletsky oleg.terletsky@comverse.com
  *
  * $Id$
  * 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->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);
        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 0489770d15a1dafeb59a19294dbab5b1cf4691f5..b9f09f1c16f17949e2c00709a1151c2a1475d6c0 100644 (file)
--- 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;
 
        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);
 
        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 fc51798a338ae7bdb8009d13805be44f7ab8ee5f..18dc0d36fa2c10f2fac1b809929ba75147ff1bf6 100644 (file)
--- 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;
 
        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);
 
        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 acbc186c4841bb67c231a0c84c39a1ea09f42cf6..da04a1ae1d9330699f3bacfe9e191823ccfe7ed8 100644 (file)
--- 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.
    * 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
    * 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
 #else
     win = dlg_window_new("");
 #endif

diff --git a/gtk/ssl-dlg.c b/gtk/ssl-dlg.c
index 44787804ce6b9687304d8ad9ce8ce34694fba270..6bbb6b641e8354358135c295df680185f35ef0f8 100644 (file)
--- 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;
     }
 
        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;
 
                                  FILE_SELECTION_SAVE);
     follow_info->follow_save_as_w = new_win;
 

diff --git a/gtk/summary_dlg.c b/gtk/summary_dlg.c
index 828b4ddef416e0ff9d7520710fc8625606ada99d..ae6af94a7f0550d3e8425026dd6bb0c4fc0a0cc0 100644 (file)
--- 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;
 
   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);
 
   /* 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 1099d667f0b3639c32f55d086cc66f146191bd57..30d84373546e498f0911567e0610e99e0418d96c 100644 (file)
--- 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"
 
 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"
 
 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;
   }
 
     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);
 
   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 55f99fbb0fc075c3bc9ab7a0df70ca4d5551e14e..83ab77397f2521dbb9e02f646b7172adc168d0c3 100644 (file)
--- a/gtk/t38_analysis.c
+++ b/gtk/t38_analysis.c
@@ -1,5 +1,5 @@
 /* t38_analysis.c
 /* t38_analysis.c

- * t38 fax analysis for ethereal
+ * T.38 fax analysis for Wireshark

  *
  * $Id$
  *
  *
  * $Id$
  *

diff --git a/gtk/tap_dfilter_dlg.c b/gtk/tap_dfilter_dlg.c
index 4c5c7ee47ef04e71152fd6fc3792f2d452358e87..0c5eb56abecaaa7c2b5cd0d1c477111384dcf5be 100644 (file)
--- 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) {
        
        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);
                }
                        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;
        }
 
                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);
 
        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 ccd990284ca783f45144f06a1d7b938825b0e045..26cec19772f30ed230e53b3e8cef03e65b1bcf08 100644 (file)
--- 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\
 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\
 - 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\
 ";
 #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\
 - 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()");
        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);
        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,
     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);
 
     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 9711eb4ce6b535667580f59ff8595e5142b823ff..25c26763f5dd37d287372e5ae10a37a7bf18385a 100644 (file)
--- 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 
  * 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"
  * 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"
 #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
 #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 */
 } stock_pixmap_t;
 
 /* generate application specific stock items */

-static void ethereal_stock_icons(void) {
+static void wireshark_stock_icons(void) {

     GtkIconFactory * factory;
     gint32 i;
 
     GtkIconFactory * factory;
     gint32 i;
 


@@ -486,7 +486,7 @@ toolbar_new(void)
     
 #if GTK_MAJOR_VERSION >= 2
     /* create application specific stock icons */
     
 #if GTK_MAJOR_VERSION >= 2
     /* create application specific stock icons */

-    ethereal_stock_icons();
+    wireshark_stock_icons();

 #endif
 
     /* this function should be only called once! */
 #endif
 
     /* this function should be only called once! */

diff --git a/gtk/voip_calls.c b/gtk/voip_calls.c
index fd1f6967e63972258f45e0a87a91594b79392b2f..cbf06e795edc0776064e9c5ed4998bd00dcef8a7 100644 (file)
--- a/gtk/voip_calls.c
+++ b/gtk/voip_calls.c
@@ -1,5 +1,5 @@
 /* voip_calls.c
 /* voip_calls.c

- * VoIP calls summary addition for ethereal
+ * VoIP calls summary addition for Wireshark

  *
  * $Id$
  *
  *
  * $Id$
  *

diff --git a/gtk/voip_calls.h b/gtk/voip_calls.h
index 6a8caa70a467424b1752df3cf28214789b57fe05..407e6a47cc15a4ba88f00664f6b56dd36ddc20d7 100644 (file)
--- a/gtk/voip_calls.h
+++ b/gtk/voip_calls.h
@@ -1,5 +1,5 @@
 /* voip_calls.h
 /* voip_calls.h

- * VoIP calls summary addition for ethereal
+ * VoIP calls summary addition for Wireshark

  *
  * $Id$
  *
  *
  * $Id$
  *


@@ -45,19 +45,19 @@
 /* defines voip call state */
 typedef enum _voip_call_state {
         VOIP_CALL_SETUP,
 /* 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_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_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 {
 } voip_call_active_state;
 
 typedef enum _voip_protocol {

diff --git a/gtk/voip_calls_dlg.c b/gtk/voip_calls_dlg.c
index 17ebda4a579ca22f5985f5e6faa99fba25d1b03a..8c925c630bea20fc7b550c59e32c606850708b91 100644 (file)
--- a/gtk/voip_calls_dlg.c
+++ b/gtk/voip_calls_dlg.c
@@ -1,5 +1,5 @@
 /* voip_calls_dlg.c
 /* voip_calls_dlg.c

- * VoIP calls summary addition for ethereal
+ * VoIP calls summary addition for Wireshark

  *
  * $Id$
  *
  *
  * $Id$
  *


@@ -555,7 +555,7 @@ static void voip_calls_dlg_create (void)
        GtkWidget *column_lb;
        int i;
 
        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);
 
 
        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 eeda170c1b5028375082aafcf260d00f07b82f01..1c16e53ff9bb1d4e4c698e627fb02df675818264 100644 (file)
--- a/gtk/voip_calls_dlg.h
+++ b/gtk/voip_calls_dlg.h
@@ -1,5 +1,5 @@
 /* voip_calls_dlg.h
 /* voip_calls_dlg.h

- * VoIP conversations addition for ethereal
+ * VoIP conversations addition for Wireshark

  *
  * $Id$
  *
  *
  * $Id$
  *

diff --git a/gtk/webbrowser.c b/gtk/webbrowser.c
index e0be890eb3fc3aaa31edce30dbcd7bd5036d2afb..debd00bff183d5a6fc47c7b2fcca5e5d424cf83c 100644 (file)
--- a/gtk/webbrowser.c
+++ b/gtk/webbrowser.c
@@ -21,11 +21,11 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
  * 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
  *
  * 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"
  */
 
 #include "config.h"


@@ -43,8 +43,8 @@
 
 /*
  * For GNOME 2.x, we might be able to use "gnome_url_show()" (when we offer
 
 /*
  * 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)
  */
 
 #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
      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);
       "\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 83411e0c952476f689709c734037ca59f15bc8b4..519b677f1b0cb7e4ba14c1013d769ccecb17a9d6 100644 (file)
--- 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")               \
  */
 #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")
 
     _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
 
 
 #define FILE_TYPES_SAVE FILE_TYPES_OPEN
 


@@ -174,7 +174,7 @@ win32_open_file (HWND h_wnd) {
     } else {
        ofn.lpstrInitialDir = NULL;
     }
     } 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;
     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;
     }
     } 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;
     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;
     }
     } 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;
     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;
     }
     } 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;
     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;
     }
     } 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;
     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.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;
     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.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;
     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 08250e5087ad00c23ac5e051477e32a3d4d3e523..6b52fb3ff31d01e5b9913d728c339dbdf838409f 100644 (file)
--- 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);
        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;
        } 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++)
        {
        }
        for (i=0;i<=sp->num_pdus; i++)
        {