From Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8690 :

Change "Edit" to "Rename" and add icons to "Manage Profiles..." and "Switch
to...". Update the associated widget, routine, and variable names in order
to facilitate future maintenance.

svn path=/trunk/; revision=49361

4 files changed, 29 insertions, 29 deletions

diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c
index 3495ef2135..1dbb9e0544 100644
--- a/ui/gtk/main_menubar.c
+++ b/ui/gtk/main_menubar.c
@@ -3081,7 +3081,7 @@ static const char *ui_statusbar_profiles_menu_popup =
 "     <menuitem name='Profiles' action='/Profiles'/>\n"
 "     <separator/>\n"
 "     <menuitem name='New' action='/New'/>\n"
-"     <menuitem name='Edit' action='/Edit'/>\n"
+"     <menuitem name='Rename' action='/Rename'/>\n"
 "     <menuitem name='Delete' action='/Delete'/>\n"
 "     <separator/>\n"
 "     <menu name='Change' action='/Change'>\n"
@@ -3091,12 +3091,12 @@ static const char *ui_statusbar_profiles_menu_popup =
 "</ui>\n";
 static const GtkActionEntry statusbar_profiles_menu_action_entries [] =
 {
-    { "/Profiles",  NULL,   "Manage Profiles...",    NULL,   NULL,     G_CALLBACK(profile_dialog_cb) },
-    { "/New",   GTK_STOCK_NEW,  "New...",   NULL,   NULL,     G_CALLBACK(profile_new_cb) },
-    { "/Edit",  GTK_STOCK_EDIT, "Edit...",  NULL,   NULL,     G_CALLBACK(profile_edit_cb) },
-    { "/Delete",    GTK_STOCK_DELETE,   "Delete",   NULL,   NULL,     G_CALLBACK(profile_delete_cb) },
-    { "/Change",    NULL,       "Switch to",   NULL,   NULL,   NULL },
-    { "/Change/Default",    NULL,   "Default",  NULL,   NULL,     NULL },
+    { "/Profiles",       GTK_STOCK_INDEX,   "Manage Profiles...", NULL, NULL, G_CALLBACK(profile_dialog_cb) },
+    { "/New",            GTK_STOCK_NEW,     "New...",             NULL, NULL, G_CALLBACK(profile_new_cb) },
+    { "/Rename",         GTK_STOCK_EDIT,    "Rename...",          NULL, NULL, G_CALLBACK(profile_rename_cb) },
+    { "/Delete",         GTK_STOCK_DELETE,  "Delete",             NULL, NULL, G_CALLBACK(profile_delete_cb) },
+    { "/Change",         GTK_STOCK_JUMP_TO, "Switch to",          NULL, NULL, NULL },
+    { "/Change/Default", NULL,              "Default",            NULL, NULL, NULL },
 };
 
 GtkWidget *
@@ -5739,9 +5739,9 @@ void set_menus_for_file_set(gboolean file_set, gboolean previous_file, gboolean
     set_menu_sensitivity(ui_manager_main_menubar, "/Menubar/FileMenu/Set/NextFile", next_file);
 }
 
-GtkWidget *menus_get_profiles_edit_menu (void)
+GtkWidget *menus_get_profiles_rename_menu (void)
 {
-    return gtk_ui_manager_get_widget(ui_manager_statusbar_profiles_menu, "/ProfilesMenuPopup/Edit");
+    return gtk_ui_manager_get_widget(ui_manager_statusbar_profiles_menu, "/ProfilesMenuPopup/Rename");
 }
 
 GtkWidget *menus_get_profiles_delete_menu (void)
@@ -5756,7 +5756,7 @@ GtkWidget *menus_get_profiles_change_menu (void)
 
 void set_menus_for_profiles(gboolean default_profile)
 {
-    set_menu_sensitivity(ui_manager_statusbar_profiles_menu, "/ProfilesMenuPopup/Edit", !default_profile);
+    set_menu_sensitivity(ui_manager_statusbar_profiles_menu, "/ProfilesMenuPopup/Rename", !default_profile);
     set_menu_sensitivity(ui_manager_statusbar_profiles_menu, "/ProfilesMenuPopup/Delete", !default_profile);
 }
 
