aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2010-06-25 22:09:34 +0000
committerGerald Combs <gerald@wireshark.org>2010-06-25 22:09:34 +0000
commit96558700c1b3128ce1540f598946fe7112c7954c (patch)
tree21b3565dc05d9d2d5afa4736e4ad007751dc7c10
parentca6d2031cd0932b2e3a5eaa54336713afdf1ac74 (diff)
UTF-8-ize a bunch more arrows. If IE6 on XP can render them then they
*must* be safe to use, right? svn path=/trunk/; revision=33326
-rw-r--r--gtk/Makefile.common1
-rw-r--r--gtk/conversations_table.c301
-rw-r--r--gtk/follow_ssl.c9
-rw-r--r--gtk/follow_tcp.c18
-rw-r--r--gtk/follow_udp.c10
-rw-r--r--gtk/iax2_analysis.c5
-rw-r--r--gtk/rtp_analysis.c5
-rw-r--r--gtk/utf8_entities.h35
8 files changed, 212 insertions, 172 deletions
diff --git a/gtk/Makefile.common b/gtk/Makefile.common
index 3f59204d8c..7be3b23001 100644
--- a/gtk/Makefile.common
+++ b/gtk/Makefile.common
@@ -316,6 +316,7 @@ noinst_HEADERS = \
text_page_utils.h \
u3.h \
uat_gui.h \
+ utf8_entities.h \
voip_calls.h \
voip_calls_dlg.h \
webbrowser.h
diff --git a/gtk/conversations_table.c b/gtk/conversations_table.c
index 0737ccd6ce..e38816683e 100644
--- a/gtk/conversations_table.c
+++ b/gtk/conversations_table.c
@@ -54,6 +54,7 @@
#include "gtk/follow_tcp.h"
#include "gtk/follow_udp.h"
#include "gtk/keys.h"
+#include "gtk/utf8_entities.h"
#define COL_STR_LEN 16
#define CONV_PTR_KEY "conversations-pointer"
@@ -630,329 +631,329 @@ static GtkItemFactoryEntry ct_list_menu_items[] =
/* Match */
{"/Apply as Filter", NULL, NULL, 0, "<Branch>", NULL,},
{"/Apply as Filter/Selected", NULL, NULL, 0, "<Branch>", NULL,},
- {"/Apply as Filter/Selected/A <-> B", NULL,
+ {"/Apply as Filter/Selected/A " UTF8_LEFT_RIGHT_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_SELECTED, DIR_A_TO_FROM_B), NULL, NULL,},
- {"/Apply as Filter/Selected/A --> B", NULL,
+ {"/Apply as Filter/Selected/A " UTF8_RIGHTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_SELECTED, DIR_A_TO_B), NULL, NULL,},
- {"/Apply as Filter/Selected/A <-- B", NULL,
+ {"/Apply as Filter/Selected/A " UTF8_LEFTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_SELECTED, DIR_A_FROM_B), NULL, NULL,},
- {"/Apply as Filter/Selected/A <-> ANY", NULL,
+ {"/Apply as Filter/Selected/A " UTF8_LEFT_RIGHT_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL,},
- {"/Apply as Filter/Selected/A --> ANY", NULL,
+ {"/Apply as Filter/Selected/A " UTF8_RIGHTWARDS_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_SELECTED, DIR_A_TO_ANY), NULL, NULL,},
- {"/Apply as Filter/Selected/A <-- ANY", NULL,
+ {"/Apply as Filter/Selected/A " UTF8_LEFTWARDS_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_SELECTED, DIR_A_FROM_ANY), NULL, NULL,},
- {"/Apply as Filter/Selected/ANY <-> B", NULL,
+ {"/Apply as Filter/Selected/ANY " UTF8_LEFT_RIGHT_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL,},
- {"/Apply as Filter/Selected/ANY <-- B", NULL,
+ {"/Apply as Filter/Selected/ANY " UTF8_LEFTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_SELECTED, DIR_ANY_FROM_B), NULL, NULL,},
- {"/Apply as Filter/Selected/ANY --> B", NULL,
+ {"/Apply as Filter/Selected/ANY " UTF8_RIGHTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_SELECTED, DIR_ANY_TO_B), NULL, NULL,},
{"/Apply as Filter/Not Selected", NULL, NULL, 0, "<Branch>", NULL,},
- {"/Apply as Filter/Not Selected/A <-> B", NULL,
+ {"/Apply as Filter/Not Selected/A " UTF8_LEFT_RIGHT_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_NOT_SELECTED, DIR_A_TO_FROM_B), NULL, NULL,},
- {"/Apply as Filter/Not Selected/A --> B", NULL,
+ {"/Apply as Filter/Not Selected/A " UTF8_RIGHTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_NOT_SELECTED, DIR_A_TO_B), NULL, NULL,},
- {"/Apply as Filter/Not Selected/A <-- B", NULL,
+ {"/Apply as Filter/Not Selected/A " UTF8_LEFTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_NOT_SELECTED, DIR_A_FROM_B), NULL, NULL,},
- {"/Apply as Filter/Not Selected/A --> ANY", NULL,
+ {"/Apply as Filter/Not Selected/A " UTF8_RIGHTWARDS_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_NOT_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL,},
- {"/Apply as Filter/Not Selected/A <-> ANY", NULL,
+ {"/Apply as Filter/Not Selected/A " UTF8_LEFT_RIGHT_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_NOT_SELECTED, DIR_A_TO_ANY), NULL, NULL,},
- {"/Apply as Filter/Not Selected/A <-- ANY", NULL,
+ {"/Apply as Filter/Not Selected/A " UTF8_LEFTWARDS_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_NOT_SELECTED, DIR_A_FROM_ANY), NULL, NULL,},
- {"/Apply as Filter/Not Selected/ANY <-> B", NULL,
+ {"/Apply as Filter/Not Selected/ANY " UTF8_LEFT_RIGHT_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_NOT_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL,},
- {"/Apply as Filter/Not Selected/ANY <-- B", NULL,
+ {"/Apply as Filter/Not Selected/ANY " UTF8_LEFTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_NOT_SELECTED, DIR_ANY_FROM_B), NULL, NULL,},
- {"/Apply as Filter/Not Selected/ANY --> B", NULL,
+ {"/Apply as Filter/Not Selected/ANY " UTF8_RIGHTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_NOT_SELECTED, DIR_ANY_TO_B), NULL, NULL,},
{"/Apply as Filter/... and Selected", NULL, NULL, 0, "<Branch>", NULL,},
- {"/Apply as Filter/... and Selected/A <-> B", NULL,
+ {"/Apply as Filter/... and Selected/A " UTF8_LEFT_RIGHT_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_SELECTED, DIR_A_TO_FROM_B), NULL, NULL,},
- {"/Apply as Filter/... and Selected/A --> B", NULL,
+ {"/Apply as Filter/... and Selected/A " UTF8_RIGHTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_SELECTED, DIR_A_TO_B), NULL, NULL,},
- {"/Apply as Filter/... and Selected/A <-- B", NULL,
+ {"/Apply as Filter/... and Selected/A " UTF8_LEFTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_SELECTED, DIR_A_FROM_B), NULL, NULL,},
- {"/Apply as Filter/... and Selected/A <-> ANY", NULL,
+ {"/Apply as Filter/... and Selected/A " UTF8_LEFT_RIGHT_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL,},
- {"/Apply as Filter/... and Selected/A --> ANY", NULL,
+ {"/Apply as Filter/... and Selected/A " UTF8_RIGHTWARDS_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_SELECTED, DIR_A_TO_ANY), NULL, NULL,},
- {"/Apply as Filter/... and Selected/A <-- ANY", NULL,
+ {"/Apply as Filter/... and Selected/A " UTF8_LEFTWARDS_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_SELECTED, DIR_A_FROM_ANY), NULL, NULL,},
- {"/Apply as Filter/... and Selected/ANY <-> B", NULL,
+ {"/Apply as Filter/... and Selected/ANY " UTF8_LEFT_RIGHT_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL,},
- {"/Apply as Filter/... and Selected/ANY <-- B", NULL,
+ {"/Apply as Filter/... and Selected/ANY " UTF8_LEFTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_SELECTED, DIR_ANY_FROM_B), NULL, NULL,},
- {"/Apply as Filter/... and Selected/ANY --> B", NULL,
+ {"/Apply as Filter/... and Selected/ANY " UTF8_RIGHTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_SELECTED, DIR_ANY_TO_B), NULL, NULL,},
{"/Apply as Filter/... or Selected", NULL, NULL, 0, "<Branch>", NULL,},
- {"/Apply as Filter/... or Selected/A <-> B", NULL,
+ {"/Apply as Filter/... or Selected/A " UTF8_LEFT_RIGHT_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_SELECTED, DIR_A_TO_FROM_B), NULL, NULL,},
- {"/Apply as Filter/... or Selected/A --> B", NULL,
+ {"/Apply as Filter/... or Selected/A " UTF8_RIGHTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_SELECTED, DIR_A_TO_B), NULL, NULL,},
- {"/Apply as Filter/... or Selected/A <-- B", NULL,
+ {"/Apply as Filter/... or Selected/A " UTF8_LEFTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_SELECTED, DIR_A_FROM_B), NULL, NULL,},
- {"/Apply as Filter/... or Selected/A <-> ANY", NULL,
+ {"/Apply as Filter/... or Selected/A " UTF8_LEFT_RIGHT_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL,},
- {"/Apply as Filter/... or Selected/A --> ANY", NULL,
+ {"/Apply as Filter/... or Selected/A " UTF8_RIGHTWARDS_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_SELECTED, DIR_A_TO_ANY), NULL, NULL,},
- {"/Apply as Filter/... or Selected/A <-- ANY", NULL,
+ {"/Apply as Filter/... or Selected/A " UTF8_LEFTWARDS_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_SELECTED, DIR_A_FROM_ANY), NULL, NULL,},
- {"/Apply as Filter/... or Selected/ANY <-> B", NULL,
+ {"/Apply as Filter/... or Selected/ANY " UTF8_LEFT_RIGHT_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL,},
- {"/Apply as Filter/... or Selected/ANY <-- B", NULL,
+ {"/Apply as Filter/... or Selected/ANY " UTF8_LEFTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_SELECTED, DIR_ANY_FROM_B), NULL, NULL,},
- {"/Apply as Filter/... or Selected/ANY --> B", NULL,
+ {"/Apply as Filter/... or Selected/ANY " UTF8_RIGHTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_SELECTED, DIR_ANY_TO_B), NULL, NULL,},
{"/Apply as Filter/... and not Selected", NULL, NULL, 0, "<Branch>", NULL,},
- {"/Apply as Filter/... and not Selected/A <-> B", NULL,
+ {"/Apply as Filter/... and not Selected/A " UTF8_LEFT_RIGHT_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, DIR_A_TO_FROM_B), NULL, NULL,},
- {"/Apply as Filter/... and not Selected/A --> B", NULL,
+ {"/Apply as Filter/... and not Selected/A " UTF8_RIGHTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, DIR_A_TO_B), NULL, NULL,},
- {"/Apply as Filter/... and not Selected/A <-- B", NULL,
+ {"/Apply as Filter/... and not Selected/A " UTF8_LEFTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, DIR_A_FROM_B), NULL, NULL,},
- {"/Apply as Filter/... and not Selected/A <-> ANY", NULL,
+ {"/Apply as Filter/... and not Selected/A " UTF8_LEFT_RIGHT_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL,},
- {"/Apply as Filter/... and not Selected/A --> ANY", NULL,
+ {"/Apply as Filter/... and not Selected/A " UTF8_RIGHTWARDS_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, DIR_A_TO_ANY), NULL, NULL,},
- {"/Apply as Filter/... and not Selected/A <-- ANY", NULL,
+ {"/Apply as Filter/... and not Selected/A " UTF8_LEFTWARDS_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, DIR_A_FROM_ANY), NULL, NULL,},
- {"/Apply as Filter/... and not Selected/ANY <-> B", NULL,
+ {"/Apply as Filter/... and not Selected/ANY " UTF8_LEFT_RIGHT_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL,},
- {"/Apply as Filter/... and not Selected/ANY <-- B", NULL,
+ {"/Apply as Filter/... and not Selected/ANY " UTF8_LEFTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, DIR_ANY_FROM_B), NULL, NULL,},
- {"/Apply as Filter/... and not Selected/ANY --> B", NULL,
+ {"/Apply as Filter/... and not Selected/ANY " UTF8_RIGHTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, DIR_ANY_TO_B), NULL, NULL,},
{"/Apply as Filter/... or not Selected", NULL, NULL, 0, "<Branch>", NULL,},
- {"/Apply as Filter/... or not Selected/A <-> B", NULL,
+ {"/Apply as Filter/... or not Selected/A " UTF8_LEFT_RIGHT_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, DIR_A_TO_FROM_B), NULL, NULL,},
- {"/Apply as Filter/... or not Selected/A --> B", NULL,
+ {"/Apply as Filter/... or not Selected/A " UTF8_RIGHTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, DIR_A_TO_B), NULL, NULL,},
- {"/Apply as Filter/... or not Selected/A <-- B", NULL,
+ {"/Apply as Filter/... or not Selected/A " UTF8_LEFTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, DIR_A_FROM_B), NULL, NULL,},
- {"/Apply as Filter/... or not Selected/A <-> ANY", NULL,
+ {"/Apply as Filter/... or not Selected/A " UTF8_LEFT_RIGHT_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL,},
- {"/Apply as Filter/... or not Selected/A --> ANY", NULL,
+ {"/Apply as Filter/... or not Selected/A " UTF8_RIGHTWARDS_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, DIR_A_TO_ANY), NULL, NULL,},
- {"/Apply as Filter/... or not Selected/A <-- ANY", NULL,
+ {"/Apply as Filter/... or not Selected/A " UTF8_LEFTWARDS_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, DIR_A_FROM_ANY), NULL, NULL,},
- {"/Apply as Filter/... or not Selected/ANY <-> B", NULL,
+ {"/Apply as Filter/... or not Selected/ANY " UTF8_LEFT_RIGHT_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL,},
- {"/Apply as Filter/... or not Selected/ANY <-- B", NULL,
+ {"/Apply as Filter/... or not Selected/ANY " UTF8_LEFTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, DIR_ANY_FROM_B), NULL, NULL,},
- {"/Apply as Filter/... or not Selected/ANY --> B", NULL,
+ {"/Apply as Filter/... or not Selected/ANY " UTF8_RIGHTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, DIR_ANY_TO_B), NULL, NULL,},
/* Prepare */
{"/Prepare a Filter", NULL, NULL, 0, "<Branch>", NULL,},
{"/Prepare a Filter/Selected", NULL, NULL, 0, "<Branch>", NULL,},
- {"/Prepare a Filter/Selected/A <-> B", NULL,
+ {"/Prepare a Filter/Selected/A " UTF8_LEFT_RIGHT_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_SELECTED, DIR_A_TO_FROM_B), NULL, NULL,},
- {"/Prepare a Filter/Selected/A --> B", NULL,
+ {"/Prepare a Filter/Selected/A " UTF8_RIGHTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_SELECTED, DIR_A_TO_B), NULL, NULL,},
- {"/Prepare a Filter/Selected/A <-- B", NULL,
+ {"/Prepare a Filter/Selected/A " UTF8_LEFTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_SELECTED, DIR_A_FROM_B), NULL, NULL,},
- {"/Prepare a Filter/Selected/A <-> ANY", NULL,
+ {"/Prepare a Filter/Selected/A " UTF8_LEFT_RIGHT_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL,},
- {"/Prepare a Filter/Selected/A --> ANY", NULL,
+ {"/Prepare a Filter/Selected/A " UTF8_RIGHTWARDS_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_SELECTED, DIR_A_TO_ANY), NULL, NULL,},
- {"/Prepare a Filter/Selected/A <-- ANY", NULL,
+ {"/Prepare a Filter/Selected/A " UTF8_LEFTWARDS_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_SELECTED, DIR_A_FROM_ANY), NULL, NULL,},
- {"/Prepare a Filter/Selected/ANY <-> B", NULL,
+ {"/Prepare a Filter/Selected/ANY " UTF8_LEFT_RIGHT_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL,},
- {"/Prepare a Filter/Selected/ANY <-- B", NULL,
+ {"/Prepare a Filter/Selected/ANY " UTF8_LEFTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_SELECTED, DIR_ANY_FROM_B), NULL, NULL,},
- {"/Prepare a Filter/Selected/ANY --> B", NULL,
+ {"/Prepare a Filter/Selected/ANY " UTF8_RIGHTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_SELECTED, DIR_ANY_TO_B), NULL, NULL,},
{"/Prepare a Filter/Not Selected", NULL, NULL, 0, "<Branch>", NULL,},
- {"/Prepare a Filter/Not Selected/A <-> B", NULL,
+ {"/Prepare a Filter/Not Selected/A " UTF8_LEFT_RIGHT_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, DIR_A_TO_FROM_B), NULL, NULL,},
- {"/Prepare a Filter/Not Selected/A --> B", NULL,
+ {"/Prepare a Filter/Not Selected/A " UTF8_RIGHTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, DIR_A_TO_B), NULL, NULL,},
- {"/Prepare a Filter/Not Selected/A <-- B", NULL,
+ {"/Prepare a Filter/Not Selected/A " UTF8_LEFTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, DIR_A_FROM_B), NULL, NULL,},
- {"/Prepare a Filter/Not Selected/A <-> ANY", NULL,
+ {"/Prepare a Filter/Not Selected/A " UTF8_LEFT_RIGHT_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL,},
- {"/Prepare a Filter/Not Selected/A --> ANY", NULL,
+ {"/Prepare a Filter/Not Selected/A " UTF8_RIGHTWARDS_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, DIR_A_TO_ANY), NULL, NULL,},
- {"/Prepare a Filter/Not Selected/A <-- ANY", NULL,
+ {"/Prepare a Filter/Not Selected/A " UTF8_LEFTWARDS_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, DIR_A_FROM_ANY), NULL, NULL,},
- {"/Prepare a Filter/Not Selected/ANY <-> B", NULL,
+ {"/Prepare a Filter/Not Selected/ANY " UTF8_LEFT_RIGHT_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL,},
- {"/Prepare a Filter/Not Selected/ANY <-- B", NULL,
+ {"/Prepare a Filter/Not Selected/ANY " UTF8_LEFTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, DIR_ANY_FROM_B), NULL, NULL,},
- {"/Prepare a Filter/Not Selected/ANY --> B", NULL,
+ {"/Prepare a Filter/Not Selected/ANY " UTF8_RIGHTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, DIR_ANY_TO_B), NULL, NULL,},
{"/Prepare a Filter/... and Selected", NULL, NULL, 0, "<Branch>", NULL,},
- {"/Prepare a Filter/... and Selected/A <-> B", NULL,
+ {"/Prepare a Filter/... and Selected/A " UTF8_LEFT_RIGHT_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_SELECTED, DIR_A_TO_FROM_B), NULL, NULL,},
- {"/Prepare a Filter/... and Selected/A --> B", NULL,
+ {"/Prepare a Filter/... and Selected/A " UTF8_RIGHTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_SELECTED, DIR_A_TO_B), NULL, NULL,},
- {"/Prepare a Filter/... and Selected/A <-- B", NULL,
+ {"/Prepare a Filter/... and Selected/A " UTF8_LEFTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_SELECTED, DIR_A_FROM_B), NULL, NULL,},
- {"/Prepare a Filter/... and Selected/A <-> ANY", NULL,
+ {"/Prepare a Filter/... and Selected/A " UTF8_LEFT_RIGHT_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL,},
- {"/Prepare a Filter/... and Selected/A --> ANY", NULL,
+ {"/Prepare a Filter/... and Selected/A " UTF8_RIGHTWARDS_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_SELECTED, DIR_A_TO_ANY), NULL, NULL,},
- {"/Prepare a Filter/... and Selected/A <-- ANY", NULL,
+ {"/Prepare a Filter/... and Selected/A " UTF8_LEFTWARDS_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_SELECTED, DIR_A_FROM_ANY), NULL, NULL,},
- {"/Prepare a Filter/... and Selected/ANY <-> B", NULL,
+ {"/Prepare a Filter/... and Selected/ANY " UTF8_LEFT_RIGHT_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL,},
- {"/Prepare a Filter/... and Selected/ANY <-- B", NULL,
+ {"/Prepare a Filter/... and Selected/ANY " UTF8_LEFTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_SELECTED, DIR_ANY_FROM_B), NULL, NULL,},
- {"/Prepare a Filter/... and Selected/ANY --> B", NULL,
+ {"/Prepare a Filter/... and Selected/ANY " UTF8_RIGHTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_SELECTED, DIR_ANY_TO_B), NULL, NULL,},
{"/Prepare a Filter/... or Selected", NULL, NULL, 0, "<Branch>", NULL,},
- {"/Prepare a Filter/... or Selected/A <-> B", NULL,
+ {"/Prepare a Filter/... or Selected/A " UTF8_LEFT_RIGHT_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_SELECTED, DIR_A_TO_FROM_B), NULL, NULL,},
- {"/Prepare a Filter/... or Selected/A --> B", NULL,
+ {"/Prepare a Filter/... or Selected/A " UTF8_RIGHTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_SELECTED, DIR_A_TO_B), NULL, NULL,},
- {"/Prepare a Filter/... or Selected/A <-- B", NULL,
+ {"/Prepare a Filter/... or Selected/A " UTF8_LEFTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_SELECTED, DIR_A_FROM_B), NULL, NULL,},
- {"/Prepare a Filter/... or Selected/A <-> ANY", NULL,
+ {"/Prepare a Filter/... or Selected/A " UTF8_LEFT_RIGHT_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL,},
- {"/Prepare a Filter/... or Selected/A --> ANY", NULL,
+ {"/Prepare a Filter/... or Selected/A " UTF8_RIGHTWARDS_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_SELECTED, DIR_A_TO_ANY), NULL, NULL,},
- {"/Prepare a Filter/... or Selected/A <-- ANY", NULL,
+ {"/Prepare a Filter/... or Selected/A " UTF8_LEFTWARDS_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_SELECTED, DIR_A_FROM_ANY), NULL, NULL,},
- {"/Prepare a Filter/... or Selected/ANY <-> B", NULL,
+ {"/Prepare a Filter/... or Selected/ANY " UTF8_LEFT_RIGHT_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL,},
- {"/Prepare a Filter/... or Selected/ANY <-- B", NULL,
+ {"/Prepare a Filter/... or Selected/ANY " UTF8_LEFTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_SELECTED, DIR_ANY_FROM_B), NULL, NULL,},
- {"/Prepare a Filter/... or Selected/ANY --> B", NULL,
+ {"/Prepare a Filter/... or Selected/ANY " UTF8_RIGHTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_SELECTED, DIR_ANY_TO_B), NULL, NULL,},
{"/Prepare a Filter/... and not Selected", NULL, NULL, 0, "<Branch>", NULL,},
- {"/Prepare a Filter/... and not Selected/A <-> B", NULL,
+ {"/Prepare a Filter/... and not Selected/A " UTF8_LEFT_RIGHT_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, DIR_A_TO_FROM_B), NULL, NULL,},
- {"/Prepare a Filter/... and not Selected/A --> B", NULL,
+ {"/Prepare a Filter/... and not Selected/A " UTF8_RIGHTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, DIR_A_TO_B), NULL, NULL,},
- {"/Prepare a Filter/... and not Selected/A <-- B", NULL,
+ {"/Prepare a Filter/... and not Selected/A " UTF8_LEFTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, DIR_A_FROM_B), NULL, NULL,},
- {"/Prepare a Filter/... and not Selected/A <-> ANY", NULL,
+ {"/Prepare a Filter/... and not Selected/A " UTF8_LEFT_RIGHT_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL,},
- {"/Prepare a Filter/... and not Selected/A --> ANY", NULL,
+ {"/Prepare a Filter/... and not Selected/A " UTF8_RIGHTWARDS_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, DIR_A_TO_ANY), NULL, NULL,},
- {"/Prepare a Filter/... and not Selected/A <-- ANY", NULL,
+ {"/Prepare a Filter/... and not Selected/A " UTF8_LEFTWARDS_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, DIR_A_FROM_ANY), NULL, NULL,},
- {"/Prepare a Filter/... and not Selected/ANY <-> B", NULL,
+ {"/Prepare a Filter/... and not Selected/ANY " UTF8_LEFT_RIGHT_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL,},
- {"/Prepare a Filter/... and not Selected/ANY <-- B", NULL,
+ {"/Prepare a Filter/... and not Selected/ANY " UTF8_LEFTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, DIR_ANY_FROM_B), NULL, NULL,},
- {"/Prepare a Filter/... and not Selected/ANY --> B", NULL,
+ {"/Prepare a Filter/... and not Selected/ANY " UTF8_RIGHTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, DIR_ANY_TO_B), NULL, NULL,},
{"/Prepare a Filter/... or not Selected", NULL, NULL, 0, "<Branch>", NULL,},
- {"/Prepare a Filter/... or not Selected/A <-> B", NULL,
+ {"/Prepare a Filter/... or not Selected/A " UTF8_LEFT_RIGHT_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, DIR_A_TO_FROM_B), NULL, NULL,},
- {"/Prepare a Filter/... or not Selected/A --> B", NULL,
+ {"/Prepare a Filter/... or not Selected/A " UTF8_RIGHTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, DIR_A_TO_B), NULL, NULL,},
- {"/Prepare a Filter/... or not Selected/A <-- B", NULL,
+ {"/Prepare a Filter/... or not Selected/A " UTF8_LEFTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, DIR_A_FROM_B), NULL, NULL,},
- {"/Prepare a Filter/... or not Selected/A <-> ANY", NULL,
+ {"/Prepare a Filter/... or not Selected/A " UTF8_LEFT_RIGHT_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL,},
- {"/Prepare a Filter/... or not Selected/A --> ANY", NULL,
+ {"/Prepare a Filter/... or not Selected/A " UTF8_RIGHTWARDS_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, DIR_A_TO_ANY), NULL, NULL,},
- {"/Prepare a Filter/... or not Selected/A <-- ANY", NULL,
+ {"/Prepare a Filter/... or not Selected/A " UTF8_LEFTWARDS_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, DIR_A_FROM_ANY), NULL, NULL,},
- {"/Prepare a Filter/... or not Selected/ANY <-> B", NULL,
+ {"/Prepare a Filter/... or not Selected/ANY " UTF8_LEFT_RIGHT_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL,},
- {"/Prepare a Filter/... or not Selected/ANY <-- B", NULL,
+ {"/Prepare a Filter/... or not Selected/ANY " UTF8_LEFTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, DIR_ANY_FROM_B), NULL, NULL,},
- {"/Prepare a Filter/... or not Selected/ANY --> B", NULL,
+ {"/Prepare a Filter/... or not Selected/ANY " UTF8_RIGHTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, DIR_ANY_TO_B), NULL, NULL,},
/* Find Packet */
{"/Find Packet", NULL, NULL, 0, "<Branch>", NULL,},
{"/Find Packet/Find Packet", NULL, NULL, 0, "<Branch>", NULL,},
- {"/Find Packet/Find Packet/A <-> B", NULL,
+ {"/Find Packet/Find Packet/A " UTF8_LEFT_RIGHT_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_FRAME(ACTYPE_SELECTED, DIR_A_TO_FROM_B), NULL, NULL,},
- {"/Find Packet/Find Packet/A --> B", NULL,
+ {"/Find Packet/Find Packet/A " UTF8_RIGHTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_FRAME(ACTYPE_SELECTED, DIR_A_TO_B), NULL, NULL,},
- {"/Find Packet/Find Packet/A <-- B", NULL,
+ {"/Find Packet/Find Packet/A " UTF8_LEFTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_FRAME(ACTYPE_SELECTED, DIR_A_FROM_B), NULL, NULL,},
- {"/Find Packet/Find Packet/A <-> ANY", NULL,
+ {"/Find Packet/Find Packet/A " UTF8_LEFT_RIGHT_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_FRAME(ACTYPE_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL,},
- {"/Find Packet/Find Packet/A --> ANY", NULL,
+ {"/Find Packet/Find Packet/A " UTF8_RIGHTWARDS_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_FRAME(ACTYPE_SELECTED, DIR_A_TO_ANY), NULL, NULL,},
- {"/Find Packet/Find Packet/A <-- ANY", NULL,
+ {"/Find Packet/Find Packet/A " UTF8_LEFTWARDS_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_FRAME(ACTYPE_SELECTED, DIR_A_FROM_ANY), NULL, NULL,},
- {"/Find Packet/Find Packet/ANY <-> B", NULL,
+ {"/Find Packet/Find Packet/ANY " UTF8_LEFT_RIGHT_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_FRAME(ACTYPE_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL,},
- {"/Find Packet/Find Packet/ANY <-- B", NULL,
+ {"/Find Packet/Find Packet/ANY " UTF8_LEFTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_FRAME(ACTYPE_SELECTED, DIR_ANY_FROM_B), NULL, NULL,},
- {"/Find Packet/Find Packet/ANY --> B", NULL,
+ {"/Find Packet/Find Packet/ANY " UTF8_RIGHTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_FRAME(ACTYPE_SELECTED, DIR_ANY_TO_B), NULL, NULL,},
/* Find Next */
{"/Find Packet/Find Next", NULL, NULL, 0, "<Branch>", NULL,},
- {"/Find Packet/Find Next/A <-> B", NULL,
+ {"/Find Packet/Find Next/A " UTF8_LEFT_RIGHT_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_NEXT(ACTYPE_SELECTED, DIR_A_TO_FROM_B), NULL, NULL,},
- {"/Find Packet/Find Next/A --> B", NULL,
+ {"/Find Packet/Find Next/A " UTF8_RIGHTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_NEXT(ACTYPE_SELECTED, DIR_A_TO_B), NULL, NULL,},
- {"/Find Packet/Find Next/A <-- B", NULL,
+ {"/Find Packet/Find Next/A " UTF8_LEFTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_NEXT(ACTYPE_SELECTED, DIR_A_FROM_B), NULL, NULL,},
- {"/Find Packet/Find Next/A <-> ANY", NULL,
+ {"/Find Packet/Find Next/A " UTF8_LEFT_RIGHT_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_NEXT(ACTYPE_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL,},
- {"/Find Packet/Find Next/A --> ANY", NULL,
+ {"/Find Packet/Find Next/A " UTF8_RIGHTWARDS_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_NEXT(ACTYPE_SELECTED, DIR_A_TO_ANY), NULL, NULL,},
- {"/Find Packet/Find Next/A <-- ANY", NULL,
+ {"/Find Packet/Find Next/A " UTF8_LEFTWARDS_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_NEXT(ACTYPE_SELECTED, DIR_A_FROM_ANY), NULL, NULL,},
- {"/Find Packet/Find Next/ANY <-> B", NULL,
+ {"/Find Packet/Find Next/ANY " UTF8_LEFT_RIGHT_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_NEXT(ACTYPE_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL,},
- {"/Find Packet/Find Next/ANY <-- B", NULL,
+ {"/Find Packet/Find Next/ANY " UTF8_LEFTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_NEXT(ACTYPE_SELECTED, DIR_ANY_FROM_B), NULL, NULL,},
- {"/Find Packet/Find Next/ANY --> B", NULL,
+ {"/Find Packet/Find Next/ANY " UTF8_RIGHTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_NEXT(ACTYPE_SELECTED, DIR_ANY_TO_B), NULL, NULL,},
/* Find Previous */
{"/Find Packet/Find Previous", NULL, NULL, 0, "<Branch>", NULL,},
- {"/Find Packet/Find Previous/A <-> B", NULL,
+ {"/Find Packet/Find Previous/A " UTF8_LEFT_RIGHT_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, DIR_A_TO_FROM_B), NULL, NULL,},
- {"/Find Packet/Find Previous/A --> B", NULL,
+ {"/Find Packet/Find Previous/A " UTF8_RIGHTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, DIR_A_TO_B), NULL, NULL,},
- {"/Find Packet/Find Previous/A <-- B", NULL,
+ {"/Find Packet/Find Previous/A " UTF8_LEFTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, DIR_A_FROM_B), NULL, NULL,},
- {"/Find Packet/Find Previous/A <-> ANY", NULL,
+ {"/Find Packet/Find Previous/A " UTF8_LEFT_RIGHT_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL,},
- {"/Find Packet/Find Previous/A --> ANY", NULL,
+ {"/Find Packet/Find Previous/A " UTF8_RIGHTWARDS_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, DIR_A_TO_ANY), NULL, NULL,},
- {"/Find Packet/Find Previous/A <-- ANY", NULL,
+ {"/Find Packet/Find Previous/A " UTF8_LEFTWARDS_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, DIR_A_FROM_ANY), NULL, NULL,},
- {"/Find Packet/Find Previous/ANY <-> B", NULL,
+ {"/Find Packet/Find Previous/ANY " UTF8_LEFT_RIGHT_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL,},
- {"/Find Packet/Find Previous/ANY <-- B", NULL,
+ {"/Find Packet/Find Previous/ANY " UTF8_LEFTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, DIR_ANY_FROM_B), NULL, NULL,},
- {"/Find Packet/Find Previous/ANY --> B", NULL,
+ {"/Find Packet/Find Previous/ANY " UTF8_RIGHTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, DIR_ANY_TO_B), NULL, NULL,},
/* Colorize Conversation */
{"/Colorize Conversation", NULL, NULL, 0, "<Branch>", NULL,},
- {"/Colorize Conversation/A <-> B", NULL,
+ {"/Colorize Conversation/A " UTF8_LEFT_RIGHT_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_COLORIZE(ACTYPE_SELECTED, DIR_A_TO_FROM_B), NULL, NULL,},
- {"/Colorize Conversation/A --> B", NULL,
+ {"/Colorize Conversation/A " UTF8_RIGHTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_COLORIZE(ACTYPE_SELECTED, DIR_A_TO_B), NULL, NULL,},
- {"/Colorize Conversation/A <-- B", NULL,
+ {"/Colorize Conversation/A " UTF8_LEFTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_COLORIZE(ACTYPE_SELECTED, DIR_A_FROM_B), NULL, NULL,},
- {"/Colorize Conversation/A <-> ANY", NULL,
+ {"/Colorize Conversation/A " UTF8_LEFT_RIGHT_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_COLORIZE(ACTYPE_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL,},
- {"/Colorize Conversation/A --> ANY", NULL,
+ {"/Colorize Conversation/A " UTF8_RIGHTWARDS_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_COLORIZE(ACTYPE_SELECTED, DIR_A_TO_ANY), NULL, NULL,},
- {"/Colorize Conversation/A <-- ANY", NULL,
+ {"/Colorize Conversation/A " UTF8_LEFTWARDS_ARROW " ANY", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_COLORIZE(ACTYPE_SELECTED, DIR_A_FROM_ANY), NULL, NULL,},
- {"/Colorize Conversation/ANY <-> B", NULL,
+ {"/Colorize Conversation/ANY " UTF8_LEFT_RIGHT_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_COLORIZE(ACTYPE_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL,},
- {"/Colorize Conversation/ANY <-- B", NULL,
+ {"/Colorize Conversation/ANY " UTF8_LEFTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_COLORIZE(ACTYPE_SELECTED, DIR_ANY_FROM_B), NULL, NULL,},
- {"/Colorize Conversation/ANY --> B", NULL,
+ {"/Colorize Conversation/ANY " UTF8_RIGHTWARDS_ARROW " B", NULL,
GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_COLORIZE(ACTYPE_SELECTED, DIR_ANY_TO_B), NULL, NULL,}
};
@@ -1349,14 +1350,14 @@ init_ct_table_page(conversations_table *conversations, GtkWidget *vbox, gboolean
conversations->default_titles[3]="Port B";
conversations->default_titles[4]="Packets";
conversations->default_titles[5]="Bytes";
- conversations->default_titles[6]="Packets A->B";
- conversations->default_titles[7]="Bytes A->B";
- conversations->default_titles[8]="Packets A<-B";
- conversations->default_titles[9]="Bytes A<-B";
+ conversations->default_titles[6]="Packets A" UTF8_RIGHTWARDS_ARROW "B";
+ conversations->default_titles[7]="Bytes A" UTF8_RIGHTWARDS_ARROW "B";
+ conversations->default_titles[8]="Packets A" UTF8_LEFTWARDS_ARROW "B";
+ conversations->default_titles[9]="Bytes A" UTF8_LEFTWARDS_ARROW "B";
conversations->default_titles[10]="Rel Start";
conversations->default_titles[11]="Duration";
- conversations->default_titles[12]="bps A->B";
- conversations->default_titles[13]="bps A<-B";
+ conversations->default_titles[12]="bps A" UTF8_RIGHTWARDS_ARROW "B";
+ conversations->default_titles[13]="bps A" UTF8_LEFTWARDS_ARROW "B";
if (strcmp(table_name, "NCP")==0) {
conversations->default_titles[1]="Connection A";
diff --git a/gtk/follow_ssl.c b/gtk/follow_ssl.c
index 03a66c0536..843db21e49 100644
--- a/gtk/follow_ssl.c
+++ b/gtk/follow_ssl.c
@@ -61,6 +61,7 @@
#include <gtk/font_utils.h>
#include "gtk/follow_ssl.h"
#include "gtk/follow_stream.h"
+#include "gtk/utf8_entities.h"
#ifdef SSL_PLUGIN
#include "packet-ssl-utils.h"
@@ -251,25 +252,25 @@ follow_ssl_stream_cb(GtkWidget * w, gpointer data _U_)
if(follow_info->client_port == stats.port[0]) {
server_to_client_string =
- g_strdup_printf("%s:%s --> %s:%s (%u bytes)",
+ g_strdup_printf("%s:%s " UTF8_RIGHTWARDS_ARROW " %s:%s (%u bytes)",
hostname0, port0,
hostname1, port1,
follow_info->bytes_written[0]);
client_to_server_string =
- g_strdup_printf("%s:%s --> %s:%s (%u bytes)",
+ g_strdup_printf("%s:%s " UTF8_RIGHTWARDS_ARROW " %s:%s (%u bytes)",
hostname1, port1,
hostname0, port0,
follow_info->bytes_written[1]);
} else {
server_to_client_string =
- g_strdup_printf("%s:%s --> %s:%s (%u bytes)",
+ g_strdup_printf("%s:%s " UTF8_RIGHTWARDS_ARROW " %s:%s (%u bytes)",
hostname1, port1,
hostname0, port0,
follow_info->bytes_written[0]);
client_to_server_string =
- g_strdup_printf("%s:%s --> %s:%s (%u bytes)",
+ g_strdup_printf("%s:%s " UTF8_RIGHTWARDS_ARROW " %s:%s (%u bytes)",
hostname0, port0,
hostname1, port1,
follow_info->bytes_written[1]);
diff --git a/gtk/follow_tcp.c b/gtk/follow_tcp.c
index ec38d86199..2c79c435cb 100644
--- a/gtk/follow_tcp.c
+++ b/gtk/follow_tcp.c
@@ -68,6 +68,7 @@
#include "gtk/font_utils.h"
#include "gtk/help_dlg.h"
#include "gtk/follow_stream.h"
+#include "gtk/utf8_entities.h"
/* With MSVC and a libwireshark.dll, we need a special declaration. */
WS_VAR_IMPORT FILE *data_out_file;
@@ -106,7 +107,6 @@ follow_tcp_stream_cb(GtkWidget * w, gpointer data _U_)
tcp_stream_chunk sc;
size_t nchars;
gchar *data_out_filename;
- const char rarr_str[] = { 0xe2, 0x86, 0x92, 0x00 };
/* we got tcp so we can follow */
if (cfile.edt->pi.ipproto != IP_PROTO_TCP) {
@@ -271,14 +271,14 @@ follow_tcp_stream_cb(GtkWidget * w, gpointer data _U_)
/* Host 0 --> Host 1 */
if(sc.src_port == stats.port[0]) {
server_to_client_string =
- g_strdup_printf("%s:%s %s %s:%s (%u bytes)",
- hostname0, port0, rarr_str,
+ g_strdup_printf("%s:%s " UTF8_RIGHTWARDS_ARROW " %s:%s (%u bytes)",
+ hostname0, port0,
hostname1, port1,
stats.bytes_written[0]);
} else {
server_to_client_string =
- g_strdup_printf("%s:%s %s %s:%s (%u bytes)",
- hostname1, port1, rarr_str,
+ g_strdup_printf("%s:%s " UTF8_RIGHTWARDS_ARROW " %s:%s (%u bytes)",
+ hostname1, port1,
hostname0,port0,
stats.bytes_written[0]);
}
@@ -286,14 +286,14 @@ follow_tcp_stream_cb(GtkWidget * w, gpointer data _U_)
/* Host 1 --> Host 0 */
if(sc.src_port == stats.port[1]) {
client_to_server_string =
- g_strdup_printf("%s:%s %s %s:%s (%u bytes)",
- hostname0, port0, rarr_str,
+ g_strdup_printf("%s:%s " UTF8_RIGHTWARDS_ARROW " %s:%s (%u bytes)",
+ hostname0, port0,
hostname1, port1,
stats.bytes_written[1]);
} else {
client_to_server_string =
- g_strdup_printf("%s:%s %s %s:%s (%u bytes)",
- hostname1, port1, rarr_str,
+ g_strdup_printf("%s:%s " UTF8_RIGHTWARDS_ARROW " %s:%s (%u bytes)",
+ hostname1, port1,
hostname0, port0,
stats.bytes_written[1]);
}
diff --git a/gtk/follow_udp.c b/gtk/follow_udp.c
index 097c1e62bb..3b2344bb4c 100644
--- a/gtk/follow_udp.c
+++ b/gtk/follow_udp.c
@@ -44,7 +44,7 @@
#include <gtk/keys.h>
#include <gtk/main.h>
#include "gtk/follow_udp.h"
-
+#include "gtk/utf8_entities.h"
static int
udp_queue_packet_data(void *tapdata, packet_info *pinfo,
@@ -200,25 +200,25 @@ follow_udp_stream_cb(GtkWidget *w, gpointer data _U_)
if(follow_info->client_port == stats.port[0]) {
server_to_client_string =
- g_strdup_printf("%s:%s --> %s:%s (%u bytes)",
+ g_strdup_printf("%s:%s " UTF8_RIGHTWARDS_ARROW " %s:%s (%u bytes)",
hostname0, port0,
hostname1, port1,
follow_info->bytes_written[0]);
client_to_server_string =
- g_strdup_printf("%s:%s --> %s:%s (%u bytes)",
+ g_strdup_printf("%s:%s " UTF8_RIGHTWARDS_ARROW " %s:%s (%u bytes)",
hostname1, port1,
hostname0, port0,
follow_info->bytes_written[1]);
} else {
server_to_client_string =
- g_strdup_printf("%s:%s --> %s:%s (%u bytes)",
+ g_strdup_printf("%s:%s " UTF8_RIGHTWARDS_ARROW " %s:%s (%u bytes)",
hostname1, port1,
hostname0, port0,
follow_info->bytes_written[0]);
client_to_server_string =
- g_strdup_printf("%s:%s --> %s:%s (%u bytes)",
+ g_strdup_printf("%s:%s " UTF8_RIGHTWARDS_ARROW " %s:%s (%u bytes)",
hostname0, port0,
hostname1, port1,
follow_info->bytes_written[1]);
diff --git a/gtk/iax2_analysis.c b/gtk/iax2_analysis.c
index 2061e14d0a..2a2bb93302 100644
--- a/gtk/iax2_analysis.c
+++ b/gtk/iax2_analysis.c
@@ -85,6 +85,7 @@
#include "gtk/iax2_analysis.h"
#include "gtk/rtp_stream.h"
#include "gtk/rtp_stream_dlg.h"
+#include "gtk/utf8_entities.h"
enum
{
@@ -1127,7 +1128,7 @@ static void dialog_graph_draw(user_data_t* user_data)
* Draw "x" for Sequence Errors and "m" for Marks
*/
/* Draw the labels Fwd and Rev */
- g_strlcpy(label_string, "<-Fwd", sizeof(label_string));
+ g_strlcpy(label_string, UTF8_LEFTWARDS_ARROW "Fwd", sizeof(label_string));
pango_layout_set_text(layout, label_string, -1);
pango_layout_get_pixel_size(layout, &lwidth, NULL);
gdk_draw_layout(user_data->dlg.dialog_graph.pixmap,
@@ -1135,7 +1136,7 @@ static void dialog_graph_draw(user_data_t* user_data)
user_data->dlg.dialog_graph.pixmap_width-right_x_border+33-lwidth,
user_data->dlg.dialog_graph.pixmap_height-bottom_y_border+3,
layout);
- g_strlcpy(label_string, "<-Rev", sizeof(label_string));
+ g_strlcpy(label_string, UTF8_LEFTWARDS_ARROW "Rev", sizeof(label_string));
pango_layout_set_text(layout, label_string, -1);
pango_layout_get_pixel_size(layout, &lwidth, NULL);
gdk_draw_layout(user_data->dlg.dialog_graph.pixmap,
diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c
index 79d8288754..aeacf1aa6d 100644
--- a/gtk/rtp_analysis.c
+++ b/gtk/rtp_analysis.c
@@ -84,6 +84,7 @@
#include "gtk/rtp_stream.h"
#include "gtk/rtp_stream_dlg.h"
#include "gtk/stock_icons.h"
+#include "gtk/utf8_entities.h"
#ifdef HAVE_LIBPORTAUDIO
#include "gtk/graph_analysis.h"
@@ -1151,7 +1152,7 @@ static void dialog_graph_draw(user_data_t* user_data)
* Draw "x" for Sequence Errors and "m" for Marks
*/
/* Draw the labels Fwd and Rev */
- g_strlcpy(label_string,"<-Fwd",sizeof(label_string));
+ g_strlcpy(label_string, UTF8_LEFTWARDS_ARROW "Fwd",sizeof(label_string));
pango_layout_set_text(layout, label_string, -1);
pango_layout_get_pixel_size(layout, &lwidth, NULL);
gdk_draw_layout(user_data->dlg.dialog_graph.pixmap,
@@ -1159,7 +1160,7 @@ static void dialog_graph_draw(user_data_t* user_data)
user_data->dlg.dialog_graph.pixmap_width-right_x_border+33-lwidth,
user_data->dlg.dialog_graph.pixmap_height-bottom_y_border+3,
layout);
- g_strlcpy(label_string,"<-Rev",sizeof(label_string));
+ g_strlcpy(label_string, UTF8_LEFTWARDS_ARROW "Rev",sizeof(label_string));
pango_layout_set_text(layout, label_string, -1);
pango_layout_get_pixel_size(layout, &lwidth, NULL);
gdk_draw_layout(user_data->dlg.dialog_graph.pixmap,
diff --git a/gtk/utf8_entities.h b/gtk/utf8_entities.h
new file mode 100644
index 0000000000..8e782f50c2
--- /dev/null
+++ b/gtk/utf8_entities.h
@@ -0,0 +1,35 @@
+/* utf8_entities.h
+ * Byte sequences for various UTF-8 entities
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+
+#ifndef __UTF8_ENTITIES_H__
+#define __UTF8_ENTITIES_H__
+
+/* Sequences can be found at http://www.utf8-chartable.de/ among other places */
+
+#define UTF8_LEFTWARDS_ARROW "\xe2\x86\x90"
+#define UTF8_RIGHTWARDS_ARROW "\xe2\x86\x92"
+#define UTF8_LEFT_RIGHT_ARROW "\xe2\x86\x94"
+
+#endif /* __UTF8_ENTITIES_H__ */