Convetr more menus to GUIManager.

svn path=/trunk/; revision=37078

6 files changed, 174 insertions, 34 deletions

diff --git a/gtk/ansi_map_stat.c b/gtk/ansi_map_stat.c
index 4da1d0cda6..fe55880c45 100644
--- a/gtk/ansi_map_stat.c
+++ b/gtk/ansi_map_stat.c
@@ -330,11 +330,15 @@ ansi_map_stat_gtk_win_create(
     window_present(dlg_p->win);
 }
 
-
+#ifdef MAIN_MENU_USE_UIMANAGER
+void
+ansi_map_stat_gtk_cb(GtkAction *action _U_, gpointer user_data _U_)
+#else
 static void
 ansi_map_stat_gtk_cb(
     GtkWidget       *w _U_,
     gpointer        d _U_)
+#endif
 {
     /*
      * if the window is already open, bring it to front
@@ -379,8 +383,10 @@ register_tap_listener_gtkansi_map_stat(void)
 
         exit(1);
     }
-
+#ifdef MAIN_MENU_USE_UIMANAGER
+#else
     register_stat_menu_item("_ANSI/MAP Operation", REGISTER_STAT_GROUP_TELEPHONY,
         ansi_map_stat_gtk_cb, NULL, NULL, NULL);
+#endif
     register_stat_cmd_arg("ansi_map", ansi_map_stat_gtk_init,NULL);
 }
diff --git a/gtk/gsm_a_stat.c b/gtk/gsm_a_stat.c
index 79bc8d3174..60f9d2fa1a 100644
--- a/gtk/gsm_a_stat.c
+++ b/gtk/gsm_a_stat.c
@@ -436,7 +436,7 @@ gsm_a_stat_gtk_win_create(
 }
 
 #ifdef MAIN_MENU_USE_UIMANAGER
-void gsm_a_stat_gtk_bssmap_cb(GtkAction *action _U_, gpointer user_data _U_)
+void gsm_a_stat_gtk_bssmap_cb(GtkAction *action, gpointer user_data )
 #else
 static void
 gsm_a_stat_gtk_bssmap_cb(
@@ -469,7 +469,15 @@ gsm_a_stat_gtk_bssmap_init(
     gsm_a_stat_gtk_bssmap_cb(NULL, NULL);
 }
 
-
+#ifdef MAIN_MENU_USE_UIMANAGER
+static void
+gsm_a_stat_gtk_dtap_cb(
+    GtkAction *action _U_,
+    gpointer user_data _U_,
+    gsm_a_stat_dlg_t    *dlg_dtap_p,
+    const char      *title,
+    const value_string  *dtap_msg_strings _U_)
+#else
 static void
 gsm_a_stat_gtk_dtap_cb(
     GtkWidget       *w _U_,
@@ -477,6 +485,7 @@ gsm_a_stat_gtk_dtap_cb(
     gsm_a_stat_dlg_t    *dlg_dtap_p,
     const char      *title,
     const value_string  *dtap_msg_strings _U_)
+#endif
 {
 
     /*
@@ -495,19 +504,23 @@ gsm_a_stat_gtk_dtap_cb(
 
 #ifdef MAIN_MENU_USE_UIMANAGER
 void 
-gsm_a_stat_gtk_dtap_mm_cb(GtkAction *action _U_, gpointer user_data _U_)
+gsm_a_stat_gtk_dtap_mm_cb(GtkAction *action, gpointer user_data )
+{
+    gsm_a_stat_gtk_dtap_cb(action, user_data, &dlg_dtap_mm,
+    "GSM A-I/F DTAP Mobility Management Statistics",
+    gsm_a_dtap_msg_mm_strings);
+}
 #else
 static void
 gsm_a_stat_gtk_dtap_mm_cb(
     GtkWidget       *w _U_,
     gpointer        d _U_)
-#endif
 {
-    gsm_a_stat_gtk_dtap_cb(w, d, &dlg_dtap_mm,
+    gsm_a_stat_gtk_dtap_cb(action, user_data, &dlg_dtap_mm,
     "GSM A-I/F DTAP Mobility Management Statistics",
     gsm_a_dtap_msg_mm_strings);
 }
-
+#endif
 static void
 gsm_a_stat_gtk_dtap_mm_init(const char      *optarg _U_,
                             void* userdata _U_)
@@ -517,18 +530,24 @@ gsm_a_stat_gtk_dtap_mm_init(const char      *optarg _U_,
 
 #ifdef MAIN_MENU_USE_UIMANAGER
 void
-gsm_a_stat_gtk_dtap_rr_cb(GtkAction *action _U_, gpointer user_data _U_)
+gsm_a_stat_gtk_dtap_rr_cb(GtkAction *action, gpointer user_data )
+{
+    gsm_a_stat_gtk_dtap_cb(action, user_data, &dlg_dtap_rr,
+    "GSM A-I/F DTAP Radio Resource Management Statistics",
+    gsm_a_dtap_msg_rr_strings);
+}
 #else
 static void
 gsm_a_stat_gtk_dtap_rr_cb(
     GtkWidget       *w _U_,
     gpointer        d _U_)
-#endif
 {
     gsm_a_stat_gtk_dtap_cb(w, d, &dlg_dtap_rr,
     "GSM A-I/F DTAP Radio Resource Management Statistics",
     gsm_a_dtap_msg_rr_strings);
 }
+#endif
+
 
 static void
 gsm_a_stat_gtk_dtap_rr_init(const char      *optarg _U_,
@@ -539,18 +558,23 @@ gsm_a_stat_gtk_dtap_rr_init(const char      *optarg _U_,
 
 #ifdef MAIN_MENU_USE_UIMANAGER
 void
-gsm_a_stat_gtk_dtap_cc_cb(GtkAction *action _U_, gpointer user_data _U_)
+gsm_a_stat_gtk_dtap_cc_cb(GtkAction *action, gpointer user_data )
+{
+    gsm_a_stat_gtk_dtap_cb(action, user_data, &dlg_dtap_cc,
+    "GSM A-I/F DTAP Call Control Statistics",
+    gsm_a_dtap_msg_cc_strings);
+}
 #else
 static void
 gsm_a_stat_gtk_dtap_cc_cb(
     GtkWidget       *w _U_,
     gpointer        d _U_)
-#endif
 {
     gsm_a_stat_gtk_dtap_cb(w, d, &dlg_dtap_cc,
     "GSM A-I/F DTAP Call Control Statistics",
     gsm_a_dtap_msg_cc_strings);
 }
+#endif
 
 static void
 gsm_a_stat_gtk_dtap_cc_init(const char      *optarg _U_,
@@ -561,18 +585,24 @@ gsm_a_stat_gtk_dtap_cc_init(const char      *optarg _U_,
 
 #ifdef MAIN_MENU_USE_UIMANAGER
 void
-gsm_a_stat_gtk_dtap_gmm_cb(GtkAction *action _U_, gpointer user_data _U_)
+gsm_a_stat_gtk_dtap_gmm_cb(GtkAction *action, gpointer user_data )
+{
+    gsm_a_stat_gtk_dtap_cb(action, user_data, &dlg_dtap_gmm,
+    "GSM A-I/F DTAP GPRS Mobility Management Statistics",
+    gsm_a_dtap_msg_gmm_strings);
+}
+
 #else
 static void
 gsm_a_stat_gtk_dtap_gmm_cb(
     GtkWidget       *w _U_,
     gpointer        d _U_)
-#endif
 {
     gsm_a_stat_gtk_dtap_cb(w, d, &dlg_dtap_gmm,
     "GSM A-I/F DTAP GPRS Mobility Management Statistics",
     gsm_a_dtap_msg_gmm_strings);
 }
+#endif
 
 static void
 gsm_a_stat_gtk_dtap_gmm_init(const char     *optarg _U_,
@@ -581,6 +611,15 @@ gsm_a_stat_gtk_dtap_gmm_init(const char     *optarg _U_,
     gsm_a_stat_gtk_dtap_gmm_cb(NULL, NULL);
 }
 
+#ifdef MAIN_MENU_USE_UIMANAGER
+void
+gsm_a_stat_gtk_dtap_sms_cb(GtkAction *action, gpointer user_data )
+{
+    gsm_a_stat_gtk_dtap_cb(action, user_data, &dlg_dtap_sms,
+    "GSM A-I/F DTAP Short Message Service Statistics",
+    gsm_a_dtap_msg_sms_strings);
+}
+#else
 static void
 gsm_a_stat_gtk_dtap_sms_cb(
     GtkWidget       *w _U_,
@@ -590,6 +629,7 @@ gsm_a_stat_gtk_dtap_sms_cb(
     "GSM A-I/F DTAP Short Message Service Statistics",
     gsm_a_dtap_msg_sms_strings);
 }
+#endif
 
 static void
 gsm_a_stat_gtk_dtap_sms_init(const char     *optarg _U_,
@@ -598,6 +638,15 @@ gsm_a_stat_gtk_dtap_sms_init(const char     *optarg _U_,
     gsm_a_stat_gtk_dtap_sms_cb(NULL, NULL);
 }
 
+#ifdef MAIN_MENU_USE_UIMANAGER
+void
+gsm_a_stat_gtk_dtap_sm_cb(GtkAction *action, gpointer user_data )
+{
+    gsm_a_stat_gtk_dtap_cb(action, user_data, &dlg_dtap_sm,
+    "GSM A-I/F DTAP GPRS Session Management Statistics",
+    gsm_a_dtap_msg_sm_strings);
+}
+#else
 static void
 gsm_a_stat_gtk_dtap_sm_cb(
     GtkWidget       *w _U_,
@@ -607,6 +656,7 @@ gsm_a_stat_gtk_dtap_sm_cb(
     "GSM A-I/F DTAP GPRS Session Management Statistics",
     gsm_a_dtap_msg_sm_strings);
 }
+#endif
 
 static void
 gsm_a_stat_gtk_dtap_sm_init(const char      *optarg _U_,
@@ -615,6 +665,15 @@ gsm_a_stat_gtk_dtap_sm_init(const char      *optarg _U_,
     gsm_a_stat_gtk_dtap_sm_cb(NULL, NULL);
 }
 
+#ifdef MAIN_MENU_USE_UIMANAGER
+void
+gsm_a_stat_gtk_dtap_ss_cb(GtkAction *action, gpointer user_data )
+{
+    gsm_a_stat_gtk_dtap_cb(action, user_data, &dlg_dtap_ss,
+    "GSM A-I/F DTAP Supplementary Services Statistics",
+    gsm_a_dtap_msg_ss_strings);
+}
+#else
 static void
 gsm_a_stat_gtk_dtap_ss_cb(
     GtkWidget       *w _U_,
@@ -624,6 +683,7 @@ gsm_a_stat_gtk_dtap_ss_cb(
     "GSM A-I/F DTAP Supplementary Services Statistics",
     gsm_a_dtap_msg_ss_strings);
 }
+#endif
 
 static void
 gsm_a_stat_gtk_dtap_ss_init(
@@ -633,6 +693,15 @@ gsm_a_stat_gtk_dtap_ss_init(
     gsm_a_stat_gtk_dtap_ss_cb(NULL, NULL);
 }
 
+#ifdef MAIN_MENU_USE_UIMANAGER
+void
+gsm_a_stat_gtk_dtap_tp_cb(GtkAction *action, gpointer user_data )
+{
+    gsm_a_stat_gtk_dtap_cb(action, user_data, &dlg_dtap_tp,
+    "GSM A-I/F DTAP Special Conformance Testing Functions Statistics",
+    gsm_a_dtap_msg_tp_strings);
+}
+#else
 static void
 gsm_a_stat_gtk_dtap_tp_cb(
     GtkWidget       *w _U_,
@@ -642,6 +711,7 @@ gsm_a_stat_gtk_dtap_tp_cb(
     "GSM A-I/F DTAP Special Conformance Testing Functions Statistics",
     gsm_a_dtap_msg_tp_strings);
 }
+#endif
 
 static void
 gsm_a_stat_gtk_dtap_tp_init(
@@ -651,6 +721,24 @@ gsm_a_stat_gtk_dtap_tp_init(
     gsm_a_stat_gtk_dtap_tp_cb(NULL, NULL);
 }
 
+#ifdef MAIN_MENU_USE_UIMANAGER
+void
+gsm_a_stat_gtk_sacch_rr_cb(GtkAction *action _U_, gpointer user_data _U_ )
+{
+
+    /*
+     * if the window is already open, bring it to front
+     */
+    if (dlg_sacch_rr.win)
+    {
+    gdk_window_raise(dlg_sacch_rr.win->window);
+    return;
+    }
+
+    gsm_a_stat_gtk_win_create(&dlg_sacch_rr, "GSM A-I/F SACCH Statistics");
+    gsm_a_stat_draw(&gsm_a_stat);
+}
+#else
 static void
 gsm_a_stat_gtk_sacch_rr_cb(
     GtkWidget       *w _U_,
@@ -669,7 +757,7 @@ gsm_a_stat_gtk_sacch_rr_cb(
     gsm_a_stat_gtk_win_create(&dlg_sacch_rr, "GSM A-I/F SACCH Statistics");
     gsm_a_stat_draw(&gsm_a_stat);
 }
-
+#endif
 
 static void
 gsm_a_stat_gtk_sacch_rr_init(
diff --git a/gtk/gsm_map_stat.c b/gtk/gsm_map_stat.c
index 763d6fa54b..56dc826e8f 100644
--- a/gtk/gsm_map_stat.c
+++ b/gtk/gsm_map_stat.c
@@ -430,11 +430,15 @@ gsm_map_stat_gtk_win_create(
     window_present(dlg_p->win);
 }
 
-
+#ifdef MAIN_MENU_USE_UIMANAGER
+void
+gsm_map_stat_gtk_cb(GtkAction *action _U_, gpointer user_data _U_)
+#else
 static void
 gsm_map_stat_gtk_cb(
     GtkWidget       *w _U_,
     gpointer        d _U_)
+#endif
 {
 
 
@@ -482,7 +486,10 @@ register_tap_listener_gtkgsm_map_stat(void)
         exit(1);
     }
 
+#ifdef MAIN_MENU_USE_UIMANAGER
+#else
     register_stat_menu_item("_GSM/MAP Operation",  REGISTER_STAT_GROUP_TELEPHONY,
         gsm_map_stat_gtk_cb, NULL, NULL, NULL);
+#endif
     register_stat_cmd_arg("gsm_map", gsm_map_stat_gtk_init,NULL);
 }
diff --git a/gtk/gsm_map_summary.c b/gtk/gsm_map_summary.c
index 28dda91f1d..e885f2a169 100644
--- a/gtk/gsm_map_summary.c
+++ b/gtk/gsm_map_summary.c
@@ -71,9 +71,12 @@ add_string_to_box(gchar *str, GtkWidget *box)
   gtk_widget_show(lb);
 }
 
