osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Add casts to make it compile on some old ERHL box. 

svn path=/trunk/; revision=37629
This commit is contained in:
Anders Broman 2011-06-09 08:51:30 +00:00
parent ea74ffe9a8
commit 5659d18813
6 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/conversations_table.c
View File

@ -1935,7 +1935,7 @@ ct_create_popup_menu(conversations_table *ct)
gtk_action_group_add_actions (action_group, /* the action group */
conv_filter_menu_entries, /* an array of action descriptions */
G_N_ELEMENTS(conv_filter_menu_entries), /* the number of entries */
ct); /* data to pass to the action callbacks */
(gpointer)ct); /* data to pass to the action callbacks */
ui_manager = gtk_ui_manager_new ();
gtk_ui_manager_insert_action_group (ui_manager, action_group, 0);

4
gtk/expert_comp_table.c
View File

@ -611,9 +611,9 @@ error_create_popup_menu(error_equiv_table *err)
action_group = gtk_action_group_new ("ExpertFilterPopupActionGroup");
gtk_action_group_add_actions (action_group, /* the action group */
expert_popup_entries, /* an array of action descriptions */
expert_popup_entries, /* an array of action descriptions */
G_N_ELEMENTS(expert_popup_entries), /* the number of entries */
err); /* data to pass to the action callbacks */
(gpointer)err); /* data to pass to the action callbacks */
ui_manager = gtk_ui_manager_new ();
gtk_ui_manager_insert_action_group (ui_manager, action_group, 0);

23
gtk/menus.c
View File

