merge_all_tap_menus() has been moved to menus.c.

[obnox/wireshark/wip.git] / gtk / service_response_time_table.c

diff --git a/gtk/service_response_time_table.c b/gtk/service_response_time_table.c
index 352211c12d808fcf79a46edbffee9061f26e5610..31c94d83f2abcd4acdda87b1a2fc44546900d8cd 100644 (file)
--- a/gtk/service_response_time_table.c
+++ b/gtk/service_response_time_table.c
@@ -38,6 +38,7 @@
 #include "gtk/service_response_time_table.h"
 #include "gtk/filter_utils.h"
 #include "gtk/gui_utils.h"
+#include "gtk/utf8_entities.h"
 
 #define NANOSECS_PER_SEC 1000000000
 
@@ -208,19 +209,19 @@ static const char *ui_desc_service_resp_t_filter_popup =
 "  <popup name='ServiceRespTFilterPopup'>\n"
 "    <menu action='/Apply as Filter'>\n"
 "      <menuitem action='/Apply as Filter/Selected'/>\n"
-"      <menuitem action='/Apply as Filter/... not Selected'/>\n"
-"      <menuitem action='/Apply as Filter/... and Selected'/>\n"
-"      <menuitem action='/Apply as Filter/... or Selected'/>\n"
-"      <menuitem action='/Apply as Filter/... and not Selected'/>\n"
-"      <menuitem action='/Apply as Filter/... or not Selected'/>\n"
+"      <menuitem action='/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " not Selected'/>\n"
+"      <menuitem action='/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected'/>\n"
+"      <menuitem action='/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected'/>\n"
+"      <menuitem action='/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected'/>\n"
+"      <menuitem action='/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected'/>\n"
 "    </menu>\n"
 "    <menu action='/Prepare a Filter'>\n"
 "      <menuitem action='/Prepare a Filter/Selected'/>\n"
-"      <menuitem action='/Prepare a Filter/... not Selected'/>\n"
-"      <menuitem action='/Prepare a Filter/... and Selected'/>\n"
-"      <menuitem action='/Prepare a Filter/... or Selected'/>\n"
-"      <menuitem action='/Prepare a Filter/... and not Selected'/>\n"
-"      <menuitem action='/Prepare a Filter/... or not Selected'/>\n"
+"      <menuitem action='/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " not Selected'/>\n"
+"      <menuitem action='/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected'/>\n"
+"      <menuitem action='/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected'/>\n"
+"      <menuitem action='/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected'/>\n"
+"      <menuitem action='/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected'/>\n"
 "    </menu>\n"
 "    <menu action='/Find Frame'>\n"
 "      <menu action='/Find Frame/Find Frame'>\n"