-
+#ifdef MAIN_MENU_USE_UIMANAGER
+void gsm_map_stat_gtk_sum_cb(GtkAction *action _U_, gpointer user_data _U_)
+#else
 static void
 gsm_map_stat_gtk_sum_cb(GtkWidget *w _U_, gpointer d _U_)
+#endif
 {
   summary_tally summary;
   GtkWidget     *sum_open_w,
@@ -299,6 +302,9 @@ gsm_map_stat_gtk_sum_cb(GtkWidget *w _U_, gpointer d _U_)
 void
 register_tap_listener_gtkgsm_map_summary(void)
 {
+#ifdef MAIN_MENU_USE_UIMANAGER
+#else
     register_stat_menu_item("_GSM/MAP Summary",  REGISTER_STAT_GROUP_TELEPHONY,
         gsm_map_stat_gtk_sum_cb, NULL, NULL, NULL);
+#endif
 }
diff --git a/gtk/gui_stat_menu.h b/gtk/gui_stat_menu.h
index 421194444b..4f466206cf 100644
--- a/gtk/gui_stat_menu.h
+++ b/gtk/gui_stat_menu.h
@@ -139,12 +139,21 @@ void voip_calls_launch(GtkAction *action, gpointer user_data);
 
 void ansi_a_stat_gtk_bsmap_cb(GtkAction *action, gpointer user_data);
 void ansi_a_stat_gtk_dtap_cb(GtkAction *action, gpointer user_data);
+void ansi_map_stat_gtk_cb(GtkAction *action, gpointer user_data);
 
 void gsm_a_stat_gtk_bssmap_cb(GtkAction *action, gpointer user_data);
 void gsm_a_stat_gtk_dtap_mm_cb(GtkAction *action, gpointer user_data);
 void gsm_a_stat_gtk_dtap_rr_cb(GtkAction *action, gpointer user_data);
 void gsm_a_stat_gtk_dtap_cc_cb(GtkAction *action, gpointer user_data);
 void gsm_a_stat_gtk_dtap_gmm_cb(GtkAction *action, gpointer user_data);
+void gsm_a_stat_gtk_dtap_sms_cb(GtkAction *action, gpointer user_data);
+void gsm_a_stat_gtk_dtap_sm_cb(GtkAction *action, gpointer user_data);
+void gsm_a_stat_gtk_dtap_ss_cb(GtkAction *action, gpointer user_data);
+void gsm_a_stat_gtk_dtap_tp_cb(GtkAction *action, gpointer user_data);
+void gsm_a_stat_gtk_sacch_rr_cb(GtkAction *action, gpointer user_data);
+
+void gsm_map_stat_gtk_cb(GtkAction *action, gpointer user_data);
+void gsm_map_stat_gtk_sum_cb(GtkAction *action, gpointer user_data);
 
 extern void register_stat_menu_item_stock(
     register_stat_group_t group,
diff --git a/gtk/menus.c b/gtk/menus.c
index fd88bcb692..7f3c9395ef 100644
--- a/gtk/menus.c
+++ b/gtk/menus.c
@@ -1258,12 +1258,23 @@ static const char *ui_desc_menubar =
 "      <menu name= 'ANSI' action='/Telephony/ANSI'>\n"
 "        <menuitem name='BSMAP' action='/Telephony/ANSI/BSMAP'/>\n"
 "        <menuitem name='DTAP' action='/Telephony/ANSI/DTAP'/>\n"
+"        <menuitem name='MAP-OP' action='/Telephony/ANSI/MAP-OP'/>\n"
 "      </menu>\n"
 "      <menu name= 'GSM' action='/Telephony/GSM'>\n"
-"        <menuitem name='BSSMAP' action='/Telephony/GSM/BSMAP'/>\n"
-"        <menu name='DTAP' action='/Telephony/GSM/DTAP'/>\n"
-"          <menuitem name='CallControl' action='/Telephony/GSM/CallControl/'/>\n"
+"        <menuitem name='BSSMAP' action='/Telephony/GSM/BSSMAP'/>\n"
+"        <menu name='GSM-DTAP' action='/Telephony/GSM/DTAP'>\n"
+"          <menuitem name='CallControl' action='/Telephony/GSM/DTAP/CC'/>\n"
+"          <menuitem name='GPRS-MM' action='/Telephony/GSM/DTAP/GMM'/>\n"
+"          <menuitem name='GPRS-SM' action='/Telephony/GSM/DTAP/SM'/>\n"
+"          <menuitem name='MM' action='/Telephony/GSM/DTAP/MM'/>\n"
+"          <menuitem name='RR' action='/Telephony/GSM/DTAP/RR'/>\n"
+"          <menuitem name='SMS' action='/Telephony/GSM/DTAP/SMS'/>\n"
+"          <menuitem name='TP' action='/Telephony/GSM/DTAP/TP'/>\n"
+"          <menuitem name='SS' action='/Telephony/GSM/DTAP/SS'/>\n"
 "        </menu>\n"
+"        <menuitem name='SACCH' action='/Telephony/GSM/SACCH'/>\n"
+"        <menuitem name='MAP-OP' action='/Telephony/GSM/MAP-OP'/>\n"
+"        <menuitem name='MAP-Summary' action='/Telephony/GSM/MAPSummary'/>\n"
 "      </menu>\n"
 "      <menu name= 'IAX2menu' action='/Telephony/IAX2'>\n"
 "        <menuitem name='StreamAnalysis' action='/Telephony/IAX2/StreamAnalysis'/>\n"
@@ -1634,27 +1645,40 @@ static const GtkActionEntry main_menu_bar_entries[] = {
 
    { "/Statistics/Summary",						GTK_STOCK_PROPERTIES,			"_Summary",						NULL, NULL,	G_CALLBACK(summary_open_cb) },
    { "/Statistics/ProtocolHierarchy",			NULL,							"_Protocol Hierarchy",			NULL, NULL, G_CALLBACK(proto_hier_stats_cb) },
-   { "/Statistics/Conversations",	WIRESHARK_STOCK_CONVERSATIONS,	"Conversations",		NULL,							NULL,				G_CALLBACK(init_conversation_notebook_cb) },
-   { "/Statistics/Endpoints",		WIRESHARK_STOCK_ENDPOINTS,		"Endpoints",			NULL,							NULL,				G_CALLBACK(init_hostlist_notebook_cb) },
-   { "/Statistics/IOGraphs",			WIRESHARK_STOCK_GRAPHS,		"_IO Graph",			NULL,							NULL,				G_CALLBACK(gui_iostat_cb) },
+   { "/Statistics/Conversations",	WIRESHARK_STOCK_CONVERSATIONS,	"Conversations",			NULL,						NULL,				G_CALLBACK(init_conversation_notebook_cb) },
+   { "/Statistics/Endpoints",		WIRESHARK_STOCK_ENDPOINTS,		"Endpoints",				NULL,						NULL,				G_CALLBACK(init_hostlist_notebook_cb) },
+   { "/Statistics/IOGraphs",			WIRESHARK_STOCK_GRAPHS,		"_IO Graph",				NULL,						NULL,				G_CALLBACK(gui_iostat_cb) },
 
-   { "/Telephony/ANSI",					NULL,						"ANSI",					NULL, NULL, NULL },
-   { "/Telephony/ANSI/BSMAP",			NULL,						"A-Interface BSMAP",	NULL,							NULL,				G_CALLBACK(ansi_a_stat_gtk_bsmap_cb) },
-   { "/Telephony/ANSI/DTAP",			NULL,						"A-Interface DTAP",		NULL,							NULL,				G_CALLBACK(ansi_a_stat_gtk_dtap_cb) },
+   { "/Telephony/ANSI",					NULL,						"ANSI",						NULL, NULL, NULL },
+   { "/Telephony/ANSI/BSMAP",			NULL,						"A-Interface BSMAP",		NULL,						NULL,				G_CALLBACK(ansi_a_stat_gtk_bsmap_cb) },
+   { "/Telephony/ANSI/DTAP",			NULL,						"A-Interface DTAP",			NULL,						NULL,				G_CALLBACK(ansi_a_stat_gtk_dtap_cb) },
+   { "/Telephony/ANSI/MAP-OP",			NULL,						"MAP Operation",			NULL,						NULL,				G_CALLBACK(ansi_map_stat_gtk_cb) },
 
    { "/Telephony/GSM",					NULL,						"GSM",						NULL, NULL, NULL },
    { "/Telephony/GSM/BSSMAP",			NULL,						"_GSM/A-Interface BSSMAP",	NULL,						NULL,				G_CALLBACK(gsm_a_stat_gtk_bssmap_cb) },
-   { "/Telephony/GSM/DTAP",				NULL,						"_GSM/A-Interface DTAP",	NULL, NULL,
-   { "/Telephony/GSM/DTAP/CallControl",	NULL,						"Call Control",				NULL,						NULL,				G_CALLBACK(gsm_a_stat_gtk_dtap_cc_cb) },
 
-   { "/Telephony/IAX2",					NULL,						"IA_X2",				NULL, NULL, NULL },
-   { "/Telephony/IAX2/StreamAnalysis",	NULL,						"Stream Analysis...",	NULL,							NULL,				G_CALLBACK(iax2_analysis_cb) },
-   { "/Telephony/VoIPCalls",			WIRESHARK_STOCK_TELEPHONE,	"_VoIP Calls",			NULL,							NULL,				G_CALLBACK(voip_calls_launch) },
+   { "/Telephony/GSM/DTAP",				NULL,						"_GSM/A-Interface DTAP",	NULL, NULL, NULL },
+   { "/Telephony/GSM/DTAP/CC",			NULL,						"Call Control",				NULL,						NULL,				G_CALLBACK(gsm_a_stat_gtk_dtap_cc_cb) },
+   { "/Telephony/GSM/DTAP/GMM",			NULL,						"GPRS Mobility Management",	NULL,						NULL,				G_CALLBACK(gsm_a_stat_gtk_dtap_gmm_cb) },
+   { "/Telephony/GSM/DTAP/SM",			NULL,						"GPRS Session Management",	NULL,						NULL,				G_CALLBACK(gsm_a_stat_gtk_dtap_sm_cb) },
+   { "/Telephony/GSM/DTAP/MM",			NULL,						"Mobility Management",		NULL,						NULL,				G_CALLBACK(gsm_a_stat_gtk_dtap_mm_cb) },
+   { "/Telephony/GSM/DTAP/RR",			NULL,						"Radio Resource Management",NULL,						NULL,				G_CALLBACK(gsm_a_stat_gtk_dtap_rr_cb) },
+   { "/Telephony/GSM/DTAP/SMS",			NULL,						"Short Message Service",	NULL,						NULL,				G_CALLBACK(gsm_a_stat_gtk_dtap_sms_cb) },
+   { "/Telephony/GSM/DTAP/TP",			NULL,		"Special Conformance Testing Functions",	NULL,						NULL,				G_CALLBACK(gsm_a_stat_gtk_dtap_tp_cb) },
+   { "/Telephony/GSM/DTAP/SS",			NULL,						"Supplementary Services",	NULL,						NULL,				G_CALLBACK(gsm_a_stat_gtk_dtap_ss_cb) },
 
-   { "/Tools/FirewallACLRules",		NULL,							"Firewall ACL Rules",	NULL,							NULL,				G_CALLBACK(firewall_rule_cb) },
+   { "/Telephony/GSM/SACCH",			NULL,						"_GSM/A-Interface SACCH",	NULL,						NULL,				G_CALLBACK(gsm_a_stat_gtk_sacch_rr_cb) },
+   { "/Telephony/GSM/MAP-OP",			NULL,						"_GSM/MAP Operation",		NULL,						NULL,				G_CALLBACK(gsm_map_stat_gtk_cb) },
+   { "/Telephony/GSM/MAPSummary",		NULL,						"MAP Summary",				NULL,						NULL,				G_CALLBACK(gsm_map_stat_gtk_sum_cb) },
 
-   { "/Internals/Dissectortables",	NULL,							"_Dissector tables",	NULL,							NULL,				G_CALLBACK(dissector_tables_dlg_cb) },
-   { "/Internals/SupportedProtocols", NULL,					"_Supported Protocols (slow!)",	NULL,							NULL,				G_CALLBACK(supported_cb) },
+   { "/Telephony/IAX2",					NULL,						"IA_X2",					NULL, NULL, NULL },
+   { "/Telephony/IAX2/StreamAnalysis",	NULL,						"Stream Analysis...",		NULL,						NULL,				G_CALLBACK(iax2_analysis_cb) },
+   { "/Telephony/VoIPCalls",			WIRESHARK_STOCK_TELEPHONE,	"_VoIP Calls",				NULL,						NULL,				G_CALLBACK(voip_calls_launch) },
+
+   { "/Tools/FirewallACLRules",		NULL,							"Firewall ACL Rules",		NULL,						NULL,				G_CALLBACK(firewall_rule_cb) },
+
+   { "/Internals/Dissectortables",	NULL,							"_Dissector tables",		NULL,						NULL,				G_CALLBACK(dissector_tables_dlg_cb) },
+   { "/Internals/SupportedProtocols", NULL,					"_Supported Protocols (slow!)",		NULL,						NULL,				G_CALLBACK(supported_cb) },
    
    { "/Help/Contents",				GTK_STOCK_HELP,					"_Contents",			"F1",							NULL,				G_CALLBACK(help_menu_cont_cb) },
    { "/Help/ManualPages",			NULL,							"ManualPages",			NULL,							NULL,				NULL },