diff --git a/ui/gtk/menus.h b/ui/gtk/menus.h
index e33d60bb93..a56248489b 100644
--- a/ui/gtk/menus.h
+++ b/ui/gtk/menus.h
@@ -65,7 +65,7 @@ extern void set_menu_object_data(const gchar *path, const gchar *key, gpointer d
  *
  * @param widget the parent widget
  * @param event the GdkEvent
- * @param data the corresponding menu 
+ * @param data the corresponding menu
  */
 extern gboolean popup_menu_handler(GtkWidget *widget, GdkEvent *event, gpointer data);
 
@@ -88,7 +88,7 @@ void menus_set_column_align_default (gboolean right_justify);
 void menus_set_column_resolved (gboolean resolved, gboolean can_resolve);
 
 /* Fetch the statusbar profiles edit submenu */
-extern GtkWidget *menus_get_profiles_edit_menu (void);
+extern GtkWidget *menus_get_profiles_rename_menu (void);
 
 /* Fetch the statusbar profiles delete submenu */
 extern GtkWidget *menus_get_profiles_delete_menu (void);
diff --git a/ui/gtk/profile_dlg.c b/ui/gtk/profile_dlg.c
index d3917a77e7..829444137a 100644
--- a/ui/gtk/profile_dlg.c
+++ b/ui/gtk/profile_dlg.c
@@ -61,7 +61,7 @@ enum {
 static GtkWidget *global_profile_w = NULL;
 
 #define PROF_OPERATION_NEW  1
-#define PROF_OPERATION_EDIT 2
+#define PROF_OPERATION_RENAME 2
 
 
 static GtkTreeIter *
@@ -656,18 +656,18 @@ profile_show_popup_cb(GtkWidget *w _U_, GdkEvent *event, gpointer user_data _U_)
     GtkWidget *change_menu = menus_get_profiles_change_menu();
 
 #if GTK_CHECK_VERSION(2,16,0)
-    GtkWidget *edit_menu = menus_get_profiles_edit_menu();
+    GtkWidget *rename_menu = menus_get_profiles_rename_menu();
     GtkWidget *delete_menu = menus_get_profiles_delete_menu();
     if (strcmp(profile_name, DEFAULT_PROFILE) != 0) {
       gchar *label;
-      label = g_strdup_printf("Edit \"%s\"...", profile_name);
-      gtk_menu_item_set_label(GTK_MENU_ITEM(edit_menu), label);
+      label = g_strdup_printf("Rename \"%s\"...", profile_name);
+      gtk_menu_item_set_label(GTK_MENU_ITEM(rename_menu), label);
       g_free(label);
       label = g_strdup_printf("Delete \"%s\"", profile_name);
       gtk_menu_item_set_label(GTK_MENU_ITEM(delete_menu), label);
       g_free(label);
     } else {
-      gtk_menu_item_set_label(GTK_MENU_ITEM(edit_menu), "Edit...");
+      gtk_menu_item_set_label(GTK_MENU_ITEM(rename_menu), "Rename...");
       gtk_menu_item_set_label(GTK_MENU_ITEM(delete_menu), "Delete");
     }
 #endif
@@ -749,7 +749,7 @@ profile_name_edit_ok(GtkWidget *w _U_, gpointer parent_w)
       gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 0, &profile_name, 1, &from_global, -1);
     }
     break;
-  case PROF_OPERATION_EDIT:
+  case PROF_OPERATION_RENAME:
     profile_name = get_profile_name();
     if (strcmp(new_name, profile_name) == 0) {
       /* Rename without a change, do nothing */
@@ -793,7 +793,7 @@ profile_name_edit_ok(GtkWidget *w _U_, gpointer parent_w)
       change_configuration_profile(new_name);
     }
     break;
