[GTKUImanager] Fix a few callbacks, use #defines for strings.

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

1 files changed, 23 insertions, 23 deletions

diff --git a/gtk/main_filter_toolbar.c b/gtk/main_filter_toolbar.c
index 60ec168df6..18d17c70ba 100644
--- a/gtk/main_filter_toolbar.c
+++ b/gtk/main_filter_toolbar.c
@@ -207,50 +207,50 @@ GtkWidget *filter_toolbar_new(void)
     /* Sets the text entry widget pointer as the E_DILTER_TE_KEY data
      * of any widget that ends up calling a callback which needs
      * that text entry pointer */
-    set_menu_object_data("/File/Open...", E_DFILTER_TE_KEY, filter_te);
-    set_menu_object_data("/Edit/Copy/As Filter", E_DFILTER_TE_KEY,
+    set_menu_object_data(MENU_BAR_PATH_FILE_OPEN, E_DFILTER_TE_KEY, filter_te);
+    set_menu_object_data(MENU_BAR_PATH_EDIT_COPY_AS_FLT, E_DFILTER_TE_KEY,
                          filter_te);
-    set_menu_object_data("/Analyze/Display Filters...", E_FILT_TE_PTR_KEY,
+    set_menu_object_data(MENU_BAR_PATH_ANALYZE_DISPLAY_FLT, E_FILT_TE_PTR_KEY,
                          filter_te);
-    set_menu_object_data("/Analyze/Follow TCP Stream", E_DFILTER_TE_KEY,
+    set_menu_object_data(MENU_BAR_PATH_ANALYZE_FOLLOW_TCP_STREAM, E_DFILTER_TE_KEY,
                          filter_te);
-    set_menu_object_data("/Analyze/Follow UDP Stream", E_DFILTER_TE_KEY,
+    set_menu_object_data(MENU_BAR_PATH_ANALYZE_FOLLOW_UDP_STREAM, E_DFILTER_TE_KEY,
                          filter_te);
-    set_menu_object_data("/Analyze/Follow SSL Stream", E_DFILTER_TE_KEY,
+    set_menu_object_data(MENU_BAR_PATH_ANALYZE_FOLLOW_SSL_STREAM, E_DFILTER_TE_KEY,
                          filter_te);
-    set_menu_object_data("/Analyze/Apply as Filter/Selected", E_DFILTER_TE_KEY,
+    set_menu_object_data(MENU_BAR_PATH_ANALYZE_APL_AS_FLT_SEL, E_DFILTER_TE_KEY,
                          filter_te);
-    set_menu_object_data("/Analyze/Apply as Filter/Not Selected", E_DFILTER_TE_KEY,
+    set_menu_object_data(MENU_BAR_PATH_ANALYZE_APL_AS_FLT_NOT_SEL, E_DFILTER_TE_KEY,
                          filter_te);
-    set_menu_object_data("/Analyze/Apply as Filter/... and Selected", E_DFILTER_TE_KEY,
+    set_menu_object_data(MENU_BAR_PATH_ANALYZE_APL_AS_FLT_AND_SEL, E_DFILTER_TE_KEY,
                          filter_te);
-    set_menu_object_data("/Analyze/Apply as Filter/... or Selected", E_DFILTER_TE_KEY,
+    set_menu_object_data(MENU_BAR_PATH_ANALYZE_APL_AS_FLT_OR_SEL, E_DFILTER_TE_KEY,
                          filter_te);
-    set_menu_object_data("/Analyze/Apply as Filter/... and not Selected", E_DFILTER_TE_KEY,
+    set_menu_object_data(MENU_BAR_PATH_ANALYZE_APL_AS_FLT_AND_NOT_SEL, E_DFILTER_TE_KEY,
                          filter_te);
-    set_menu_object_data("/Analyze/Apply as Filter/... or not Selected", E_DFILTER_TE_KEY,
+    set_menu_object_data(MENU_BAR_PATH_ANALYZE_APL_AS_FLT_OR_NOT_SEL, E_DFILTER_TE_KEY,
                          filter_te);
-    set_menu_object_data("/Analyze/Prepare a Filter/Selected", E_DFILTER_TE_KEY,
+    set_menu_object_data(MENU_BAR_PATH_ANALYZE_PREP_A_FLT_SEL, E_DFILTER_TE_KEY,
                          filter_te);
-    set_menu_object_data("/Analyze/Prepare a Filter/Not Selected", E_DFILTER_TE_KEY,
+    set_menu_object_data(MENU_BAR_PATH_ANALYZE_PREP_A_FLT_NOT_SEL, E_DFILTER_TE_KEY,
                          filter_te);
-    set_menu_object_data("/Analyze/Prepare a Filter/... and Selected", E_DFILTER_TE_KEY,
+    set_menu_object_data(MENU_BAR_PATH_ANALYZE_PREP_A_FLT_AND_SEL, E_DFILTER_TE_KEY,
                          filter_te);
-    set_menu_object_data("/Analyze/Prepare a Filter/... or Selected", E_DFILTER_TE_KEY,
+    set_menu_object_data(MENU_BAR_PATH_ANALYZE_PREP_A_FLT_OR_SEL, E_DFILTER_TE_KEY,
                          filter_te);
-    set_menu_object_data("/Analyze/Prepare a Filter/... and not Selected", E_DFILTER_TE_KEY,
+    set_menu_object_data(MENU_BAR_PATH_ANALYZE_PREP_A_FLT_AND_NOT_SEL, E_DFILTER_TE_KEY,
                          filter_te);
-    set_menu_object_data("/Analyze/Prepare a Filter/... or not Selected", E_DFILTER_TE_KEY,
+    set_menu_object_data(MENU_BAR_PATH_ANALYZE_PREP_A_FLT_OR_NOT_SEL, E_DFILTER_TE_KEY,
                          filter_te);
-    set_menu_object_data("/Conversation Filter/Ethernet", E_DFILTER_TE_KEY,
+    set_menu_object_data(PACKET_LIST_POPUP_PATH_CONV_FLT_ETH, E_DFILTER_TE_KEY,
                          filter_te);
-    set_menu_object_data("/Conversation Filter/IP", E_DFILTER_TE_KEY,
+    set_menu_object_data(PACKET_LIST_POPUP_PATH_CONV_FLT_IP, E_DFILTER_TE_KEY,
                          filter_te);
-    set_menu_object_data("/Conversation Filter/TCP", E_DFILTER_TE_KEY,
+    set_menu_object_data(PACKET_LIST_POPUP_PATH_CONV_FLT_TCP, E_DFILTER_TE_KEY,
                          filter_te);
-    set_menu_object_data("/Conversation Filter/UDP", E_DFILTER_TE_KEY,
+    set_menu_object_data(PACKET_LIST_POPUP_PATH_CONV_FLT_UDP, E_DFILTER_TE_KEY,
                          filter_te);
-    set_menu_object_data("/Conversation Filter/PN-CBA Server", E_DFILTER_TE_KEY,
+    set_menu_object_data(PACKET_LIST_POPUP_PATH_CONV_FLT_PN_CBA_SERV, E_DFILTER_TE_KEY,
                          filter_te);
     set_toolbar_object_data(E_DFILTER_TE_KEY, filter_te);
     g_object_set_data(G_OBJECT(popup_menu_object), E_DFILTER_TE_KEY, filter_te);