@ -1248,7 +1248,7 @@ static const char *ui_desc_menubar =
" <menuitem name='WLAN' action='/Analyze/ConversationList/WLAN'/>\n"
" </menu>\n"
" <menu name= 'ServiceResponseTimeMenu' action='/Analyze/ServiceResponseTime'>\n"
" <placeholder name='SRT-List-item'/>\n"
" <menuitem name='ONC-RPC' action='/Analyze/ServiceResponseTime/ONC-RPC'/>\n"
" </menu>\n"
" <separator/>\n"
" <placeholder name='ANCP'/>\n"
@ -1656,6 +1656,7 @@ static const GtkActionEntry main_menu_bar_entries[] = {
{ "/Analyze/EndpointList/WLAN", WIRESHARK_STOCK_ENDPOINTS, "WLAN", NULL, NULL, G_CALLBACK(gtk_wlan_hostlist_cb) },
{ "/Analyze/ServiceResponseTime", NULL, "Service _Response Time", NULL, NULL, NULL },
{ "/Analyze/ServiceResponseTime/ONC-RPC", WIRESHARK_STOCK_TIME, "ONC-RPC...", NULL, NULL, G_CALLBACK(gtk_rpcstat_cb) },
{ "/Analyze/BACnet", NULL, "BACnet", NULL, NULL, NULL },
@ -3599,12 +3600,12 @@ menus_init(void) {
gtk_action_group_add_actions (packet_list_heading_action_group, /* the action group */
packet_list_heading_menu_popup_action_entries, /* an array of action descriptions */
G_N_ELEMENTS(packet_list_heading_menu_popup_action_entries), /* the number of entries */
popup_menu_object); /* data to pass to the action callbacks */
(gpointer)popup_menu_object); /* data to pass to the action callbacks */
gtk_action_group_add_toggle_actions(packet_list_heading_action_group, /* the action group */
packet_list_heading_menu_toggle_action_entries, /* an array of action descriptions */
gtk_action_group_add_toggle_actions(packet_list_heading_action_group, /* the action group */
packet_list_heading_menu_toggle_action_entries, /* an array of action descriptions */
G_N_ELEMENTS(packet_list_heading_menu_toggle_action_entries), /* the number of entries */
NULL); /* data to pass to the action callbacks */
(gpointer)NULL); /* data to pass to the action callbacks */
ui_manager_packet_list_heading = gtk_ui_manager_new ();
gtk_ui_manager_insert_action_group (ui_manager_packet_list_heading,
@ -3631,7 +3632,7 @@ menus_init(void) {
gtk_action_group_add_actions (packet_list_action_group, /* the action group */
packet_list_menu_popup_action_entries, /* an array of action descriptions */
G_N_ELEMENTS(packet_list_menu_popup_action_entries), /* the number of entries */
popup_menu_object); /* data to pass to the action callbacks */
(gpointer)popup_menu_object); /* data to pass to the action callbacks */
ui_manager_packet_list_menu = gtk_ui_manager_new ();
@ -3660,7 +3661,7 @@ menus_init(void) {
gtk_action_group_add_actions (packet_list_details_action_group, /* the action group */
tree_view_menu_popup_action_entries, /* an array of action descriptions */
G_N_ELEMENTS(tree_view_menu_popup_action_entries), /* the number of entries */
popup_menu_object); /* data to pass to the action callbacks */
(gpointer)popup_menu_object); /* data to pass to the action callbacks */
ui_manager_tree_view_menu = gtk_ui_manager_new ();
@ -3695,7 +3696,7 @@ menus_init(void) {
G_N_ELEMENTS(bytes_menu_radio_action_entries), /* the number of entries */
recent.gui_bytes_view, /* the value of the action to activate initially, or -1 if no action should be activated */
G_CALLBACK(select_bytes_view_cb), /* the callback to connect to the changed signal */
popup_menu_object); /* data to pass to the action callbacks */
(gpointer)popup_menu_object); /* data to pass to the action callbacks */
ui_manager_bytes_menu = gtk_ui_manager_new ();
@ -3776,10 +3777,10 @@ menus_init(void) {
statusbar_profiles_action_group = gtk_action_group_new ("StatusBarProfilesPopUpMenuActionGroup");
gtk_action_group_add_actions (statusbar_profiles_action_group, /* the action group */
statusbar_profiles_menu_action_entries, /* an array of action descriptions */
gtk_action_group_add_actions (statusbar_profiles_action_group, /* the action group */
statusbar_profiles_menu_action_entries, /* an array of action descriptions */
G_N_ELEMENTS(statusbar_profiles_menu_action_entries), /* the number of entries */
popup_menu_object); /* data to pass to the action callbacks */
(gpointer)popup_menu_object); /* data to pass to the action callbacks */
ui_manager_statusbar_profiles_menu = gtk_ui_manager_new ();
gtk_ui_manager_insert_action_group (ui_manager_statusbar_profiles_menu,

8
gtk/proto_hier_stats_dlg.c
View File

@ -394,10 +394,10 @@ proto_hier_create_popup_menu(void)
GtkWidget *popup_menu_object;
action_group = gtk_action_group_new ("ProtoHierStatsTFilterPopupActionGroup");
gtk_action_group_add_actions (action_group, /* the action group */
proto_hier_stats_popup_entries, /* an array of action descriptions */
G_N_ELEMENTS(proto_hier_stats_popup_entries),/* the number of entries */
NULL); /* data to pass to the action callbacks */
gtk_action_group_add_actions (action_group, /* the action group */
proto_hier_stats_popup_entries, /* an array of action descriptions */
G_N_ELEMENTS(proto_hier_stats_popup_entries), /* the number of entries */
(gpointer)NULL); /* data to pass to the action callbacks */
ui_manager = gtk_ui_manager_new ();
gtk_ui_manager_insert_action_group (ui_manager,

6
gtk/service_response_time_table.c
View File

@ -303,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 */
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 */
(gpointer)rst); /* data to pass to the action callbacks */
ui_manager = gtk_ui_manager_new ();
gtk_ui_manager_insert_action_group (ui_manager,

10
gtk/wlan_stat_dlg.c
View File

@ -1483,10 +1483,10 @@ wlan_create_popup_menu(wlanstat_t *hs)
GError *error = NULL;
action_group = gtk_action_group_new ("WlanFilterPopupActionGroup");
gtk_action_group_add_actions (action_group, /* the action group */
wlans_stat_popup_entries, /* an array of action descriptions */
G_N_ELEMENTS(wlans_stat_popup_entries), /* the number of entries */
hs); /* data to pass to the action callbacks */
gtk_action_group_add_actions (action_group, /* the action group */
wlans_stat_popup_entries, /* an array of action descriptions */
G_N_ELEMENTS(wlans_stat_popup_entries), /* the number of entries */
(gpointer)hs); /* data to pass to the action callbacks */
ui_manager = gtk_ui_manager_new ();
gtk_ui_manager_insert_action_group (ui_manager, action_group, 0);
@ -1703,7 +1703,7 @@ wlan_details_create_popup_menu(wlanstat_t *hs)
gtk_action_group_add_actions (action_group, /* the action group */
wlan_details_list_popup_entries, /* an array of action descriptions */
G_N_ELEMENTS(wlan_details_list_popup_entries), /* the number of entries */
hs); /* data to pass to the action callbacks */
(gpointer)hs); /* data to pass to the action callbacks */
ui_manager = gtk_ui_manager_new ();
gtk_ui_manager_insert_action_group (ui_manager, action_group, 0);