-  case PROF_OPERATION_EDIT:
+  case PROF_OPERATION_RENAME:
     if (rename_persconffile_profile(profile_name, new_name,
                                     &pf_dir_path, &pf_dir_path2) == -1) {
       simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
@@ -814,13 +814,13 @@ profile_name_edit_ok(GtkWidget *w _U_, gpointer parent_w)
 }
 
 static void
-profile_name_edit_cancel(GtkWidget *w _U_, gpointer parent_w)
+profile_rename_cancel(GtkWidget *w _U_, gpointer parent_w)
 {
   window_destroy(GTK_WIDGET(parent_w));
 }
 
 static void
-profile_name_edit_dlg(gint operation)
+profile_manage_profiles_dlg(gint operation)
 {
   GtkWidget       *win, *main_grid, *main_vb, *bbox, *cancel_bt, *ok_bt;
   GtkWidget       *entry, *label;
@@ -840,8 +840,8 @@ profile_name_edit_dlg(gint operation)
   case PROF_OPERATION_NEW:
     window_title = g_strdup("Create New Profile");
     break;
-  case PROF_OPERATION_EDIT:
-    window_title = g_strdup_printf("Edit: %s", profile_name);
+  case PROF_OPERATION_RENAME:
+    window_title = g_strdup_printf("Rename: %s", profile_name);
     break;
   default:
     g_assert_not_reached();
@@ -928,7 +928,7 @@ profile_name_edit_dlg(gint operation)
   case PROF_OPERATION_NEW:
     gtk_entry_set_text(GTK_ENTRY(entry), "New profile");
     break;
-  case PROF_OPERATION_EDIT:
+  case PROF_OPERATION_RENAME:
     gtk_entry_set_text(GTK_ENTRY(entry), profile_name);
     break;
   default:
@@ -956,7 +956,7 @@ profile_name_edit_dlg(gint operation)
   gtk_widget_grab_focus(entry);
 
   cancel_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
-  g_signal_connect(cancel_bt, "clicked", G_CALLBACK(profile_name_edit_cancel), win);
+  g_signal_connect(cancel_bt, "clicked", G_CALLBACK(profile_rename_cancel), win);
   window_set_cancel_button(win, cancel_bt, NULL);
 
   gtk_widget_grab_default(ok_bt);
@@ -966,7 +966,7 @@ profile_name_edit_dlg(gint operation)
 void
 profile_new_cb(GtkWidget *w _U_, gpointer data _U_)
 {
-  profile_name_edit_dlg(PROF_OPERATION_NEW);
+  profile_manage_profiles_dlg(PROF_OPERATION_NEW);
 }
 
 void
@@ -979,9 +979,9 @@ profile_delete_cb(GtkWidget *w _U_, gpointer data _U_)
 }
 
 void
-profile_edit_cb(GtkWidget *w _U_, gpointer data _U_)
+profile_rename_cb(GtkWidget *w _U_, gpointer data _U_)
 {
-  profile_name_edit_dlg(PROF_OPERATION_EDIT);
+  profile_manage_profiles_dlg(PROF_OPERATION_RENAME);
 }
 
 /* Create a profile dialog for editing display profiles; this is to be used
diff --git a/ui/gtk/profile_dlg.h b/ui/gtk/profile_dlg.h
index 6948e752b2..ffcf8c01e6 100644
--- a/ui/gtk/profile_dlg.h
+++ b/ui/gtk/profile_dlg.h
@@ -58,7 +58,7 @@ void profile_delete_cb (GtkWidget *w _U_, gpointer data _U_);
  * @param w parent widget (unused)
  * @param data pointer to user_data (unused)
  */
-void profile_edit_cb (GtkWidget *w _U_, gpointer data _U_);
+void profile_rename_cb (GtkWidget *w _U_, gpointer data _U_);
 
 /** User requested the "Configuration Profiles" dialog box by menu or toolbar.
  *