diff options
| -rw-r--r-- | stat_menu.h | 3 | ||||
| -rw-r--r-- | ui/gtk/gui_stat_menu.h | 2 | ||||
| -rw-r--r-- | ui/gtk/mac_lte_stat_dlg.c | 8 | ||||
| -rw-r--r-- | ui/gtk/main_menubar.c | 5 | ||||
| -rw-r--r-- | ui/gtk/rlc_lte_stat_dlg.c | 8 | ||||
| -rw-r--r-- | ui/gtk/tap_param_dlg.c | 1 |
6 files changed, 6 insertions, 21 deletions
diff --git a/stat_menu.h b/stat_menu.h index 9ded4d1b3a..abb3cce744 100644 --- a/stat_menu.h +++ b/stat_menu.h @@ -51,7 +51,8 @@ typedef enum { REGISTER_STAT_GROUP_ENDPOINT_LIST, /* member of the endpoint list */ REGISTER_STAT_GROUP_RESPONSE_TIME, /* member of the service response time list */ REGISTER_STAT_GROUP_TELEPHONY, /* telephony specific */ - REGISTER_STAT_GROUP_TELEPHONY_GSM, /* GSM (and UMTS and LTE?) */ + REGISTER_STAT_GROUP_TELEPHONY_GSM, /* GSM (and UMTS?) */ + REGISTER_STAT_GROUP_TELEPHONY_LTE, /* name says it all */ REGISTER_TOOLS_GROUP_UNSORTED /* unsorted tools */ } register_stat_group_t; diff --git a/ui/gtk/gui_stat_menu.h b/ui/gtk/gui_stat_menu.h index f0f72e39cd..3de892e9fd 100644 --- a/ui/gtk/gui_stat_menu.h +++ b/ui/gtk/gui_stat_menu.h @@ -145,9 +145,7 @@ 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 mac_lte_stat_cb(GtkAction *action, gpointer user_data); void gtk_mac_lte_stat_init(const char *opt_arg, void *userdata); -void rlc_lte_stat_cb(GtkAction *action, gpointer user_data); void gtk_rlc_lte_stat_init(const char *opt_arg, void *userdata); void sipstat_cb(GtkAction *action, gpointer user_data); void wsp_stat_cb(GtkAction *action, gpointer user_data); diff --git a/ui/gtk/mac_lte_stat_dlg.c b/ui/gtk/mac_lte_stat_dlg.c index 238d182db6..d3834d9889 100644 --- a/ui/gtk/mac_lte_stat_dlg.c +++ b/ui/gtk/mac_lte_stat_dlg.c @@ -1403,11 +1403,5 @@ static tap_param_dlg mac_lte_stat_dlg = { /* Register this tap listener (need void on own so line register function found) */ void register_tap_listener_mac_lte_stat(void) { - register_param_stat(&mac_lte_stat_dlg, "_LTE/_MAC", REGISTER_STAT_GROUP_TELEPHONY); + register_param_stat(&mac_lte_stat_dlg, "_MAC", REGISTER_STAT_GROUP_TELEPHONY_LTE); } - -void mac_lte_stat_cb(GtkAction *action, gpointer user_data _U_) -{ - tap_param_dlg_cb(action, &mac_lte_stat_dlg); -} - diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c index 3c1df0859a..f14f629605 100644 --- a/ui/gtk/main_menubar.c +++ b/ui/gtk/main_menubar.c @@ -1261,8 +1261,6 @@ static const char *ui_desc_menubar = " </menu>\n" " <menuitem name='ISUP' action='/Telephony/isup_msg'/>\n" " <menu name= 'LTEmenu' action='/Telephony/LTE'>\n" -" <menuitem name='LTE_MAC' action='/Telephony/LTE/MAC'/>\n" -" <menuitem name='LTE_RLC' action='/Telephony/LTE/RLC'/>\n" " <menuitem name='LTE_RLC_Graph' action='/Telephony/LTE/RLCGraph'/>\n" " </menu>\n" " <menu name= 'MTP3menu' action='/Telephony/MTP3'>\n" @@ -1717,8 +1715,6 @@ static const GtkActionEntry main_menu_bar_entries[] = { { "/Telephony/isup_msg", NULL, "_ISUP Messages", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, { "/Telephony/LTE", NULL, "_LTE", NULL, NULL, NULL }, - { "/Telephony/LTE/MAC", NULL, "_MAC Stats...", NULL, NULL, G_CALLBACK(mac_lte_stat_cb) }, - { "/Telephony/LTE/RLC", NULL, "_RLC Stats...", NULL, NULL, G_CALLBACK(rlc_lte_stat_cb) }, { "/Telephony/LTE/RLCGraph", NULL, "RLC _Graph...", NULL, NULL, G_CALLBACK(rlc_lte_graph_cb) }, { "/Telephony/MTP3", NULL, "_MTP3", NULL, NULL, NULL }, { "/Telephony/MTP3/MSUs", NULL, "MSUs", NULL, NULL, G_CALLBACK(mtp3_stat_gtk_cb) }, @@ -3929,6 +3925,7 @@ stat_group_name(register_stat_group_t group) {REGISTER_STAT_GROUP_RESPONSE_TIME, "/Menubar/StatisticsMenu|Statistics/ServiceResponseTimeMenu|Statistics#ServiceResponseTime"}, /* member of the service response time list */ {REGISTER_STAT_GROUP_TELEPHONY, "/Menubar/TelephonyMenu|Telephony"}, /* telephony specific */ {REGISTER_STAT_GROUP_TELEPHONY_GSM, "/Menubar/TelephonyMenu|Telephony/GSM|Telephony#GSM"}, /* GSM-specific */ + {REGISTER_STAT_GROUP_TELEPHONY_LTE, "/Menubar/TelephonyMenu|Telephony/LTEmenu|Telephony#LTE"}, /* LTE-specific */ {REGISTER_TOOLS_GROUP_UNSORTED, "/Menubar/ToolsMenu|Tools"}, /* unsorted tools */ {0, NULL} }; diff --git a/ui/gtk/rlc_lte_stat_dlg.c b/ui/gtk/rlc_lte_stat_dlg.c index be2b4f8f12..52b004bf24 100644 --- a/ui/gtk/rlc_lte_stat_dlg.c +++ b/ui/gtk/rlc_lte_stat_dlg.c @@ -1662,11 +1662,5 @@ static tap_param_dlg rlc_lte_stat_dlg = { void register_tap_listener_rlc_lte_stat(void) { - register_param_stat(&rlc_lte_stat_dlg, "_LTE/_RLC", REGISTER_STAT_GROUP_TELEPHONY); + register_param_stat(&rlc_lte_stat_dlg, "_RLC", REGISTER_STAT_GROUP_TELEPHONY_LTE); } - -void rlc_lte_stat_cb(GtkAction *action, gpointer user_data _U_) -{ - tap_param_dlg_cb(action, &rlc_lte_stat_dlg); -} - diff --git a/ui/gtk/tap_param_dlg.c b/ui/gtk/tap_param_dlg.c index 3e023410a8..044af3092a 100644 --- a/ui/gtk/tap_param_dlg.c +++ b/ui/gtk/tap_param_dlg.c @@ -100,6 +100,7 @@ register_param_stat(tap_param_dlg *info, const char *name, case REGISTER_STAT_GROUP_TELEPHONY: case REGISTER_STAT_GROUP_TELEPHONY_GSM: + case REGISTER_STAT_GROUP_TELEPHONY_LTE: break; case REGISTER_TOOLS_GROUP_UNSORTED: |