@@ -273,17 +274,17 @@ static const GtkActionEntry service_resp_t__popup_entries[] = {
   { "/Find Frame/Find Previous",                               NULL, "Find Previous",                  NULL, NULL,                                             NULL },
   { "/Colorize Procedure",                                             NULL, "Colorize Procedure",             NULL, NULL,                                             NULL },
   { "/Apply as Filter/Selected",                               NULL, "Selected",                               NULL, "Selected",                               G_CALLBACK(apply_as_selected_cb) },
-  { "/Apply as Filter/... not Selected",               NULL, "... not Selected",               NULL, "... not Selected",               G_CALLBACK(apply_as_not_selected_cb) },
-  { "/Apply as Filter/... and Selected",               NULL, "... and Selected",               NULL, "... and Selected",               G_CALLBACK(apply_as_and_selected_cb) },
-  { "/Apply as Filter/... or Selected",                        NULL, "... or Selected",                NULL, "... or Selected",                G_CALLBACK(apply_as_or_selected_cb) },
-  { "/Apply as Filter/... and not Selected",   NULL, "... and not Selected",   NULL, "... and not Selected",   G_CALLBACK(apply_as_and_not_selected_cb) },
-  { "/Apply as Filter/... or not Selected",            NULL, "... or not Selected",    NULL, "... or not Selected",    G_CALLBACK(apply_as_or_not_selected_cb) },
+  { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " not Selected",              NULL, UTF8_HORIZONTAL_ELLIPSIS " not Selected",         NULL, UTF8_HORIZONTAL_ELLIPSIS " not Selected",         G_CALLBACK(apply_as_not_selected_cb) },
+  { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected",              NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected",         NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected",         G_CALLBACK(apply_as_and_selected_cb) },
+  { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected",                       NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected",          NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected",          G_CALLBACK(apply_as_or_selected_cb) },
+  { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected",  NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected",     NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected",     G_CALLBACK(apply_as_and_not_selected_cb) },
+  { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected",           NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected",      NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected",      G_CALLBACK(apply_as_or_not_selected_cb) },
   { "/Prepare a Filter/Selected",                              NULL, "Selected",                               NULL, "selcted",                                G_CALLBACK(prep_as_selected_cb) },
-  { "/Prepare a Filter/... not Selected",              NULL, "... not Selected",               NULL, "... not Selected",               G_CALLBACK(prep_as_not_selected_cb) },
-  { "/Prepare a Filter/... and Selected",              NULL, "... and Selected",               NULL, "... and Selected",               G_CALLBACK(prep_as_and_selected_cb) },
-  { "/Prepare a Filter/... or Selected",               NULL, "... or Selected",                NULL, "... or Selected",                G_CALLBACK(prep_as_or_selected_cb) },
-  { "/Prepare a Filter/... and not Selected",  NULL, "... and not Selected",   NULL, "... and not Selected",   G_CALLBACK(prep_as_and_not_selected_cb) },
-  { "/Prepare a Filter/... or not Selected",   NULL, "... or not Selected",    NULL, "... or not Selected",    G_CALLBACK(prep_as_or_not_selected_cb) },
+  { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " not Selected",             NULL, UTF8_HORIZONTAL_ELLIPSIS " not Selected",         NULL, UTF8_HORIZONTAL_ELLIPSIS " not Selected",         G_CALLBACK(prep_as_not_selected_cb) },
+  { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected",             NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected",         NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected",         G_CALLBACK(prep_as_and_selected_cb) },
+  { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected",              NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected",          NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected",          G_CALLBACK(prep_as_or_selected_cb) },
+  { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected",     NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected",     G_CALLBACK(prep_as_and_not_selected_cb) },
+  { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected",  NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected",      NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected",      G_CALLBACK(prep_as_or_not_selected_cb) },
   { "/Find Frame/Selected",                                            NULL, "Selected",                               NULL, "Selected",                               G_CALLBACK(find_selected_cb) },
   { "/Find Frame/Not Selected",                                        NULL, "Not Selected",                   NULL, "Not Selected",                   G_CALLBACK(find_not_selected_cb) },
   { "/Find Previous/Selected",                                 NULL, "Selected",                               NULL, "Selected",                               G_CALLBACK(find_prev_selected_cb) },
@@ -302,10 +303,10 @@ srt_create_popup_menu(srt_stat_table *rst)
        GError *error = NULL;
 
        action_group = gtk_action_group_new ("ServiceRespTFilterPopupActionGroup");
-       gtk_action_group_add_actions (action_group,                                     /* the action group */
-                                     service_resp_t__popup_entries,                    /* an array of action descriptions */
+       gtk_action_group_add_actions (action_group,                                             /* the action group */
+                                     (gpointer)service_resp_t__popup_entries,          /* an array of action descriptions */
                                      G_N_ELEMENTS(service_resp_t__popup_entries),      /* the number of entries */
-                                     rst);                                             /* data to pass to the action callbacks */
+                                     rst);                                                                                     /* data to pass to the action callbacks */
 
        ui_manager = gtk_ui_manager_new ();
        gtk_ui_manager_insert_action_group (ui_manager,
@@ -314,7 +315,7 @@ srt_create_popup_menu(srt_stat_table *rst)
        gtk_ui_manager_add_ui_from_string (ui_manager,ui_desc_service_resp_t_filter_popup, -1, &error);
        if (error != NULL)
     {
-        fprintf (stderr, "Warning: building service responce time filter popup failed: %s\n",
+        fprintf (stderr, "Warning: building service response time filter popup failed: %s\n",
                 error->message);
         g_error_free (error);
         error = NULL;