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

third round to replace SIGNAL_CONNECT with g_signal_connect 

svn path=/trunk/; revision=24914
This commit is contained in:
Ulf Lamping 2008-04-11 22:10:36 +00:00
parent f9f87904c4
commit 736cada149
19 changed files with 160 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/file_dlg.c
View File

@ -256,7 +256,7 @@ file_selection_browse(GtkWidget *file_bt, GtkWidget *file_te, const char *label,
window_set_cancel_button(fs, GTK_FILE_SELECTION(fs)->cancel_button,
window_cancel_button_cb);
SIGNAL_CONNECT(fs, "delete_event", window_delete_event_cb, fs);
g_signal_connect(fs, "delete_event", window_delete_event_cb, fs);
gtk_widget_show(fs);
window_present(fs);

8
gtk/fileset_dlg.c
View File

@ -194,7 +194,7 @@ fileset_dlg_add_file(fileset_entry *entry) {
}
gtk_tooltips_set_tip(tooltips, fs_rb, "Open this capture file", NULL);
gtk_table_attach_defaults(GTK_TABLE(fs_tb), fs_rb, 0, 1, row, row+1);
SIGNAL_CONNECT(fs_rb, "toggled", fs_rb_cb, entry);
g_signal_connect(fs_rb, "toggled", G_CALLBACK(fs_rb_cb), entry);
gtk_widget_show(fs_rb);
fs_lb = gtk_label_new(created);
@ -329,13 +329,13 @@ fileset_cb(GtkWidget *w _U_, gpointer d _U_)
if(topic_available(HELP_FILESET_DIALOG)) {
help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_FILESET_DIALOG);
g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_FILESET_DIALOG);
}
gtk_widget_grab_default(close_bt);
SIGNAL_CONNECT(fs_w, "delete_event", window_delete_event_cb, NULL);
SIGNAL_CONNECT(fs_w, "destroy", fs_destroy_cb, NULL);
g_signal_connect(fs_w, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
g_signal_connect(fs_w, "destroy", G_CALLBACK(fs_destroy_cb), NULL);
/* init the dialog content */
fileset_update_dlg();

30
gtk/filter_dlg.c
View File

@ -439,7 +439,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te,
gtk_widget_show(list_bb);
new_bt = gtk_button_new_from_stock(GTK_STOCK_NEW);
SIGNAL_CONNECT(new_bt, "clicked", filter_new_bt_clicked_cb, filter_list_type_p);
g_signal_connect(new_bt, "clicked", G_CALLBACK(filter_new_bt_clicked_cb), filter_list_type_p);
gtk_widget_show(new_bt);
gtk_box_pack_start (GTK_BOX (list_bb), new_bt, FALSE, FALSE, 0);
gtk_tooltips_set_tip (tooltips, new_bt,
@ -447,7 +447,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te,
del_bt = gtk_button_new_from_stock(GTK_STOCK_DELETE);
gtk_widget_set_sensitive(del_bt, FALSE);
SIGNAL_CONNECT(del_bt, "clicked", filter_del_bt_clicked_cb, filter_list_type_p);
g_signal_connect(del_bt, "clicked", G_CALLBACK(filter_del_bt_clicked_cb), filter_list_type_p);
g_object_set_data(G_OBJECT(main_w), E_FILT_DEL_BT_KEY, del_bt);
gtk_widget_show(del_bt);
gtk_box_pack_start (GTK_BOX (list_bb), del_bt, FALSE, FALSE, 0);
@ -475,8 +475,8 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te,
gtk_tree_view_append_column(GTK_TREE_VIEW(filter_l), column);
sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(filter_l));
gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE);
SIGNAL_CONNECT(sel, "changed", filter_sel_list_cb, filter_vb);
SIGNAL_CONNECT(filter_l, "button_press_event", filter_sel_list_button_cb,
g_signal_connect(sel, "changed", G_CALLBACK(filter_sel_list_cb), filter_vb);
g_signal_connect(filter_l, "button_press_event", G_CALLBACK(filter_sel_list_button_cb),
NULL);
g_object_set_data(G_OBJECT(main_w), E_FILT_FILTER_L_KEY, filter_l);
gtk_container_add(GTK_CONTAINER(filter_sc), filter_l);
@ -516,7 +516,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te,
name_te = gtk_entry_new();
gtk_box_pack_start(GTK_BOX(middle_hb), name_te, TRUE, TRUE, 0);
g_object_set_data(G_OBJECT(main_w), E_FILT_NAME_TE_KEY, name_te);
SIGNAL_CONNECT(name_te, "changed", filter_name_te_changed_cb, filter_list_type_p);
g_signal_connect(name_te, "changed", G_CALLBACK(filter_name_te_changed_cb), filter_list_type_p);
gtk_widget_show(name_te);
/* row: Filter text entry */
@ -531,7 +531,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te,
filter_te = gtk_entry_new();
gtk_box_pack_start(GTK_BOX(bottom_hb), filter_te, TRUE, TRUE, 0);
g_object_set_data(G_OBJECT(main_w), E_FILT_FILTER_TE_KEY, filter_te);
SIGNAL_CONNECT(filter_te, "changed", filter_name_te_changed_cb, filter_list_type_p);
g_signal_connect(filter_te, "changed", G_CALLBACK(filter_name_te_changed_cb), filter_list_type_p);
gtk_widget_show(filter_te);
g_object_set_data(G_OBJECT(main_w), E_FILT_PARENT_FILTER_TE_KEY, parent_filter_te);
@ -545,7 +545,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te,
/* Create the "Add Expression..." button, to pop up a dialog
for constructing filter comparison expressions. */
add_expression_bt = gtk_button_new_from_stock(WIRESHARK_STOCK_ADD_EXPRESSION);
SIGNAL_CONNECT(add_expression_bt, "clicked", filter_add_expr_bt_cb, main_w);
g_signal_connect(add_expression_bt, "clicked", G_CALLBACK(filter_add_expr_bt_cb), main_w);
gtk_box_pack_start(GTK_BOX(bottom_hb), add_expression_bt, FALSE, FALSE, 0);
gtk_widget_show(add_expression_bt);
gtk_tooltips_set_tip (tooltips, add_expression_bt, ("Add an expression to the filter string"), NULL);
@ -558,7 +558,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te,
gtk_widget_show(bbox);
ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK);
SIGNAL_CONNECT(ok_bt, "clicked", filter_dlg_ok_cb, filter_list_type_p);
g_signal_connect(ok_bt, "clicked", G_CALLBACK(filter_dlg_ok_cb), filter_list_type_p);
gtk_tooltips_set_tip (tooltips, ok_bt, ("Apply the filters and close this dialog"), NULL);
/* Catch the "activate" signal on the filter name and filter
@ -572,23 +572,23 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te,
}
apply_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_APPLY);
SIGNAL_CONNECT(apply_bt, "clicked", filter_dlg_apply_cb, filter_list_type_p);
g_signal_connect(apply_bt, "clicked", G_CALLBACK(filter_dlg_apply_cb), filter_list_type_p);
gtk_tooltips_set_tip (tooltips, apply_bt, ("Apply the filters and keep this dialog open"), NULL);
save_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_SAVE);
SIGNAL_CONNECT(save_bt, "clicked", filter_dlg_save_cb, filter_list_type_p);
g_signal_connect(save_bt, "clicked", G_CALLBACK(filter_dlg_save_cb), filter_list_type_p);
gtk_tooltips_set_tip (tooltips, save_bt, ("Save the filters permanently and keep this dialog open"), NULL);
cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
gtk_tooltips_set_tip (tooltips, cancel_bt, ("Cancel the changes"), NULL);
SIGNAL_CONNECT(cancel_bt, "clicked", filter_dlg_cancel_cb, filter_list_type_p);
g_signal_connect(cancel_bt, "clicked", G_CALLBACK(filter_dlg_cancel_cb), filter_list_type_p);
window_set_cancel_button(main_w, cancel_bt, NULL);
help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
if (list_type == CFILTER_EDITED_LIST) {
SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_CAPTURE_FILTERS_DIALOG);
g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_CAPTURE_FILTERS_DIALOG);
} else {
SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_DISPLAY_FILTERS_DIALOG);
g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_DISPLAY_FILTERS_DIALOG);
}
gtk_tooltips_set_tip (tooltips, help_bt, ("Show topic specific help"), NULL);
@ -618,8 +618,8 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te,
gtk_entry_set_text(GTK_ENTRY(filter_te), filter_te_str);
}
SIGNAL_CONNECT(main_w, "delete_event", filter_dlg_delete_event_cb, filter_list_type_p);
SIGNAL_CONNECT(main_w, "destroy", filter_dlg_destroy_cb, filter_list_type_p);
g_signal_connect(main_w, "delete_event", G_CALLBACK(filter_dlg_delete_event_cb), filter_list_type_p);
g_signal_connect(main_w, "destroy", G_CALLBACK(filter_dlg_destroy_cb), filter_list_type_p);
gtk_widget_show(main_w);

22
gtk/find_dlg.c
View File

@ -195,8 +195,8 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_)
gtk_widget_show(filter_hb);
filter_bt = gtk_button_new_from_stock(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY);
SIGNAL_CONNECT(filter_bt, "clicked", display_filter_construct_cb, &args);
SIGNAL_CONNECT(filter_bt, "destroy", filter_button_destroy_cb, NULL);
g_signal_connect(filter_bt, "clicked", G_CALLBACK(display_filter_construct_cb), &args);
g_signal_connect(filter_bt, "destroy", G_CALLBACK(filter_button_destroy_cb), NULL);
g_object_set_data(G_OBJECT(filter_bt), E_FILT_TE_BUTTON_KEY, filter_bt);
gtk_box_pack_start(GTK_BOX(filter_hb), filter_bt, FALSE, TRUE, 0);
gtk_tooltips_set_tip (tooltips, filter_bt, ("Click on the filter button to select a display filter,\nor enter your search criteria into the text box"), NULL);
@ -207,7 +207,7 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_)
g_object_set_data(G_OBJECT(filter_bt), E_FILT_TE_PTR_KEY, filter_text_box);
g_object_set_data(G_OBJECT(find_frame_w), E_FILT_TE_PTR_KEY, filter_text_box);
gtk_box_pack_start(GTK_BOX(filter_hb), filter_text_box, TRUE, TRUE, 0);
SIGNAL_CONNECT(filter_text_box, "changed", find_filter_te_syntax_check_cb, find_frame_w);
g_signal_connect(filter_text_box, "changed", G_CALLBACK(find_filter_te_syntax_check_cb), find_frame_w);
gtk_widget_show(filter_text_box);
@ -319,14 +319,14 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_)
gtk_widget_show(bbox);
ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_FIND);
SIGNAL_CONNECT(ok_bt, "clicked", find_frame_ok_cb, find_frame_w);
g_signal_connect(ok_bt, "clicked", G_CALLBACK(find_frame_ok_cb), find_frame_w);
cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
SIGNAL_CONNECT(cancel_bt, "clicked", find_frame_close_cb, find_frame_w);
g_signal_connect(cancel_bt, "clicked", G_CALLBACK(find_frame_close_cb), find_frame_w);
if(topic_available(HELP_FIND_DIALOG)) {
help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_FIND_DIALOG);
g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_FIND_DIALOG);
}
/* Attach pointers to needed widgets to the capture prefs window/object */
@ -349,9 +349,9 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_)
* be delivered before the pointers are attached; the signal
* handlers expect the pointers to be attached, and won't be happy.
*/
SIGNAL_CONNECT(hex_rb, "clicked", hex_selected_cb, find_frame_w);
SIGNAL_CONNECT(string_rb, "clicked", string_selected_cb, find_frame_w);
SIGNAL_CONNECT(filter_rb, "clicked", filter_selected_cb, find_frame_w);
g_signal_connect(hex_rb, "clicked", G_CALLBACK(hex_selected_cb), find_frame_w);
g_signal_connect(string_rb, "clicked", G_CALLBACK(string_selected_cb), find_frame_w);
g_signal_connect(filter_rb, "clicked", G_CALLBACK(filter_selected_cb), find_frame_w);
string_selected_cb(NULL, find_frame_w);
filter_selected_cb(NULL, find_frame_w);
@ -369,8 +369,8 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_)
/* Give the initial focus to the "Filter" entry box. */
gtk_widget_grab_focus(filter_text_box);
SIGNAL_CONNECT(find_frame_w, "delete_event", window_delete_event_cb, NULL);
SIGNAL_CONNECT(find_frame_w, "destroy", find_frame_destroy_cb, NULL);
g_signal_connect(find_frame_w, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
g_signal_connect(find_frame_w, "destroy", G_CALLBACK(find_frame_destroy_cb), NULL);
gtk_widget_show(find_frame_w);
window_present(find_frame_w);

24
gtk/firewall_dlg.c
View File

@ -238,7 +238,7 @@ firewall_rule_cb(GtkWidget *w _U_, gpointer data _U_)
menu = gtk_menu_new();
for (i = 0; i < NUM_PRODS; i++) {
menu_item = gtk_menu_item_new_with_label(products[i].name);
SIGNAL_CONNECT(menu_item, "activate", select_product, GUINT_TO_POINTER(i));
g_signal_connect(menu_item, "activate", G_CALLBACK(select_product), GUINT_TO_POINTER(i));
g_object_set_data(G_OBJECT(menu_item), WS_RULE_INFO_KEY, rule_info);
gtk_menu_append(GTK_MENU(menu), menu_item);
/* if (i == 0)
@ -259,14 +259,14 @@ firewall_rule_cb(GtkWidget *w _U_, gpointer data _U_)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rule_info->inbound_cb),
rule_info->inbound);
gtk_box_pack_start(GTK_BOX(hbox), rule_info->inbound_cb, FALSE, FALSE, 10);
SIGNAL_CONNECT(rule_info->inbound_cb, "toggled", toggle_inbound, rule_info);
g_signal_connect(rule_info->inbound_cb, "toggled", G_CALLBACK(toggle_inbound), rule_info);
/* deny selector */
rule_info->deny_cb = gtk_check_button_new_with_label("Deny");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rule_info->deny_cb),
rule_info->deny);
gtk_box_pack_start(GTK_BOX(hbox), rule_info->deny_cb, FALSE, FALSE, 10);
SIGNAL_CONNECT(rule_info->deny_cb, "toggled", toggle_deny, rule_info);
g_signal_connect(rule_info->deny_cb, "toggled", G_CALLBACK(toggle_deny), rule_info);
/* create a scrolled window for the text */
txt_scrollw = scrolled_window_new(NULL, NULL);
@ -288,13 +288,13 @@ firewall_rule_cb(GtkWidget *w _U_, gpointer data _U_)
/* Create Copy Button */
button = gtk_button_new_from_stock(GTK_STOCK_COPY);
SIGNAL_CONNECT(button, "clicked", firewall_copy_cmd_cb, rule_info);
g_signal_connect(button, "clicked", G_CALLBACK(firewall_copy_cmd_cb), rule_info);
gtk_tooltips_set_tip (tooltips, button, "Copy rule to clipboard ", NULL);
gtk_box_pack_start(GTK_BOX(button_hbox), button, FALSE, FALSE, 0);
/* Create Save As Button */
button = gtk_button_new_from_stock(GTK_STOCK_SAVE_AS);
SIGNAL_CONNECT(button, "clicked", firewall_save_as_cmd_cb, rule_info);
g_signal_connect(button, "clicked", G_CALLBACK(firewall_save_as_cmd_cb), rule_info);
gtk_tooltips_set_tip (tooltips, button, "Save the rule as currently displayed ", NULL);
gtk_box_pack_start(GTK_BOX(button_hbox), button, FALSE, FALSE, 0);
@ -310,8 +310,8 @@ firewall_rule_cb(GtkWidget *w _U_, gpointer data _U_)
/* Tuck away the rule_info object into the window */
g_object_set_data(G_OBJECT(rule_w), WS_RULE_INFO_KEY, rule_info);
SIGNAL_CONNECT(rule_w, "delete_event", window_delete_event_cb, NULL);
SIGNAL_CONNECT(rule_w, "destroy", firewall_destroy_cb, NULL);
g_signal_connect(rule_w, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
g_signal_connect(rule_w, "destroy", G_CALLBACK(firewall_destroy_cb), NULL);
/* Make sure this widget gets destroyed if we quit the main loop,
so that if we exit, we clean up any temporary files we have
@ -327,7 +327,7 @@ firewall_rule_cb(GtkWidget *w _U_, gpointer data _U_)
/* Set the current product. */
#define ADD_TO_FILTER_MENU(rt) \
menu_item = gtk_menu_item_new_with_label(name); \
SIGNAL_CONNECT(menu_item, "activate", select_filter, \
g_signal_connect(menu_item, "activate", G_CALLBACK(select_filter), \
GUINT_TO_POINTER(rt)); \
g_object_set_data(G_OBJECT(menu_item), WS_RULE_INFO_KEY, rule_info); \
gtk_menu_append(GTK_MENU(menu), menu_item); \
@ -707,7 +707,7 @@ firewall_save_as_cmd_cb(GtkWidget *w _U_, gpointer data)
/* Tuck away the rule_info object into the window */
g_object_set_data(G_OBJECT(new_win), WS_RULE_INFO_KEY, rule_info);
SIGNAL_CONNECT(new_win, "destroy", firewall_save_as_destroy_cb, rule_info);
g_signal_connect(new_win, "destroy", G_CALLBACK(firewall_save_as_destroy_cb), rule_info);
#if GTK_CHECK_VERSION(2,4,0)
if (gtk_dialog_run(GTK_DIALOG(new_win)) == GTK_RESPONSE_ACCEPT)
@ -719,15 +719,15 @@ firewall_save_as_cmd_cb(GtkWidget *w _U_, gpointer data)
#else
/* Connect the ok_button to file_save_as_ok_cb function and pass along a
pointer to the file selection box widget */
SIGNAL_CONNECT(GTK_FILE_SELECTION(new_win)->ok_button,
"clicked", firewall_save_as_ok_cb, new_win);
g_signal_connect(GTK_FILE_SELECTION(new_win)->ok_button,
"clicked", G_CALLBACK(firewall_save_as_ok_cb), new_win);
window_set_cancel_button(new_win,
GTK_FILE_SELECTION(new_win)->cancel_button, window_cancel_button_cb);
gtk_file_selection_set_filename(GTK_FILE_SELECTION(new_win), "");
SIGNAL_CONNECT(new_win, "delete_event", window_delete_event_cb, NULL);
g_signal_connect(new_win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
gtk_widget_show_all(new_win);
window_present(new_win);

18
gtk/flow_graph.c
View File

@ -512,7 +512,7 @@ static void flow_graph_dlg_create (void)
select_all_rb = gtk_radio_button_new_with_mnemonic_from_widget(NULL, "_All packets");
gtk_tooltips_set_tip (tooltips, select_all_rb,
("Process all packets"), NULL);
SIGNAL_CONNECT(select_all_rb, "toggled", toggle_select_all, NULL);
g_signal_connect(select_all_rb, "toggled", G_CALLBACK(toggle_select_all), NULL);
gtk_table_attach_defaults(GTK_TABLE(range_tb), select_all_rb, 0, 1, 0, 1);
if (type_of_packets == ALL) {
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(select_all_rb),TRUE);
@ -523,7 +523,7 @@ static void flow_graph_dlg_create (void)
select_displayed_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(select_all_rb), "_Displayed packets");
gtk_tooltips_set_tip (tooltips, select_displayed_rb,
("Process displayed packets"), NULL);
SIGNAL_CONNECT(select_displayed_rb, "toggled", toggle_select_displayed, NULL);
g_signal_connect(select_displayed_rb, "toggled", G_CALLBACK(toggle_select_displayed), NULL);
gtk_table_attach_defaults(GTK_TABLE(range_tb), select_displayed_rb, 1, 2, 0, 1);
if (type_of_packets == DISPLAYED) {
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(select_displayed_rb),TRUE);
@ -546,7 +546,7 @@ static void flow_graph_dlg_create (void)
select_general_rb = gtk_radio_button_new_with_mnemonic_from_widget(NULL, "_General flow");
gtk_tooltips_set_tip (tooltips, select_general_rb,
("Show all packets, with general information"), NULL);
SIGNAL_CONNECT(select_general_rb, "toggled", toggle_select_general, NULL);
g_signal_connect(select_general_rb, "toggled", G_CALLBACK(toggle_select_general), NULL);
gtk_table_attach_defaults(GTK_TABLE(flow_type_tb), select_general_rb, 0, 1, 0, 1);
if (type_of_flow == GENERAL) {
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(select_general_rb),TRUE);
@ -557,7 +557,7 @@ static void flow_graph_dlg_create (void)
select_tcp_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(select_general_rb), "_TCP flow");
gtk_tooltips_set_tip (tooltips, select_tcp_rb,
("Show only TCP packets, with TCP specific information"), NULL);
SIGNAL_CONNECT(select_tcp_rb, "toggled", toggle_select_tcp, NULL);
g_signal_connect(select_tcp_rb, "toggled", G_CALLBACK(toggle_select_tcp), NULL);
gtk_table_attach_defaults(GTK_TABLE(flow_type_tb), select_tcp_rb, 1, 2, 0, 1);
if (type_of_flow == TCP) {
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(select_tcp_rb),TRUE);
@ -580,7 +580,7 @@ static void flow_graph_dlg_create (void)
src_dst_rb = gtk_radio_button_new_with_mnemonic_from_widget(NULL, "_Standard source/destination addresses");
gtk_tooltips_set_tip (tooltips, src_dst_rb,
("Nodes in the diagram are identified with source and destination addresses"), NULL);
SIGNAL_CONNECT(src_dst_rb, "toggled", toggle_select_srcdst, NULL);
g_signal_connect(src_dst_rb, "toggled", G_CALLBACK(toggle_select_srcdst), NULL);
gtk_table_attach_defaults(GTK_TABLE(node_addr_tb), src_dst_rb, 0, 1, 0, 1);
if (node_addr_type == SRCDST) {
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(src_dst_rb),TRUE);
@ -591,7 +591,7 @@ static void flow_graph_dlg_create (void)
net_src_dst_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(src_dst_rb), "_Network source/destination addresses");
gtk_tooltips_set_tip (tooltips, net_src_dst_rb,
("Nodes in the diagram are identified with network source and destination addresses"), NULL);
SIGNAL_CONNECT(net_src_dst_rb, "toggled", toggle_select_netsrcdst, NULL);
g_signal_connect(net_src_dst_rb, "toggled", G_CALLBACK(toggle_select_netsrcdst), NULL);
gtk_table_attach_defaults(GTK_TABLE(node_addr_tb), net_src_dst_rb, 1, 2, 0, 1);
if (node_addr_type == NET_SRCDST) {
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(net_src_dst_rb),TRUE);
@ -611,7 +611,7 @@ static void flow_graph_dlg_create (void)
bt_ok = gtk_button_new_from_stock(GTK_STOCK_OK);
gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_ok);
gtk_tooltips_set_tip (tooltips, bt_ok, "Show the flow graph", NULL);
SIGNAL_CONNECT(bt_ok, "clicked", flow_graph_on_ok, flow_graph_dlg_w);
g_signal_connect(bt_ok, "clicked", G_CALLBACK(flow_graph_on_ok), flow_graph_dlg_w);
gtk_widget_show(bt_ok);
bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
@ -620,8 +620,8 @@ static void flow_graph_dlg_create (void)
gtk_tooltips_set_tip (tooltips, bt_close, "Close this dialog", NULL);
window_set_cancel_button(flow_graph_dlg_w, bt_close, window_cancel_button_cb);
SIGNAL_CONNECT(flow_graph_dlg_w, "delete_event", window_delete_event_cb, NULL);
SIGNAL_CONNECT(flow_graph_dlg_w, "destroy", flow_graph_on_destroy, NULL);
g_signal_connect(flow_graph_dlg_w, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
g_signal_connect(flow_graph_dlg_w, "destroy", G_CALLBACK(flow_graph_on_destroy), NULL);
gtk_widget_show_all(flow_graph_dlg_w);
window_present(flow_graph_dlg_w);

49
gtk/follow_stream.c
View File

@ -282,9 +282,9 @@ follow_find_cb(GtkWidget * w _U_, gpointer data)
gtk_window_set_destroy_with_parent(GTK_WINDOW(find_dlg_w), TRUE);
follow_info->find_dlg_w = find_dlg_w;
SIGNAL_CONNECT(find_dlg_w, "destroy", follow_find_destroy_cb,
g_signal_connect(find_dlg_w, "destroy", G_CALLBACK(follow_find_destroy_cb),
follow_info);
SIGNAL_CONNECT(find_dlg_w, "delete_event", window_delete_event_cb,
g_signal_connect(find_dlg_w, "delete_event", G_CALLBACK(window_delete_event_cb),
NULL);
/* Main vertical box */
@ -316,7 +316,7 @@ follow_find_cb(GtkWidget * w _U_, gpointer data)
find_bt = g_object_get_data(G_OBJECT(buttons_row), GTK_STOCK_FIND);
cancel_bt = g_object_get_data(G_OBJECT(buttons_row), GTK_STOCK_CANCEL);
SIGNAL_CONNECT(find_bt, "clicked", follow_find_button_cb, follow_info);
g_signal_connect(find_bt, "clicked", G_CALLBACK(follow_find_button_cb), follow_info);
g_object_set_data(G_OBJECT(find_bt), "find_string", find_text_box);
window_set_cancel_button(find_dlg_w, cancel_bt,
window_cancel_button_cb);
@ -526,7 +526,7 @@ follow_save_as_cmd_cb(GtkWidget *w _U_, gpointer data)
/* Tuck away the follow_info object into the window */
g_object_set_data(G_OBJECT(new_win), E_FOLLOW_INFO_KEY, follow_info);
SIGNAL_CONNECT(new_win, "destroy", follow_save_as_destroy_cb,
g_signal_connect(new_win, "destroy", G_CALLBACK(follow_save_as_destroy_cb),
follow_info);
#if GTK_CHECK_VERSION(2,4,0)
@ -539,8 +539,8 @@ follow_save_as_cmd_cb(GtkWidget *w _U_, gpointer data)
#else
/* Connect the ok_button to file_save_as_ok_cb function and pass along a
pointer to the file selection box widget */
SIGNAL_CONNECT(GTK_FILE_SELECTION(new_win)->ok_button,
"clicked", follow_save_as_ok_cb, new_win);
g_signal_connect(GTK_FILE_SELECTION(new_win)->ok_button,
"clicked", G_CALLBACK(follow_save_as_ok_cb), new_win);
window_set_cancel_button(new_win,
GTK_FILE_SELECTION(new_win)->cancel_button,
@ -548,7 +548,7 @@ follow_save_as_cmd_cb(GtkWidget *w _U_, gpointer data)
gtk_file_selection_set_filename(GTK_FILE_SELECTION(new_win), "");
SIGNAL_CONNECT(new_win, "delete_event", window_delete_event_cb, NULL);
g_signal_connect(new_win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
gtk_widget_show_all(new_win);
window_present(new_win);
@ -760,20 +760,20 @@ follow_stream(gchar *title, follow_info_t *follow_info,
#if GTK_CHECK_VERSION(2,4,0)
/* Create Find Button */
button = gtk_button_new_from_stock(GTK_STOCK_FIND);
SIGNAL_CONNECT(button, "clicked", follow_find_cb, follow_info);
g_signal_connect(button, "clicked", G_CALLBACK(follow_find_cb), follow_info);
gtk_tooltips_set_tip (tooltips, button, "Find text in the displayed content", NULL);
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
#endif
/* Create Save As Button */
button = gtk_button_new_from_stock(GTK_STOCK_SAVE_AS);
SIGNAL_CONNECT(button, "clicked", follow_save_as_cmd_cb, follow_info);
g_signal_connect(button, "clicked", G_CALLBACK(follow_save_as_cmd_cb), follow_info);
gtk_tooltips_set_tip (tooltips, button, "Save the content as currently displayed", NULL);
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
/* Create Print Button */
button = gtk_button_new_from_stock(GTK_STOCK_PRINT);
SIGNAL_CONNECT(button, "clicked", follow_print_stream, follow_info);
g_signal_connect(button, "clicked", G_CALLBACK(follow_print_stream), follow_info);
gtk_tooltips_set_tip(tooltips, button, "Print the content as currently displayed", NULL);
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
@ -786,21 +786,20 @@ follow_stream(gchar *title, follow_info_t *follow_info,
stream_menu = gtk_menu_new();
stream_mi = gtk_menu_item_new_with_label(both_directions_string);
SIGNAL_CONNECT(stream_mi, "activate", follow_stream_om_both,
g_signal_connect(stream_mi, "activate", G_CALLBACK(follow_stream_om_both),
follow_info);
gtk_menu_append(GTK_MENU(stream_menu), stream_mi);
gtk_widget_show(stream_mi);
follow_info->show_stream = BOTH_HOSTS;
stream_mi = gtk_menu_item_new_with_label(server_to_client_string);
SIGNAL_CONNECT(stream_mi, "activate", follow_stream_om_client,
follow_info)
;
g_signal_connect(stream_mi, "activate", G_CALLBACK(follow_stream_om_client),
follow_info);
gtk_menu_append(GTK_MENU(stream_menu), stream_mi);
gtk_widget_show(stream_mi);
stream_mi = gtk_menu_item_new_with_label(client_to_server_string);
SIGNAL_CONNECT(stream_mi, "activate", follow_stream_om_server,
g_signal_connect(stream_mi, "activate", G_CALLBACK(follow_stream_om_server),
follow_info);
gtk_menu_append(GTK_MENU(stream_menu), stream_mi);
gtk_widget_show(stream_mi);
@ -818,7 +817,7 @@ follow_stream(gchar *title, follow_info_t *follow_info,
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_bt),
IS_SHOW_TYPE(SHOW_ASCII));
gtk_box_pack_start(GTK_BOX(hbox), radio_bt, FALSE, FALSE, 0);
SIGNAL_CONNECT(radio_bt, "toggled", follow_charset_toggle_cb,
g_signal_connect(radio_bt, "toggled", G_CALLBACK(follow_charset_toggle_cb),
follow_info);
follow_info->ascii_bt = radio_bt;
@ -830,7 +829,7 @@ follow_stream(gchar *title, follow_info_t *follow_info,
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_bt),
IS_SHOW_TYPE(SHOW_EBCDIC));
gtk_box_pack_start(GTK_BOX(hbox), radio_bt, FALSE, FALSE, 0);
SIGNAL_CONNECT(radio_bt, "toggled", follow_charset_toggle_cb,
g_signal_connect(radio_bt, "toggled", G_CALLBACK(follow_charset_toggle_cb),
follow_info);
follow_info->ebcdic_bt = radio_bt;
@ -842,7 +841,7 @@ follow_stream(gchar *title, follow_info_t *follow_info,
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_bt),
IS_SHOW_TYPE(SHOW_HEXDUMP));
gtk_box_pack_start(GTK_BOX(hbox), radio_bt, FALSE, FALSE, 0);
SIGNAL_CONNECT(radio_bt, "toggled", follow_charset_toggle_cb,
g_signal_connect(radio_bt, "toggled", G_CALLBACK(follow_charset_toggle_cb),
follow_info);
follow_info->hexdump_bt = radio_bt;
@ -854,7 +853,7 @@ follow_stream(gchar *title, follow_info_t *follow_info,
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_bt),
IS_SHOW_TYPE(SHOW_CARRAY));
gtk_box_pack_start(GTK_BOX(hbox), radio_bt, FALSE, FALSE, 0);
SIGNAL_CONNECT(radio_bt, "toggled", follow_charset_toggle_cb,
g_signal_connect(radio_bt, "toggled", G_CALLBACK(follow_charset_toggle_cb),
follow_info);
follow_info->carray_bt = radio_bt;
@ -866,7 +865,7 @@ follow_stream(gchar *title, follow_info_t *follow_info,
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_bt),
IS_SHOW_TYPE(SHOW_RAW));
gtk_box_pack_start(GTK_BOX(hbox), radio_bt, FALSE, FALSE, 0);
SIGNAL_CONNECT(radio_bt, "toggled", follow_charset_toggle_cb,
g_signal_connect(radio_bt, "toggled", G_CALLBACK(follow_charset_toggle_cb),
follow_info);
follow_info->raw_bt = radio_bt;
@ -885,7 +884,7 @@ follow_stream(gchar *title, follow_info_t *follow_info,
button = g_object_get_data(G_OBJECT(bbox), WIRESHARK_STOCK_FILTER_OUT_STREAM);
gtk_tooltips_set_tip (tooltips, button,
"Build a display filter which cuts this stream from the capture", NULL);
SIGNAL_CONNECT(button, "clicked", follow_filter_out_stream,
g_signal_connect(button, "clicked", G_CALLBACK(follow_filter_out_stream),
follow_info);
button = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
@ -896,8 +895,8 @@ follow_stream(gchar *title, follow_info_t *follow_info,
if(topic_available(HELP_FILESET_DIALOG)) {
button = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
SIGNAL_CONNECT(button, "clicked", topic_cb,
HELP_FOLLOW_TCP_STREAM_DIALOG);
g_signal_connect(button, "clicked", G_CALLBACK(topic_cb),
(gpointer)HELP_FOLLOW_TCP_STREAM_DIALOG);
}
/* Tuck away the follow_info object into the window */
@ -907,8 +906,8 @@ follow_stream(gchar *title, follow_info_t *follow_info,
remember_follow_info(follow_info);
SIGNAL_CONNECT(streamwindow, "delete_event", window_delete_event_cb, NULL);
SIGNAL_CONNECT(streamwindow, "destroy", follow_destroy_cb, NULL);
g_signal_connect(streamwindow, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
g_signal_connect(streamwindow, "destroy", G_CALLBACK(follow_destroy_cb), NULL);
/* Make sure this widget gets destroyed if we quit the main loop,
so that if we exit, we clean up any temporary files we have

14
gtk/funnel_stat.c
View File

@ -160,7 +160,7 @@ static funnel_text_window_t* new_text_window(const gchar* title) {
tw->buttons = g_ptr_array_new();
tw->win = window_new(GTK_WINDOW_TOPLEVEL,title);
SIGNAL_CONNECT(tw->win, "delete-event", text_window_delete_event_cb, tw);
g_signal_connect(tw->win, "delete-event", G_CALLBACK(text_window_delete_event_cb), tw);
txt_scrollw = scrolled_window_new(NULL, NULL);
main_vb = gtk_vbox_new(FALSE, 3);
@ -200,7 +200,7 @@ static funnel_text_window_t* new_text_window(const gchar* title) {
gtk_box_pack_end(GTK_BOX(hbox), tw->bt_close, FALSE, FALSE, 0);
gtk_widget_show(tw->bt_close);
SIGNAL_CONNECT(tw->bt_close, "clicked", text_window_cancel_button_cb, tw);
g_signal_connect(tw->bt_close, "clicked", G_CALLBACK(text_window_cancel_button_cb), tw);
gtk_widget_grab_default(tw->bt_close);
gtk_container_add(GTK_CONTAINER(txt_scrollw), tw->txt);
@ -311,8 +311,8 @@ static void text_window_destroy(funnel_text_window_t* tw) {
* the window is still there and its callbacks refer to this data structure
* we need to change the callback so that they free tw.
*/
SIGNAL_CONNECT(tw->bt_close, "clicked", unref_text_win_cancel_bt_cb, tw);
SIGNAL_CONNECT(tw->win, "delete-event", text_window_unref_del_event_cb, tw);
g_signal_connect(tw->bt_close, "clicked", G_CALLBACK(unref_text_win_cancel_bt_cb), tw);
g_signal_connect(tw->win, "delete-event", G_CALLBACK(text_window_unref_del_event_cb), tw);
} else {
unsigned i;
/*
@ -358,7 +358,7 @@ static void text_window_add_button(funnel_text_window_t* tw, funnel_bt_t* cbd,
gtk_box_pack_start(GTK_BOX(tw->button_hbox), button, FALSE, FALSE, 0);
gtk_widget_show(button);
SIGNAL_CONNECT(button, "clicked", text_window_button_cb, cbd);
g_signal_connect(button, "clicked", G_CALLBACK(text_window_button_cb), cbd);
}
@ -448,11 +448,11 @@ static void funnel_new_dialog(const gchar* title,
gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 0);
bt_ok = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK);
SIGNAL_CONNECT(bt_ok, "clicked", funnel_dlg_cb, dd);
g_signal_connect(bt_ok, "clicked", G_CALLBACK(funnel_dlg_cb), dd);
gtk_widget_grab_default(bt_ok);
bt_cancel = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
SIGNAL_CONNECT(bt_cancel, "clicked", funnel_cancel_btn_cb, win);
g_signal_connect(bt_cancel, "clicked", G_CALLBACK(funnel_cancel_btn_cb), win);
gtk_widget_grab_default(bt_cancel);
gtk_widget_show(main_tb);

6
gtk/goto_dlg.c
View File

@ -82,14 +82,14 @@ goto_frame_cb(GtkWidget *w _U_, gpointer d _U_)
gtk_widget_show(bbox);
ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_JUMP_TO);
SIGNAL_CONNECT(ok_bt, "clicked", goto_frame_ok_cb, goto_frame_w);
SIGNAL_CONNECT(ok_bt, "clicked", G_CALLBACK(goto_frame_ok_cb), goto_frame_w);
cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
window_set_cancel_button(goto_frame_w, cancel_bt, window_cancel_button_cb);
if(topic_available(HELP_GOTO_DIALOG)) {
help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_GOTO_DIALOG);
SIGNAL_CONNECT(help_bt, "clicked", G_CALLBACK(topic_cb), HELP_GOTO_DIALOG);
}
gtk_widget_grab_default(ok_bt);
@ -106,7 +106,7 @@ goto_frame_cb(GtkWidget *w _U_, gpointer d _U_)
/* Attach pointers to needed widgets to the capture prefs window/object */
g_object_set_data(G_OBJECT(goto_frame_w), E_GOTO_FNUMBER_KEY, fnumber_te);
SIGNAL_CONNECT(goto_frame_w, "delete_event", window_delete_event_cb, NULL);
SIGNAL_CONNECT(goto_frame_w, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
gtk_widget_show(goto_frame_w);
window_present(goto_frame_w);

36
gtk/graph_analysis.c
View File

@ -562,13 +562,13 @@ on_save_bt_clicked (GtkButton *button _U_,
gtk_widget_show (vertb);
ok_bt = GTK_FILE_SELECTION(save_to_file_w)->ok_button;
SIGNAL_CONNECT(ok_bt, "clicked", save_to_file_ok_cb, user_data);
SIGNAL_CONNECT(ok_bt, "clicked", G_CALLBACK(save_to_file_ok_cb), user_data);
window_set_cancel_button(save_to_file_w,
GTK_FILE_SELECTION(save_to_file_w)->cancel_button, window_cancel_button_cb);
SIGNAL_CONNECT(save_to_file_w, "delete_event", window_delete_event_cb, NULL);
SIGNAL_CONNECT(save_to_file_w, "destroy", save_to_file_destroy_cb,
SIGNAL_CONNECT(save_to_file_w, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
SIGNAL_CONNECT(save_to_file_w, "destroy", G_CALLBACK(save_to_file_destroy_cb),
NULL);
gtk_widget_show(save_to_file_w);
@ -1373,7 +1373,7 @@ static void create_draw_area(graph_analysis_data_t* user_data, GtkWidget *box)
g_object_set_data(G_OBJECT(user_data->dlg.draw_area_comments), "graph_analysis_data_t", user_data);
gtk_widget_add_events (user_data->dlg.draw_area_comments, GDK_BUTTON_PRESS_MASK);
SIGNAL_CONNECT(user_data->dlg.draw_area_comments, "scroll_event", scroll_event, user_data);
SIGNAL_CONNECT(user_data->dlg.draw_area_comments, "scroll_event", G_CALLBACK(scroll_event), user_data);
/* create main Graph draw area */
user_data->dlg.draw_area=gtk_drawing_area_new();
if (user_data->num_nodes < 2)
@ -1396,21 +1396,21 @@ static void create_draw_area(graph_analysis_data_t* user_data, GtkWidget *box)
gtk_widget_grab_focus(user_data->dlg.draw_area);
/* signals needed to handle backing pixmap */
SIGNAL_CONNECT(user_data->dlg.draw_area, "expose_event", expose_event, NULL);
SIGNAL_CONNECT(user_data->dlg.draw_area, "configure_event", configure_event, user_data);
SIGNAL_CONNECT(user_data->dlg.draw_area, "expose_event", G_CALLBACK(expose_event), NULL);
SIGNAL_CONNECT(user_data->dlg.draw_area, "configure_event", G_CALLBACK(configure_event), user_data);
/* signals needed to handle backing pixmap comments*/
SIGNAL_CONNECT(user_data->dlg.draw_area_comments, "expose_event", expose_event_comments, NULL);
SIGNAL_CONNECT(user_data->dlg.draw_area_comments, "configure_event", configure_event_comments, user_data);
SIGNAL_CONNECT(user_data->dlg.draw_area_comments, "expose_event", G_CALLBACK(expose_event_comments), NULL);
SIGNAL_CONNECT(user_data->dlg.draw_area_comments, "configure_event", G_CALLBACK(configure_event_comments), user_data);
/* signals needed to handle backing pixmap time*/
SIGNAL_CONNECT(user_data->dlg.draw_area_time, "expose_event", expose_event_time, NULL);
SIGNAL_CONNECT(user_data->dlg.draw_area_time, "configure_event", configure_event_time, user_data);
SIGNAL_CONNECT(user_data->dlg.draw_area_time, "expose_event", G_CALLBACK(expose_event_time), NULL);
SIGNAL_CONNECT(user_data->dlg.draw_area_time, "configure_event", G_CALLBACK(configure_event_time), user_data);
gtk_widget_add_events (user_data->dlg.draw_area, GDK_BUTTON_PRESS_MASK);
SIGNAL_CONNECT(user_data->dlg.draw_area, "button_press_event", button_press_event, user_data);
SIGNAL_CONNECT(user_data->dlg.draw_area, "scroll_event", scroll_event, user_data);
SIGNAL_CONNECT(user_data->dlg.draw_area, "key_press_event", key_press_event, user_data);
SIGNAL_CONNECT(user_data->dlg.draw_area, "button_press_event", G_CALLBACK(button_press_event), user_data);
SIGNAL_CONNECT(user_data->dlg.draw_area, "scroll_event", G_CALLBACK(scroll_event), user_data);
SIGNAL_CONNECT(user_data->dlg.draw_area, "key_press_event", G_CALLBACK(key_press_event), user_data);
gtk_widget_show(user_data->dlg.draw_area_time);
gtk_widget_show(user_data->dlg.draw_area);
@ -1426,7 +1426,7 @@ static void create_draw_area(graph_analysis_data_t* user_data, GtkWidget *box)
user_data->dlg.hpane = gtk_hpaned_new();
gtk_paned_pack1(GTK_PANED (user_data->dlg.hpane), user_data->dlg.scroll_window, FALSE, TRUE);
gtk_paned_pack2(GTK_PANED (user_data->dlg.hpane), scroll_window_comments, TRUE, TRUE);
SIGNAL_CONNECT(user_data->dlg.hpane, "notify::position", pane_callback, user_data);
SIGNAL_CONNECT(user_data->dlg.hpane, "notify::position", G_CALLBACK(pane_callback), user_data);
gtk_widget_show(user_data->dlg.hpane);
gtk_box_pack_start(GTK_BOX(hbox), user_data->dlg.hpane, TRUE, TRUE, 0);
@ -1436,7 +1436,7 @@ static void create_draw_area(graph_analysis_data_t* user_data, GtkWidget *box)
user_data->dlg.v_scrollbar=gtk_vscrollbar_new(user_data->dlg.v_scrollbar_adjustment);
gtk_widget_show(user_data->dlg.v_scrollbar);
gtk_box_pack_end(GTK_BOX(hbox), user_data->dlg.v_scrollbar, FALSE, FALSE, 0);
SIGNAL_CONNECT(user_data->dlg.v_scrollbar_adjustment, "value_changed", v_scrollbar_changed, user_data);
SIGNAL_CONNECT(user_data->dlg.v_scrollbar_adjustment, "value_changed", G_CALLBACK(v_scrollbar_changed), user_data);
gtk_box_pack_start(GTK_BOX(box), hbox, TRUE, TRUE, 0);
@ -1483,7 +1483,7 @@ static void dialog_graph_create_window(graph_analysis_data_t* user_data)
bt_save = gtk_button_new_from_stock(GTK_STOCK_SAVE_AS);
gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_save);
gtk_widget_show(bt_save);
SIGNAL_CONNECT(bt_save, "clicked", on_save_bt_clicked, user_data);
SIGNAL_CONNECT(bt_save, "clicked", G_CALLBACK(on_save_bt_clicked), user_data);
gtk_tooltips_set_tip (tooltips, bt_save, "Save an ASCII representation of the graph to a file", NULL);
bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
@ -1493,8 +1493,8 @@ static void dialog_graph_create_window(graph_analysis_data_t* user_data)
gtk_tooltips_set_tip (tooltips, bt_close, "Close this dialog", NULL);
window_set_cancel_button(user_data->dlg.window, bt_close, window_cancel_button_cb);
SIGNAL_CONNECT(user_data->dlg.window, "delete_event", window_delete_event_cb, NULL);
SIGNAL_CONNECT(user_data->dlg.window, "destroy", on_destroy, user_data);
SIGNAL_CONNECT(user_data->dlg.window, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
SIGNAL_CONNECT(user_data->dlg.window, "destroy", G_CALLBACK(on_destroy), user_data);
gtk_widget_show(user_data->dlg.window);
window_present(user_data->dlg.window);

6
gtk/gsm_a_stat.c
View File

@ -433,7 +433,7 @@ gsm_a_stat_gtk_win_create(
gtk_clist_column_titles_show(GTK_CLIST(dlg_p->table));
gtk_container_add(GTK_CONTAINER(dlg_p->scrolled_win), dlg_p->table);
SIGNAL_CONNECT(dlg_p->table, "click-column", gsm_a_stat_gtk_click_column_cb, col_arrows);
SIGNAL_CONNECT(dlg_p->table, "click-column", G_CALLBACK(gsm_a_stat_gtk_click_column_cb), col_arrows);
/* Button row. */
bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
@ -442,8 +442,8 @@ gsm_a_stat_gtk_win_create(
bt_close = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
window_set_cancel_button(dlg_p->win, bt_close, window_cancel_button_cb);
SIGNAL_CONNECT(dlg_p->win, "delete_event", window_delete_event_cb, NULL);
SIGNAL_CONNECT(dlg_p->win, "destroy", gsm_a_stat_gtk_win_destroy_cb, dlg_p);
SIGNAL_CONNECT(dlg_p->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
SIGNAL_CONNECT(dlg_p->win, "destroy", G_CALLBACK(gsm_a_stat_gtk_win_destroy_cb), dlg_p);
gtk_widget_show_all(dlg_p->win);
window_present(dlg_p->win);

6
gtk/gsm_map_stat.c
View File

@ -383,7 +383,7 @@ gsm_map_stat_gtk_win_create(
gtk_clist_column_titles_show(GTK_CLIST(dlg_p->table));
gtk_container_add(GTK_CONTAINER(dlg_p->scrolled_win), dlg_p->table);
SIGNAL_CONNECT(dlg_p->table, "click-column", gsm_map_stat_gtk_click_column_cb, col_arrows);
SIGNAL_CONNECT(dlg_p->table, "click-column", G_CALLBACK(gsm_map_stat_gtk_click_column_cb), col_arrows);
/* Button row. */
bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
@ -392,8 +392,8 @@ gsm_map_stat_gtk_win_create(
bt_close = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
window_set_cancel_button(dlg_p->win, bt_close, window_cancel_button_cb);
SIGNAL_CONNECT(dlg_p->win, "delete_event", window_delete_event_cb, NULL);
SIGNAL_CONNECT(dlg_p->win, "destroy", gsm_map_stat_gtk_win_destroy_cb, dlg_p);
SIGNAL_CONNECT(dlg_p->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
SIGNAL_CONNECT(dlg_p->win, "destroy", G_CALLBACK(gsm_map_stat_gtk_win_destroy_cb), dlg_p);
gtk_widget_show_all(dlg_p->win);
window_present(dlg_p->win);

2
gtk/gsm_map_summary.c
View File

@ -286,7 +286,7 @@ gsm_map_stat_gtk_sum_cb(GtkWidget *w _U_, gpointer d _U_)
close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
window_set_cancel_button(sum_open_w, close_bt, window_cancel_button_cb);
SIGNAL_CONNECT(sum_open_w, "delete_event", window_delete_event_cb, NULL);
SIGNAL_CONNECT(sum_open_w, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
gtk_widget_show(sum_open_w);
window_present(sum_open_w);

8
gtk/gui_prefs.c
View File

@ -240,9 +240,9 @@ gui_prefs_show(void)
"The \"File Open\" dialog defaults always to this directory.", NULL);
g_object_set_data(G_OBJECT(main_vb), GUI_FILEOPEN_KEY, fileopen_rb);
g_object_set_data(G_OBJECT(main_vb), GUI_FILEOPEN_DIR_KEY, fileopen_dir_te);
SIGNAL_CONNECT(fileopen_rb, "clicked", fileopen_selected_cb, main_vb);
SIGNAL_CONNECT(fileopen_rb, "clicked", G_CALLBACK(fileopen_selected_cb), main_vb);
SIGNAL_CONNECT(fileopen_dir_te, "focus-out-event",
fileopen_dir_changed_cb, main_vb);
G_CALLBACK(fileopen_dir_changed_cb), main_vb);
/* File Open dialog preview timeout */
fileopen_preview_te = create_preference_entry(main_tb, pos++,
@ -252,7 +252,7 @@ gui_prefs_show(void)
gtk_tooltips_set_tip(tooltips, fileopen_preview_te,
"Reading preview data in the \"File Open\" dialog will be stopped after given seconds.", NULL);
g_object_set_data(G_OBJECT(main_vb), GUI_FILEOPEN_PREVIEW_KEY, fileopen_preview_te);
SIGNAL_CONNECT(fileopen_preview_te, "focus_out_event", fileopen_preview_changed_cb, main_vb);
SIGNAL_CONNECT(fileopen_preview_te, "focus_out_event", G_CALLBACK(fileopen_preview_changed_cb), main_vb);
/* Number of entries in the recent_files list ... */
recent_files_count_max_te = create_preference_entry(main_tb, pos++,
@ -262,7 +262,7 @@ gui_prefs_show(void)
gtk_tooltips_set_tip(tooltips, recent_files_count_max_te,
"Maximum number of entries in the \"File/Open Recent\" list.", NULL);
g_object_set_data(G_OBJECT(main_vb), GUI_RECENT_FILES_COUNT_KEY, recent_files_count_max_te);
SIGNAL_CONNECT(recent_files_count_max_te, "focus_out_event", recent_files_count_changed_cb, main_vb);
SIGNAL_CONNECT(recent_files_count_max_te, "focus_out_event", G_CALLBACK(recent_files_count_changed_cb), main_vb);
fileopen_selected_cb(NULL, main_vb);

12
gtk/gui_utils.c
View File

@ -134,7 +134,7 @@ window_new(GtkWindowType type, const gchar *title)
win = gtk_window_new(type);
if (title != NULL)
gtk_window_set_title(GTK_WINDOW(win), title);
SIGNAL_CONNECT(win, "realize", window_icon_realize_cb, NULL);
SIGNAL_CONNECT(win, "realize", G_CALLBACK(window_icon_realize_cb), NULL);
/* XXX - which one is the correct default policy? or use a preference for this? */
/* GTK_WIN_POS_NONE, GTK_WIN_POS_CENTER or GTK_WIN_POS_MOUSE */
@ -245,7 +245,7 @@ window_key_press_cb (GtkWidget *widget, GdkEventKey *event, gpointer cancel_butt
static void
window_set_cancel(GtkWidget *widget, GtkWidget *cancel_button)
{
SIGNAL_CONNECT(widget, "key_press_event", window_key_press_cb, cancel_button);
SIGNAL_CONNECT(widget, "key_press_event", G_CALLBACK(window_key_press_cb), cancel_button);
}
@ -253,7 +253,7 @@ window_set_cancel(GtkWidget *widget, GtkWidget *cancel_button)
void window_set_cancel_button(GtkWidget *win, GtkWidget *bt, window_cancel_button_fct cb)
{
if(cb)
SIGNAL_CONNECT(bt, "clicked", cb, win);
SIGNAL_CONNECT(bt, "clicked", G_CALLBACK(cb), win);
gtk_widget_grab_default(bt);
@ -791,7 +791,7 @@ setup_scrolled_window(GtkWidget *scrollw)
/* Catch the "destroy" event on the widget, so that we remove it from
the list when it's destroyed. */
SIGNAL_CONNECT(scrollw, "destroy", forget_scrolled_window, NULL);
SIGNAL_CONNECT(scrollw, "destroy", G_CALLBACK(forget_scrolled_window), NULL);
}
/* Remove a GtkScrolledWindow from the list of GtkScrolledWindows. */
@ -859,8 +859,8 @@ setup_tree(GtkWidget *tree)
/* Catch the "destroy" event on the widget, so that we remove it from
the list when it's destroyed. */
SIGNAL_CONNECT(tree, "destroy", forget_tree, NULL);
SIGNAL_CONNECT(tree, "key-press-event", tree_view_key_pressed_cb, NULL );
SIGNAL_CONNECT(tree, "destroy", G_CALLBACK(forget_tree), NULL);
SIGNAL_CONNECT(tree, "key-press-event", G_CALLBACK(tree_view_key_pressed_cb), NULL );
}
/* Remove a Tree from the list of Trees. */

4
gtk/h225_counter.c
View File

@ -550,8 +550,8 @@ gtk_h225counter_init(const char *optarg, void *userdata _U_)
close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
window_set_cancel_button(hs->win, close_bt, window_cancel_button_cb);
SIGNAL_CONNECT(hs->win, "delete_event", window_delete_event_cb, NULL);
SIGNAL_CONNECT(hs->win, "destroy", win_destroy_cb, hs);
SIGNAL_CONNECT(hs->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
SIGNAL_CONNECT(hs->win, "destroy", G_CALLBACK(win_destroy_cb), hs);
gtk_widget_show_all(hs->win);
window_present(hs->win);

4
gtk/h225_ras_srt.c
View File

@ -330,8 +330,8 @@ gtk_h225rassrt_init(const char *optarg, void *userdata _U_)
close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
window_set_cancel_button(hs->win, close_bt, window_cancel_button_cb);
SIGNAL_CONNECT(hs->win, "delete_event", window_delete_event_cb, NULL);
SIGNAL_CONNECT(hs->win, "destroy", win_destroy_cb, hs);
SIGNAL_CONNECT(hs->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
SIGNAL_CONNECT(hs->win, "destroy", G_CALLBACK(win_destroy_cb), hs);
gtk_widget_show_all(hs->win);
window_present(hs->win);

26
gtk/hostlist_table.c
View File

@ -514,7 +514,7 @@ hostlist_create_popup_menu(hostlist_table *hl)
gtk_item_factory_create_items_ac(item_factory, sizeof(hostlist_list_menu_items)/sizeof(hostlist_list_menu_items[0]), hostlist_list_menu_items, hl, 2);
hl->menu = gtk_item_factory_get_widget(item_factory, "<main>");
SIGNAL_CONNECT(hl->table, "button_press_event", hostlist_show_popup_menu_cb, hl);
SIGNAL_CONNECT(hl->table, "button_press_event", G_CALLBACK(hostlist_show_popup_menu_cb), hl);
}
@ -737,7 +737,7 @@ init_hostlist_table_page(hostlist_table *hosttable, GtkWidget *vbox, gboolean hi
gtk_clist_column_titles_show(hosttable->table);
gtk_container_add(GTK_CONTAINER(hosttable->scrolled_window), (GtkWidget *)hosttable->table);
SIGNAL_CONNECT(hosttable->table, "click-column", hostlist_click_column_cb, col_arrows);
SIGNAL_CONNECT(hosttable->table, "click-column", G_CALLBACK(hostlist_click_column_cb), col_arrows);
hosttable->num_hosts=0;
hosttable->hosts=NULL;
@ -814,15 +814,15 @@ init_hostlist_table(gboolean hide_ports, const char *table_name, const char *tap
gtk_tooltips_set_tip(tooltips, copy_bt,
"Copy all statistical values of this page to the clipboard in CSV (Comma Seperated Values) format.", NULL);
g_object_set_data(G_OBJECT(copy_bt), HOST_PTR_KEY, hosttable);
SIGNAL_CONNECT(copy_bt, "clicked", copy_as_csv_cb, NULL);
SIGNAL_CONNECT(copy_bt, "clicked", G_CALLBACK(copy_as_csv_cb), NULL);
if(topic_available(HELP_STATS_ENDPOINTS_DIALOG)) {
help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_STATS_ENDPOINTS_DIALOG);
SIGNAL_CONNECT(help_bt, "clicked", G_CALLBACK(topic_cb), HELP_STATS_ENDPOINTS_DIALOG);
}
SIGNAL_CONNECT(hosttable->win, "delete_event", window_delete_event_cb, NULL);
SIGNAL_CONNECT(hosttable->win, "destroy", hostlist_win_destroy_cb, hosttable);
SIGNAL_CONNECT(hosttable->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
SIGNAL_CONNECT(hosttable->win, "destroy", G_CALLBACK(hostlist_win_destroy_cb), hosttable);
gtk_widget_show_all(hosttable->win);
window_present(hosttable->win);
@ -1037,14 +1037,14 @@ init_hostlist_notebook_cb(GtkWidget *w _U_, gpointer d _U_)
gtk_tooltips_set_tip(tooltips, resolv_cb, "Show results of name resolutions rather than the \"raw\" values. "
"Please note: The corresponding name resolution must be enabled.", NULL);
SIGNAL_CONNECT(resolv_cb, "toggled", hostlist_resolve_toggle_dest, pages);
SIGNAL_CONNECT(resolv_cb, "toggled", G_CALLBACK(hostlist_resolve_toggle_dest), pages);
filter_cb = gtk_check_button_new_with_mnemonic("Limit to display filter");
gtk_container_add(GTK_CONTAINER(hbox), filter_cb);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(filter_cb), FALSE);
gtk_tooltips_set_tip(tooltips, filter_cb, "Limit the list to endpoints matching the current display filter.", NULL);
SIGNAL_CONNECT(filter_cb, "toggled", hostlist_filter_toggle_dest, pages);
SIGNAL_CONNECT(filter_cb, "toggled", G_CALLBACK(hostlist_filter_toggle_dest), pages);
/* Button row. */
if(topic_available(HELP_STATS_CONVERSATIONS_DIALOG)) {
@ -1061,18 +1061,18 @@ init_hostlist_notebook_cb(GtkWidget *w _U_, gpointer d _U_)
copy_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_COPY);
gtk_tooltips_set_tip(tooltips, copy_bt,
"Copy all statistical values of this page to the clipboard in CSV (Comma Separated Values) format.", NULL);
SIGNAL_CONNECT(copy_bt, "clicked", copy_as_csv_cb, NULL);
SIGNAL_CONNECT(copy_bt, "clicked", G_CALLBACK(copy_as_csv_cb), NULL);
g_object_set_data(G_OBJECT(copy_bt), HOST_PTR_KEY, pages[page]);
SIGNAL_CONNECT(nb, "switch-page", ct_nb_switch_page_cb, copy_bt);
SIGNAL_CONNECT(nb, "switch-page", G_CALLBACK(ct_nb_switch_page_cb), copy_bt);
if(topic_available(HELP_STATS_ENDPOINTS_DIALOG)) {
help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_STATS_ENDPOINTS_DIALOG);
SIGNAL_CONNECT(help_bt, "clicked", G_CALLBACK(topic_cb), HELP_STATS_ENDPOINTS_DIALOG);
}
SIGNAL_CONNECT(win, "delete_event", window_delete_event_cb, NULL);
SIGNAL_CONNECT(win, "destroy", hostlist_win_destroy_notebook_cb, pages);
SIGNAL_CONNECT(win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
SIGNAL_CONNECT(win, "destroy", G_CALLBACK(hostlist_win_destroy_notebook_cb), pages);
gtk_widget_show_all(win);
window_present(win);

44
gtk/io_stat.c
View File

@ -1375,16 +1375,16 @@ static void
create_draw_area(io_stat_t *io, GtkWidget *box)
{
io->draw_area=gtk_drawing_area_new();
SIGNAL_CONNECT(io->draw_area, "destroy", quit, io);
SIGNAL_CONNECT(io->draw_area, "destroy", G_CALLBACK(quit), io);
g_object_set_data(G_OBJECT(io->draw_area), "io_stat_t", io);
gtk_widget_set_size_request(io->draw_area, io->pixmap_width, io->pixmap_height);
/* signals needed to handle backing pixmap */
SIGNAL_CONNECT(io->draw_area, "expose_event", expose_event, NULL);
SIGNAL_CONNECT(io->draw_area, "configure_event", configure_event, io);
SIGNAL_CONNECT(io->draw_area, "expose_event", G_CALLBACK(expose_event), NULL);
SIGNAL_CONNECT(io->draw_area, "configure_event", G_CALLBACK(configure_event), io);
gtk_widget_add_events (io->draw_area, GDK_BUTTON_PRESS_MASK);
SIGNAL_CONNECT(io->draw_area, "button-press-event", pixmap_clicked_event, NULL);
SIGNAL_CONNECT(io->draw_area, "button-press-event", G_CALLBACK(pixmap_clicked_event), NULL);
gtk_widget_show(io->draw_area);
gtk_box_pack_start(GTK_BOX(box), io->draw_area, TRUE, TRUE, 0);
@ -1394,7 +1394,7 @@ create_draw_area(io_stat_t *io, GtkWidget *box)
io->scrollbar=gtk_hscrollbar_new(io->scrollbar_adjustment);
gtk_widget_show(io->scrollbar);
gtk_box_pack_start(GTK_BOX(box), io->scrollbar, FALSE, FALSE, 0);
SIGNAL_CONNECT(io->scrollbar_adjustment, "value_changed", scrollbar_changed, io);
SIGNAL_CONNECT(io->scrollbar_adjustment, "value_changed", G_CALLBACK(scrollbar_changed), io);
}
@ -1451,7 +1451,7 @@ create_pixels_per_tick_menu_items(io_stat_t *io, GtkWidget *menu)
g_object_set_data(G_OBJECT(menu_item), "pixels_per_tick",
GUINT_TO_POINTER(pixels_per_tick[i]));
SIGNAL_CONNECT(menu_item, "activate", pixels_per_tick_select, io);
SIGNAL_CONNECT(menu_item, "activate", G_CALLBACK(pixels_per_tick_select), io);
gtk_widget_show(menu_item);
gtk_menu_append(GTK_MENU(menu), menu_item);
}
@ -1496,7 +1496,7 @@ create_tick_interval_menu_items(io_stat_t *io, GtkWidget *menu)
menu_item=gtk_menu_item_new_with_label(str);
g_object_set_data(G_OBJECT(menu_item), "tick_interval",
GUINT_TO_POINTER(tick_interval_values[i]));
SIGNAL_CONNECT(menu_item, "activate", tick_interval_select, (gpointer)io);
SIGNAL_CONNECT(menu_item, "activate", G_CALLBACK(tick_interval_select), (gpointer)io);
gtk_widget_show(menu_item);
gtk_menu_append(GTK_MENU(menu), menu_item);
}
@ -1522,7 +1522,7 @@ create_yscale_max_menu_items(io_stat_t *io, GtkWidget *menu)
menu_item=gtk_menu_item_new_with_label(str);
g_object_set_data(G_OBJECT(menu_item), "yscale_max",
GUINT_TO_POINTER(yscale_max[i]));
SIGNAL_CONNECT(menu_item, "activate", yscale_select, io);
SIGNAL_CONNECT(menu_item, "activate", G_CALLBACK(yscale_select), io);
gtk_widget_show(menu_item);
gtk_menu_append(GTK_MENU(menu), menu_item);
}
@ -1577,7 +1577,7 @@ create_frames_or_bytes_menu_items(io_stat_t *io, GtkWidget *menu)
for(i=0;i<MAX_COUNT_TYPES;i++){
menu_item=gtk_menu_item_new_with_label(count_type_names[i]);
g_object_set_data(G_OBJECT(menu_item), "count_type", GINT_TO_POINTER(i));
SIGNAL_CONNECT(menu_item, "activate", count_type_select, io);
SIGNAL_CONNECT(menu_item, "activate", G_CALLBACK(count_type_select), io);
gtk_widget_show(menu_item);
gtk_menu_append(GTK_MENU(menu), menu_item);
}
@ -1648,7 +1648,7 @@ create_ctrl_area(io_stat_t *io, GtkWidget *box)
view_cb = gtk_check_button_new_with_mnemonic("_View as time of day");
gtk_container_add(GTK_CONTAINER(vbox), view_cb);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(view_cb), io->view_as_time);
SIGNAL_CONNECT(view_cb, "toggled", view_as_time_toggle_dest, io);
SIGNAL_CONNECT(view_cb, "toggled", G_CALLBACK(view_as_time_toggle_dest), io);
gtk_widget_show(view_cb);
frame = gtk_frame_new("Y Axis");
@ -1829,7 +1829,7 @@ create_calc_types_menu_items(io_stat_graph_t *gio, GtkWidget *menu)
gio->calc_types[i].gio=gio;
gio->calc_types[i].calc_type=i;
menu_item=gtk_menu_item_new_with_label(calc_type_names[i]);
SIGNAL_CONNECT(menu_item, "activate", calc_type_select, &gio->calc_types[i]);
SIGNAL_CONNECT(menu_item, "activate", G_CALLBACK(calc_type_select), &gio->calc_types[i]);
gtk_widget_show(menu_item);
gtk_menu_append(GTK_MENU(menu), menu_item);
}
@ -1869,7 +1869,7 @@ create_advanced_field(io_stat_graph_t *gio, GtkWidget *box)
gio->calc_field=gtk_entry_new_with_max_length(50);
gtk_box_pack_start(GTK_BOX(box), gio->calc_field, TRUE, TRUE, 0);
gtk_widget_show(gio->calc_field);
SIGNAL_CONNECT(gio->calc_field, "activate", filter_callback, gio);
SIGNAL_CONNECT(gio->calc_field, "activate", G_CALLBACK(filter_callback), gio);
}
@ -1920,7 +1920,7 @@ create_filter_box(io_stat_graph_t *gio, GtkWidget *box, int num)
gtk_box_pack_start(GTK_BOX(hbox), gio->display_button, FALSE, FALSE, 0);
gtk_widget_show(gio->display_button);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gio->display_button), gio->display);
SIGNAL_CONNECT(gio->display_button, "toggled", filter_callback, gio);
SIGNAL_CONNECT(gio->display_button, "toggled", G_CALLBACK(filter_callback), gio);
label=gtk_label_new("Color");
gtk_widget_show(label);
@ -1943,8 +1943,8 @@ create_filter_box(io_stat_graph_t *gio, GtkWidget *box, int num)
}
gio->args->title=g_strdup(str);
SIGNAL_CONNECT(gio->filter_bt, "clicked", filter_button_clicked, gio);
SIGNAL_CONNECT(gio->filter_bt, "destroy", filter_button_destroy_cb, NULL);
SIGNAL_CONNECT(gio->filter_bt, "clicked", G_CALLBACK(filter_button_clicked), gio);
SIGNAL_CONNECT(gio->filter_bt, "destroy", G_CALLBACK(filter_button_destroy_cb), NULL);
gtk_box_pack_start(GTK_BOX(hbox), gio->filter_bt, FALSE, TRUE, 0);
gtk_widget_show(gio->filter_bt);
@ -1957,8 +1957,8 @@ create_filter_box(io_stat_graph_t *gio, GtkWidget *box, int num)
gtk_box_pack_start(GTK_BOX(hbox), gio->filter_field, TRUE, TRUE, 0);
gtk_widget_show(gio->filter_field);
SIGNAL_CONNECT(gio->filter_field, "activate", filter_callback, gio);
SIGNAL_CONNECT(gio->filter_field, "changed", filter_te_syntax_check_cb, NULL);
SIGNAL_CONNECT(gio->filter_field, "activate", G_CALLBACK(filter_callback), gio);
SIGNAL_CONNECT(gio->filter_field, "changed", G_CALLBACK(filter_te_syntax_check_cb), NULL);
create_advanced_box(gio, hbox);
@ -1976,7 +1976,7 @@ create_filter_box(io_stat_graph_t *gio, GtkWidget *box, int num)
for(i=0;i<MAX_PLOT_STYLES;i++){
menu_item=gtk_menu_item_new_with_label(plot_style_name[i]);
g_object_set_data(G_OBJECT(menu_item), "plot_style", GINT_TO_POINTER(i));
SIGNAL_CONNECT(menu_item, "activate", plot_style_select, &gio->io->graphs[num-1]);
SIGNAL_CONNECT(menu_item, "activate", G_CALLBACK(plot_style_select), &gio->io->graphs[num-1]);
gtk_widget_show(menu_item);
gtk_menu_append(GTK_MENU(menu), menu_item);
}
@ -2111,22 +2111,22 @@ init_io_stat_window(io_stat_t *io)
save_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_SAVE);
gtk_widget_set_sensitive(save_bt, FALSE);
gtk_tooltips_set_tip(tooltips, save_bt, "Save the displayed graph to a file", NULL);
SIGNAL_CONNECT(save_bt, "clicked", pixmap_save_cb, NULL);
SIGNAL_CONNECT(save_bt, "clicked", G_CALLBACK(pixmap_save_cb), NULL);
g_object_set_data(G_OBJECT(io->window), "save_bt", save_bt);
#endif
copy_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_COPY);
gtk_tooltips_set_tip(tooltips, copy_bt,
"Copy values from selected graphs to the clipboard in CSV (Comma Seperated Values) format", NULL);
SIGNAL_CONNECT(copy_bt, "clicked", copy_as_csv_cb, io);
SIGNAL_CONNECT(copy_bt, "clicked", G_CALLBACK(copy_as_csv_cb), io);
if(topic_available(HELP_STATS_IO_GRAPH_DIALOG)) {
help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_STATS_IO_GRAPH_DIALOG);
SIGNAL_CONNECT(help_bt, "clicked", G_CALLBACK(topic_cb), HELP_STATS_IO_GRAPH_DIALOG);
gtk_tooltips_set_tip (tooltips, help_bt, "Show topic specific help", NULL);
}
SIGNAL_CONNECT(io->window, "delete_event", window_delete_event_cb, NULL);
SIGNAL_CONNECT(io->window, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
gtk_widget_show(io->window);
window_present(io->window);