diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2008-04-11 23:16:06 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2008-04-11 23:16:06 +0000 |
| commit | 8e58ec7085b8868163932996e50ecc7a5d38388e (patch) | |
| tree | 9c6f70f23701a0a94e317e5d70982e3937a630a2 | |
| parent | 22fe177634019653d3b5a38b7710b885e637163a (diff) | |
last round to replace SIGNAL_CONNECT with g_signal_connect
svn path=/trunk/; revision=24918
62 files changed, 471 insertions, 475 deletions
diff --git a/gtk/compat_macros.h b/gtk/compat_macros.h index a57327a30d..cf3a6bd3ef 100644 --- a/gtk/compat_macros.h +++ b/gtk/compat_macros.h @@ -36,10 +36,6 @@ * gtk_widget_set_size_request, ... */ -#define SIGNAL_CONNECT(widget, name, callback, arg) \ -g_signal_connect(G_OBJECT(widget), name, G_CALLBACK(callback), \ - (gpointer)(arg)) - #ifdef HAVE_LIBPCAP #define WIRESHARK_STOCK_LABEL_CAPTURE_INTERFACES "_Interfaces" #define WIRESHARK_STOCK_LABEL_CAPTURE_AIRPCAP "_Wireless" diff --git a/gtk/goto_dlg.c b/gtk/goto_dlg.c index 8c49d382ee..5e156a55af 100644 --- a/gtk/goto_dlg.c +++ b/gtk/goto_dlg.c @@ -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", G_CALLBACK(goto_frame_ok_cb), goto_frame_w); + g_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", G_CALLBACK(topic_cb), HELP_GOTO_DIALOG); + g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)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", G_CALLBACK(window_delete_event_cb), NULL); + g_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); diff --git a/gtk/graph_analysis.c b/gtk/graph_analysis.c index bc61b5bbdc..0cf11e05de 100644 --- a/gtk/graph_analysis.c +++ b/gtk/graph_analysis.c @@ -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", G_CALLBACK(save_to_file_ok_cb), user_data); + g_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", G_CALLBACK(window_delete_event_cb), NULL); - SIGNAL_CONNECT(save_to_file_w, "destroy", G_CALLBACK(save_to_file_destroy_cb), + g_signal_connect(save_to_file_w, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_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", G_CALLBACK(scroll_event), user_data); + g_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", G_CALLBACK(expose_event), NULL); - SIGNAL_CONNECT(user_data->dlg.draw_area, "configure_event", G_CALLBACK(configure_event), user_data); + g_signal_connect(user_data->dlg.draw_area, "expose_event", G_CALLBACK(expose_event), NULL); + g_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", G_CALLBACK(expose_event_comments), NULL); - SIGNAL_CONNECT(user_data->dlg.draw_area_comments, "configure_event", G_CALLBACK(configure_event_comments), user_data); + g_signal_connect(user_data->dlg.draw_area_comments, "expose_event", G_CALLBACK(expose_event_comments), NULL); + g_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", G_CALLBACK(expose_event_time), NULL); - SIGNAL_CONNECT(user_data->dlg.draw_area_time, "configure_event", G_CALLBACK(configure_event_time), user_data); + g_signal_connect(user_data->dlg.draw_area_time, "expose_event", G_CALLBACK(expose_event_time), NULL); + g_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", 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); + g_signal_connect(user_data->dlg.draw_area, "button_press_event", G_CALLBACK(button_press_event), user_data); + g_signal_connect(user_data->dlg.draw_area, "scroll_event", G_CALLBACK(scroll_event), user_data); + g_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", G_CALLBACK(pane_callback), user_data); + g_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", G_CALLBACK(v_scrollbar_changed), user_data); + g_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", G_CALLBACK(on_save_bt_clicked), user_data); + g_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", G_CALLBACK(window_delete_event_cb), NULL); - SIGNAL_CONNECT(user_data->dlg.window, "destroy", G_CALLBACK(on_destroy), user_data); + g_signal_connect(user_data->dlg.window, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_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); diff --git a/gtk/gsm_a_stat.c b/gtk/gsm_a_stat.c index 90da4968ff..ed6413c0c2 100644 --- a/gtk/gsm_a_stat.c +++ b/gtk/gsm_a_stat.c @@ -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", G_CALLBACK(gsm_a_stat_gtk_click_column_cb), col_arrows); + g_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", G_CALLBACK(window_delete_event_cb), NULL); - SIGNAL_CONNECT(dlg_p->win, "destroy", G_CALLBACK(gsm_a_stat_gtk_win_destroy_cb), dlg_p); + g_signal_connect(dlg_p->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_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); diff --git a/gtk/gsm_map_stat.c b/gtk/gsm_map_stat.c index c7adf91ec2..83d2ad3d5c 100644 --- a/gtk/gsm_map_stat.c +++ b/gtk/gsm_map_stat.c @@ -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", G_CALLBACK(gsm_map_stat_gtk_click_column_cb), col_arrows); + g_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", G_CALLBACK(window_delete_event_cb), NULL); - SIGNAL_CONNECT(dlg_p->win, "destroy", G_CALLBACK(gsm_map_stat_gtk_win_destroy_cb), dlg_p); + g_signal_connect(dlg_p->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_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); diff --git a/gtk/gsm_map_summary.c b/gtk/gsm_map_summary.c index 6e12ffe8fa..c81bbcc41e 100644 --- a/gtk/gsm_map_summary.c +++ b/gtk/gsm_map_summary.c @@ -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", G_CALLBACK(window_delete_event_cb), NULL); + g_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); diff --git a/gtk/gui_prefs.c b/gtk/gui_prefs.c index b92a8683ed..2c4f097600 100644 --- a/gtk/gui_prefs.c +++ b/gtk/gui_prefs.c @@ -240,8 +240,8 @@ 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", G_CALLBACK(fileopen_selected_cb), main_vb); - SIGNAL_CONNECT(fileopen_dir_te, "focus-out-event", + g_signal_connect(fileopen_rb, "clicked", G_CALLBACK(fileopen_selected_cb), main_vb); + g_signal_connect(fileopen_dir_te, "focus-out-event", G_CALLBACK(fileopen_dir_changed_cb), main_vb); /* File Open dialog preview timeout */ @@ -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", G_CALLBACK(fileopen_preview_changed_cb), main_vb); + g_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", G_CALLBACK(recent_files_count_changed_cb), main_vb); + g_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); diff --git a/gtk/gui_utils.c b/gtk/gui_utils.c index e3c1cf1313..006818e2c2 100644 --- a/gtk/gui_utils.c +++ b/gtk/gui_utils.c @@ -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", G_CALLBACK(window_icon_realize_cb), NULL); + g_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", G_CALLBACK(window_key_press_cb), cancel_button); + g_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", G_CALLBACK(cb), win); + g_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", G_CALLBACK(forget_scrolled_window), NULL); + g_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", G_CALLBACK(forget_tree), NULL); - SIGNAL_CONNECT(tree, "key-press-event", G_CALLBACK(tree_view_key_pressed_cb), NULL ); + g_signal_connect(tree, "destroy", G_CALLBACK(forget_tree), NULL); + g_signal_connect(tree, "key-press-event", G_CALLBACK(tree_view_key_pressed_cb), NULL ); } /* Remove a Tree from the list of Trees. */ diff --git a/gtk/h225_counter.c b/gtk/h225_counter.c index 60542ad64f..91cfe19b4b 100644 --- a/gtk/h225_counter.c +++ b/gtk/h225_counter.c @@ -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", G_CALLBACK(window_delete_event_cb), NULL); - SIGNAL_CONNECT(hs->win, "destroy", G_CALLBACK(win_destroy_cb), hs); + g_signal_connect(hs->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect(hs->win, "destroy", G_CALLBACK(win_destroy_cb), hs); gtk_widget_show_all(hs->win); window_present(hs->win); diff --git a/gtk/h225_ras_srt.c b/gtk/h225_ras_srt.c index a7e4db90bb..b5d898a4dd 100644 --- a/gtk/h225_ras_srt.c +++ b/gtk/h225_ras_srt.c @@ -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", G_CALLBACK(window_delete_event_cb), NULL); - SIGNAL_CONNECT(hs->win, "destroy", G_CALLBACK(win_destroy_cb), hs); + g_signal_connect(hs->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect(hs->win, "destroy", G_CALLBACK(win_destroy_cb), hs); gtk_widget_show_all(hs->win); window_present(hs->win); diff --git a/gtk/hostlist_table.c b/gtk/hostlist_table.c index 85494d84b5..91ffdf701b 100644 --- a/gtk/hostlist_table.c +++ b/gtk/hostlist_table.c @@ -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", G_CALLBACK(hostlist_show_popup_menu_cb), hl); + g_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", G_CALLBACK(hostlist_click_column_cb), col_arrows); + g_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", G_CALLBACK(copy_as_csv_cb), NULL); + g_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", G_CALLBACK(topic_cb), HELP_STATS_ENDPOINTS_DIALOG); + g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_STATS_ENDPOINTS_DIALOG); } - 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); + g_signal_connect(hosttable->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_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", G_CALLBACK(hostlist_resolve_toggle_dest), pages); + g_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", G_CALLBACK(hostlist_filter_toggle_dest), pages); + g_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", G_CALLBACK(copy_as_csv_cb), NULL); + g_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", G_CALLBACK(ct_nb_switch_page_cb), copy_bt); + g_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", G_CALLBACK(topic_cb), HELP_STATS_ENDPOINTS_DIALOG); + g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_STATS_ENDPOINTS_DIALOG); } - SIGNAL_CONNECT(win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); - SIGNAL_CONNECT(win, "destroy", G_CALLBACK(hostlist_win_destroy_notebook_cb), pages); + g_signal_connect(win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect(win, "destroy", G_CALLBACK(hostlist_win_destroy_notebook_cb), pages); gtk_widget_show_all(win); window_present(win); diff --git a/gtk/io_stat.c b/gtk/io_stat.c index be60fe1fc5..1dec61e410 100644 --- a/gtk/io_stat.c +++ b/gtk/io_stat.c @@ -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", G_CALLBACK(quit), io); + g_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", G_CALLBACK(expose_event), NULL); - SIGNAL_CONNECT(io->draw_area, "configure_event", G_CALLBACK(configure_event), io); + g_signal_connect(io->draw_area, "expose_event", G_CALLBACK(expose_event), NULL); + g_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", G_CALLBACK(pixmap_clicked_event), NULL); + g_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", G_CALLBACK(scrollbar_changed), io); + g_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", G_CALLBACK(pixels_per_tick_select), io); + g_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", G_CALLBACK(tick_interval_select), (gpointer)io); + g_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", G_CALLBACK(yscale_select), io); + g_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", G_CALLBACK(count_type_select), io); + g_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", G_CALLBACK(view_as_time_toggle_dest), io); + g_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", G_CALLBACK(calc_type_select), &gio->calc_types[i]); + g_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", G_CALLBACK(filter_callback), gio); + g_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", G_CALLBACK(filter_callback), gio); + g_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", G_CALLBACK(filter_button_clicked), gio); - SIGNAL_CONNECT(gio->filter_bt, "destroy", G_CALLBACK(filter_button_destroy_cb), NULL); + g_signal_connect(gio->filter_bt, "clicked", G_CALLBACK(filter_button_clicked), gio); + g_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", G_CALLBACK(filter_callback), gio); - SIGNAL_CONNECT(gio->filter_field, "changed", G_CALLBACK(filter_te_syntax_check_cb), NULL); + g_signal_connect(gio->filter_field, "activate", G_CALLBACK(filter_callback), gio); + g_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", G_CALLBACK(plot_style_select), &gio->io->graphs[num-1]); + g_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", G_CALLBACK(pixmap_save_cb), NULL); + g_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", G_CALLBACK(copy_as_csv_cb), io); + g_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", G_CALLBACK(topic_cb), HELP_STATS_IO_GRAPH_DIALOG); + g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_STATS_IO_GRAPH_DIALOG); gtk_tooltips_set_tip (tooltips, help_bt, "Show topic specific help", NULL); } - SIGNAL_CONNECT(io->window, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect(io->window, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); gtk_widget_show(io->window); window_present(io->window); diff --git a/gtk/layout_prefs.c b/gtk/layout_prefs.c index 2caffd0bee..fb9faf2b98 100644 --- a/gtk/layout_prefs.c +++ b/gtk/layout_prefs.c @@ -111,10 +111,10 @@ static GtkWidget *layout_content_radio_vbox(GtkWidget *main_vb, GtkTooltips *too g_object_set_data(G_OBJECT(radio_vb), LAYOUT_PDETAILS_RB_KEY, radio_pdetails_rb); g_object_set_data(G_OBJECT(radio_vb), LAYOUT_PBYTES_RB_KEY, radio_pbytes_rb); - SIGNAL_CONNECT(radio_none_rb, "toggled", layout_validate_cb, main_vb); - SIGNAL_CONNECT(radio_plist_rb, "toggled", layout_validate_cb, main_vb); - SIGNAL_CONNECT(radio_pdetails_rb, "toggled", layout_validate_cb, main_vb); - SIGNAL_CONNECT(radio_pbytes_rb, "toggled", layout_validate_cb, main_vb); + g_signal_connect(radio_none_rb, "toggled", G_CALLBACK(layout_validate_cb), main_vb); + g_signal_connect(radio_plist_rb, "toggled", G_CALLBACK(layout_validate_cb), main_vb); + g_signal_connect(radio_pdetails_rb, "toggled", G_CALLBACK(layout_validate_cb), main_vb); + g_signal_connect(radio_pbytes_rb, "toggled", G_CALLBACK(layout_validate_cb), main_vb); return radio_vb; } @@ -337,7 +337,7 @@ layout_prefs_show(void) gtk_container_add (GTK_CONTAINER(type_tb), xpm_to_widget(inline_txt[i])); - SIGNAL_CONNECT(type_tb, "toggled", layout_type_changed_cb, layout_type_buttons); + g_signal_connect(type_tb, "toggled", G_CALLBACK(layout_type_changed_cb), layout_type_buttons); layout_type_buttons[i] = type_tb; gtk_box_pack_start (GTK_BOX(button_hb), type_tb, TRUE, FALSE, 0); } @@ -368,7 +368,7 @@ layout_prefs_show(void) default_bt = gtk_button_new_with_label("Default panes"); gtk_tooltips_set_tip (tooltips, default_bt, "Reset the pane layout settings to default values.", NULL); - SIGNAL_CONNECT(default_bt, "clicked", layout_defaults_cb, main_vb); + g_signal_connect(default_bt, "clicked", G_CALLBACK(layout_defaults_cb), main_vb); gtk_box_pack_end(GTK_BOX(default_vb), default_bt, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(radio_hb), default_vb, FALSE, FALSE, 0); diff --git a/gtk/ldap_stat.c b/gtk/ldap_stat.c index 76206103b8..f6695950e1 100644 --- a/gtk/ldap_stat.c +++ b/gtk/ldap_stat.c @@ -228,8 +228,8 @@ gtk_ldapstat_init(const char *optarg, void *userdata _U_) close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE); window_set_cancel_button(ldap->win, close_bt, window_cancel_button_cb); - SIGNAL_CONNECT(ldap->win, "delete_event", window_delete_event_cb, NULL); - SIGNAL_CONNECT(ldap->win, "destroy", win_destroy_cb, ldap); + g_signal_connect(ldap->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect(ldap->win, "destroy", G_CALLBACK(win_destroy_cb), ldap); gtk_widget_show_all(ldap->win); window_present(ldap->win); diff --git a/gtk/main.c b/gtk/main.c index b44b37d6e1..28e0712f00 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -3940,12 +3940,12 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs) #endif gtk_widget_set_name(top_level, "main window"); - SIGNAL_CONNECT(top_level, "delete_event", main_window_delete_event_cb, + g_signal_connect(top_level, "delete_event", G_CALLBACK(main_window_delete_event_cb), NULL); - SIGNAL_CONNECT(GTK_OBJECT(top_level), "window_state_event", - G_CALLBACK (window_state_event_cb), NULL); - SIGNAL_CONNECT(GTK_OBJECT(top_level), "key-press-event", - G_CALLBACK (top_level_key_pressed_cb), NULL ); + g_signal_connect(GTK_OBJECT(top_level), "window_state_event", + G_CALLBACK(window_state_event_cb), NULL); + g_signal_connect(GTK_OBJECT(top_level), "key-press-event", + G_CALLBACK(top_level_key_pressed_cb), NULL ); gtk_window_set_policy(GTK_WINDOW(top_level), TRUE, TRUE, FALSE); @@ -3974,9 +3974,9 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs) gtk_widget_set_size_request(tv_scrollw, -1, tv_size); gtk_widget_show(tv_scrollw); - SIGNAL_CONNECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view)), - "changed", tree_view_selection_changed_cb, NULL); - SIGNAL_CONNECT(tree_view, "button_press_event", popup_menu_handler, + g_signal_connect(gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view)), + "changed", G_CALLBACK(tree_view_selection_changed_cb), NULL); + g_signal_connect(tree_view, "button_press_event", G_CALLBACK(popup_menu_handler), g_object_get_data(G_OBJECT(popup_menu_object), PM_TREE_VIEW_KEY)); gtk_widget_show(tree_view); @@ -3985,7 +3985,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs) gtk_widget_set_size_request(byte_nb_ptr, -1, bv_size); gtk_widget_show(byte_nb_ptr); - SIGNAL_CONNECT(byte_nb_ptr, "button_press_event", popup_menu_handler, + g_signal_connect(byte_nb_ptr, "button_press_event", G_CALLBACK(popup_menu_handler), g_object_get_data(G_OBJECT(popup_menu_object), PM_HEXDUMP_KEY)); @@ -4100,9 +4100,9 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs) gtk_toolbar_append_space(GTK_TOOLBAR(airpcap_tb)); /* callback for channel combo box */ - SIGNAL_CONNECT(GTK_COMBO(channel_cm)->entry,"changed", airpcap_toolbar_channel_changed_cb, channel_offset_cb); + g_signal_connect(GTK_COMBO(channel_cm)->entry,"changed", G_CALLBACK(airpcap_toolbar_channel_changed_cb), channel_offset_cb); /* callback for channel offset combo box */ - SIGNAL_CONNECT(GTK_COMBO(channel_offset_cb)->entry,"changed", on_channel_offset_cb_changed, channel_offset_cb); + g_signal_connect(GTK_COMBO(channel_offset_cb)->entry,"changed", G_CALLBACK(on_channel_offset_cb_changed), channel_offset_cb); /* End: Channel offset combo box */ /* Wrong CRC Label */ @@ -4136,7 +4136,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs) else gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(wrong_crc_cm)->entry),""); - SIGNAL_CONNECT(GTK_COMBO(wrong_crc_cm)->entry,"changed",airpcap_toolbar_wrong_crc_combo_cb,airpcap_tb); + g_signal_connect(GTK_COMBO(wrong_crc_cm)->entry,"changed",G_CALLBACK(airpcap_toolbar_wrong_crc_combo_cb),airpcap_tb); gtk_widget_show(wrong_crc_cm); gtk_toolbar_append_space(GTK_TOOLBAR(airpcap_tb)); @@ -4166,7 +4166,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs) /* Set current decryption mode!!!! */ update_decryption_mode_cm(enable_decryption_cb); - SIGNAL_CONNECT (enable_decryption_en, "changed",on_enable_decryption_en_changed, airpcap_tb); + g_signal_connect(enable_decryption_en, "changed", G_CALLBACK(on_enable_decryption_en_changed), airpcap_tb); g_object_set_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_DECRYPTION_KEY,enable_decryption_cb); gtk_toolbar_append_space(GTK_TOOLBAR(airpcap_tb)); @@ -4175,7 +4175,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs) advanced_bt = gtk_button_new_with_label("Wireless Settings..."); g_object_set_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_ADVANCED_KEY,advanced_bt); - SIGNAL_CONNECT(advanced_bt, "clicked", toolbar_display_airpcap_advanced_cb, airpcap_tb); + g_signal_connect(advanced_bt, "clicked", G_CALLBACK(toolbar_display_airpcap_advanced_cb), airpcap_tb); gtk_toolbar_append_widget(GTK_TOOLBAR(airpcap_tb), advanced_bt, "Set Advanced Wireless Settings", "Private"); @@ -4186,7 +4186,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs) key_management_bt = gtk_button_new_with_label("Decryption Keys..."); g_object_set_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_KEY_MANAGEMENT_KEY,key_management_bt); - SIGNAL_CONNECT(key_management_bt, "clicked", toolbar_display_airpcap_key_management_cb, airpcap_tb); + g_signal_connect(key_management_bt, "clicked", G_CALLBACK(toolbar_display_airpcap_key_management_cb), airpcap_tb); gtk_toolbar_append_widget(GTK_TOOLBAR(airpcap_tb), key_management_bt, "Manage Decryption Keys", "Private"); gtk_widget_show(key_management_bt); @@ -4217,7 +4217,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs) /* Create the "Filter:" button */ filter_bt = gtk_button_new_from_stock(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY); - SIGNAL_CONNECT(filter_bt, "clicked", display_filter_construct_cb, &args); + g_signal_connect(filter_bt, "clicked", G_CALLBACK(display_filter_construct_cb), &args); gtk_widget_show(filter_bt); g_object_set_data(G_OBJECT(top_level), E_FILT_BT_PTR_KEY, filter_bt); @@ -4235,8 +4235,8 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs) g_object_set_data(G_OBJECT(filter_bt), E_FILT_TE_PTR_KEY, filter_te); g_object_set_data(G_OBJECT(filter_te), E_DFILTER_CM_KEY, filter_cm); g_object_set_data(G_OBJECT(top_level), E_DFILTER_CM_KEY, filter_cm); - SIGNAL_CONNECT(filter_te, "activate", filter_activate_cb, filter_te); - SIGNAL_CONNECT(filter_te, "changed", filter_te_syntax_check_cb, NULL); + g_signal_connect(filter_te, "activate", G_CALLBACK(filter_activate_cb), filter_te); + g_signal_connect(filter_te, "changed", G_CALLBACK(filter_te_syntax_check_cb), NULL); gtk_widget_set_size_request(filter_cm, 400, -1); gtk_widget_show(filter_cm); gtk_toolbar_append_widget(GTK_TOOLBAR(filter_tb), filter_cm, @@ -4251,7 +4251,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs) for constructing filter comparison expressions. */ filter_add_expr_bt = gtk_button_new_from_stock(WIRESHARK_STOCK_ADD_EXPRESSION); g_object_set_data(G_OBJECT(filter_tb), E_FILT_FILTER_TE_KEY, filter_te); - SIGNAL_CONNECT(filter_add_expr_bt, "clicked", filter_add_expr_bt_cb, filter_tb); + g_signal_connect(filter_add_expr_bt, "clicked", G_CALLBACK(filter_add_expr_bt_cb), filter_tb); gtk_widget_show(filter_add_expr_bt); gtk_toolbar_append_widget(GTK_TOOLBAR(filter_tb), filter_add_expr_bt, "Add an expression to this filter string", "Private"); @@ -4259,7 +4259,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs) /* Create the "Clear" button */ filter_reset = gtk_button_new_from_stock(GTK_STOCK_CLEAR); g_object_set_data(G_OBJECT(filter_reset), E_DFILTER_TE_KEY, filter_te); - SIGNAL_CONNECT(filter_reset, "clicked", filter_reset_cb, NULL); + g_signal_connect(filter_reset, "clicked", G_CALLBACK(filter_reset_cb), NULL); gtk_widget_show(filter_reset); gtk_toolbar_append_widget(GTK_TOOLBAR(filter_tb), filter_reset, "Clear this filter string and update the display", "Private"); @@ -4267,7 +4267,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs) /* Create the "Apply" button */ filter_apply = gtk_button_new_from_stock(GTK_STOCK_APPLY); g_object_set_data(G_OBJECT(filter_apply), E_DFILTER_CM_KEY, filter_cm); - SIGNAL_CONNECT(filter_apply, "clicked", filter_activate_cb, filter_te); + g_signal_connect(filter_apply, "clicked", G_CALLBACK(filter_activate_cb), filter_te); gtk_widget_show(filter_apply); gtk_toolbar_append_widget(GTK_TOOLBAR(filter_tb), filter_apply, "Apply this filter string to the display", "Private"); @@ -4330,35 +4330,35 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs) gtk_widget_show(expert_image); expert_info_error = gtk_event_box_new(); gtk_container_add(GTK_CONTAINER(expert_info_error), expert_image); - SIGNAL_CONNECT(expert_info_error, "button_press_event", expert_comp_dlg_cb, NULL); + g_signal_connect(expert_info_error, "button_press_event", G_CALLBACK(expert_comp_dlg_cb), NULL); expert_image = xpm_to_widget_from_parent(top_level, expert_warn_xpm); gtk_tooltips_set_tip(tooltips, expert_image, "WARNING is the highest expert info level", NULL); gtk_widget_show(expert_image); expert_info_warn = gtk_event_box_new(); gtk_container_add(GTK_CONTAINER(expert_info_warn), expert_image); - SIGNAL_CONNECT(expert_info_warn, "button_press_event", expert_comp_dlg_cb, NULL); + g_signal_connect(expert_info_warn, "button_press_event", G_CALLBACK(expert_comp_dlg_cb), NULL); expert_image = xpm_to_widget_from_parent(top_level, expert_note_xpm); gtk_tooltips_set_tip(tooltips, expert_image, "NOTE is the highest expert info level", NULL); gtk_widget_show(expert_image); expert_info_note = gtk_event_box_new(); gtk_container_add(GTK_CONTAINER(expert_info_note), expert_image); - SIGNAL_CONNECT(expert_info_note, "button_press_event", expert_comp_dlg_cb, NULL); + g_signal_connect(expert_info_note, "button_press_event", G_CALLBACK(expert_comp_dlg_cb), NULL); expert_image = xpm_to_widget_from_parent(top_level, expert_chat_xpm); gtk_tooltips_set_tip(tooltips, expert_image, "CHAT is the highest expert info level", NULL); gtk_widget_show(expert_image); expert_info_chat = gtk_event_box_new(); gtk_container_add(GTK_CONTAINER(expert_info_chat), expert_image); - SIGNAL_CONNECT(expert_info_chat, "button_press_event", expert_comp_dlg_cb, NULL); + g_signal_connect(expert_info_chat, "button_press_event", G_CALLBACK(expert_comp_dlg_cb), NULL); expert_image = xpm_to_widget_from_parent(top_level, expert_none_xpm); gtk_tooltips_set_tip(tooltips, expert_image, "No expert info", NULL); gtk_widget_show(expert_image); expert_info_none = gtk_event_box_new(); gtk_container_add(GTK_CONTAINER(expert_info_none), expert_image); - SIGNAL_CONNECT(expert_info_none, "button_press_event", expert_comp_dlg_cb, NULL); + g_signal_connect(expert_info_none, "button_press_event", G_CALLBACK(expert_comp_dlg_cb), NULL); gtk_widget_show(expert_info_none); diff --git a/gtk/main_welcome.c b/gtk/main_welcome.c index 36a80f946b..95ca019027 100644 --- a/gtk/main_welcome.c +++ b/gtk/main_welcome.c @@ -56,7 +56,7 @@ welcome_item(const gchar *stock_item, const gchar * label, const gchar * message gtk_button_set_label(GTK_BUTTON(w), label); gtk_tooltips_set_tip(tooltips, w, tooltip, NULL); gtk_box_pack_start(GTK_BOX(item_hb), w, FALSE, FALSE, 0); - SIGNAL_CONNECT(w, "clicked", callback, callback_data); + g_signal_connect(w, "clicked", G_CALLBACK(callback), callback_data); w = gtk_label_new(message); gtk_misc_set_alignment (GTK_MISC(w), 0.0, 0.5); @@ -231,9 +231,9 @@ welcome_link_new(const gchar *text, GtkWidget **label /*, void *callback, void * eb = gtk_event_box_new(); gtk_container_add(GTK_CONTAINER(eb), w); - SIGNAL_CONNECT(eb, "enter-notify-event", welcome_link_enter_cb, w); - SIGNAL_CONNECT(eb, "leave-notify-event", welcome_link_leave_cb, w); - SIGNAL_CONNECT(eb, "button-press-event", welcome_link_press_cb, w); + g_signal_connect(eb, "enter-notify-event", G_CALLBACK(welcome_link_enter_cb), w); + g_signal_connect(eb, "leave-notify-event", G_CALLBACK(welcome_link_leave_cb), w); + g_signal_connect(eb, "button-press-event", G_CALLBACK(welcome_link_press_cb), w); /* XXX - memleak */ g_object_set_data(G_OBJECT(w), "TEXT", g_strdup(text)); diff --git a/gtk/mcast_stream_dlg.c b/gtk/mcast_stream_dlg.c index 245066cdc1..e0c33b13d6 100644 --- a/gtk/mcast_stream_dlg.c +++ b/gtk/mcast_stream_dlg.c @@ -464,9 +464,9 @@ mcast_on_params (GtkButton *button _U_, gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_END); gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbuttonbox), 0); - SIGNAL_CONNECT(mcast_params_dlg, "delete_event", window_delete_event_cb, NULL); - SIGNAL_CONNECT(mcast_params_dlg, "destroy", mcast_params_destroy_cb, NULL); - SIGNAL_CONNECT(ok_bt, "clicked", mcast_params_ok_cb, mcast_params_dlg); + g_signal_connect(mcast_params_dlg, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect(mcast_params_dlg, "destroy", G_CALLBACK(mcast_params_destroy_cb), NULL); + g_signal_connect(ok_bt, "clicked", G_CALLBACK(mcast_params_ok_cb), mcast_params_dlg); window_set_cancel_button(mcast_params_dlg, cancel_bt, window_cancel_button_cb); /* Attach pointers to needed widgets */ @@ -570,7 +570,7 @@ static void mcaststream_dlg_create (void) gtk_widget_show(col_arrows[i].table); } - SIGNAL_CONNECT(clist, "click-column", mcaststream_click_column_cb, col_arrows); + g_signal_connect(clist, "click-column", G_CALLBACK(mcaststream_click_column_cb), col_arrows); label_fwd = gtk_label_new (FWD_LABEL_TEXT); /*gtk_box_pack_start (GTK_BOX (main_vb), label_fwd, FALSE, FALSE, 0);*/ @@ -601,14 +601,14 @@ static void mcaststream_dlg_create (void) gtk_tooltips_set_tip (tooltips, bt_close, "Close this dialog", NULL); GTK_WIDGET_SET_FLAGS(bt_close, GTK_CAN_DEFAULT); - SIGNAL_CONNECT(clist, "select_row", mcaststream_on_select_row, NULL); - /*SIGNAL_CONNECT(bt_unselect, "clicked", mcaststream_on_unselect, NULL);*/ - SIGNAL_CONNECT(bt_params, "clicked", mcast_on_params, NULL); - SIGNAL_CONNECT(bt_filter, "clicked", mcaststream_on_filter, NULL); + g_signal_connect(clist, "select_row", G_CALLBACK(mcaststream_on_select_row), NULL); + /*g_signal_connect(bt_unselect, "clicked", G_CALLBACK(mcaststream_on_unselect), NULL);*/ + g_signal_connect(bt_params, "clicked", G_CALLBACK(mcast_on_params), NULL); + g_signal_connect(bt_filter, "clicked", G_CALLBACK(mcaststream_on_filter), NULL); window_set_cancel_button(mcaststream_dlg_w, bt_close, window_cancel_button_cb); - SIGNAL_CONNECT(mcaststream_dlg_w, "delete_event", window_delete_event_cb, NULL); - SIGNAL_CONNECT(mcaststream_dlg_w, "destroy", mcaststream_on_destroy, NULL); + g_signal_connect(mcaststream_dlg_w, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect(mcaststream_dlg_w, "destroy", G_CALLBACK(mcaststream_on_destroy), NULL); gtk_widget_show_all(mcaststream_dlg_w); window_present(mcaststream_dlg_w); diff --git a/gtk/mgcp_stat.c b/gtk/mgcp_stat.c index 6a8343dcc4..af7f33164e 100644 --- a/gtk/mgcp_stat.c +++ b/gtk/mgcp_stat.c @@ -294,8 +294,8 @@ gtk_mgcpstat_init(const char *optarg, void *userdata _U_) bt_close = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE); window_set_cancel_button(ms->win, bt_close, window_cancel_button_cb); - SIGNAL_CONNECT(ms->win, "delete_event", window_delete_event_cb, NULL); - SIGNAL_CONNECT(ms->win, "destroy", win_destroy_cb, ms); + g_signal_connect(ms->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect(ms->win, "destroy", G_CALLBACK(win_destroy_cb), ms); gtk_widget_show_all(ms->win); window_present(ms->win); diff --git a/gtk/mtp3_stat.c b/gtk/mtp3_stat.c index 54ace59f89..0f1295acc0 100644 --- a/gtk/mtp3_stat.c +++ b/gtk/mtp3_stat.c @@ -394,7 +394,7 @@ mtp3_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", mtp3_stat_gtk_click_column_cb, col_arrows); + g_signal_connect(dlg_p->table, "click-column", G_CALLBACK(mtp3_stat_gtk_click_column_cb), col_arrows); /* Button row. */ bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL); @@ -403,8 +403,8 @@ mtp3_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", mtp3_stat_gtk_win_destroy_cb, dlg_p); + g_signal_connect(dlg_p->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect(dlg_p->win, "destroy", G_CALLBACK(mtp3_stat_gtk_win_destroy_cb), dlg_p); gtk_widget_show_all(dlg_p->win); window_present(dlg_p->win); diff --git a/gtk/mtp3_summary.c b/gtk/mtp3_summary.c index c0bb9f812c..336bbe736c 100644 --- a/gtk/mtp3_summary.c +++ b/gtk/mtp3_summary.c @@ -374,7 +374,7 @@ mtp3_sum_gtk_sum_cb(GtkWidget *w _U_, gpointer d _U_) gtk_clist_set_shadow_type(GTK_CLIST(table), GTK_SHADOW_IN); gtk_clist_column_titles_show(GTK_CLIST(table)); - SIGNAL_CONNECT(table, "click-column", mtp3_sum_gtk_click_column_cb, col_arrows); + g_signal_connect(table, "click-column", G_CALLBACK(mtp3_sum_gtk_click_column_cb), col_arrows); mtp3_sum_draw(table, seconds, &tot_num_msus, &tot_num_bytes); @@ -425,7 +425,7 @@ mtp3_sum_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); + g_signal_connect(sum_open_w, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); gtk_widget_show_all(sum_open_w); window_present(sum_open_w); diff --git a/gtk/ncp_stat.c b/gtk/ncp_stat.c index 361aa1f79c..cc75fa1bb3 100644 --- a/gtk/ncp_stat.c +++ b/gtk/ncp_stat.c @@ -711,8 +711,8 @@ gtk_ncpstat_init(const char *optarg, void *userdata _U_) close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE); window_set_cancel_button(ss->win, close_bt, window_cancel_button_cb); - SIGNAL_CONNECT(ss->win, "delete_event", window_delete_event_cb, NULL); - SIGNAL_CONNECT(ss->win, "destroy", win_destroy_cb, ss); + g_signal_connect(ss->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect(ss->win, "destroy", G_CALLBACK(win_destroy_cb), ss); gtk_widget_show_all(ss->win); window_present(ss->win); diff --git a/gtk/packet_list.c b/gtk/packet_list.c index b01b34e391..8d0e2ffab6 100644 --- a/gtk/packet_list.c +++ b/gtk/packet_list.c @@ -488,8 +488,8 @@ packet_list_new(e_prefs *prefs) packet_list_set_sel_browse(prefs->gui_plist_sel_browse, FALSE); packet_list_set_font(user_font_get_regular()); gtk_widget_set_name(packet_list, "packet list"); - SIGNAL_CONNECT(packet_list, "select-row", packet_list_select_cb, NULL); - SIGNAL_CONNECT(packet_list, "unselect-row", packet_list_unselect_cb, NULL); + g_signal_connect(packet_list, "select-row", G_CALLBACK(packet_list_select_cb), NULL); + g_signal_connect(packet_list, "unselect-row", G_CALLBACK(packet_list_unselect_cb), NULL); for (i = 0; i < cfile.cinfo.num_cols; i++) { /* For performance reasons, columns do not automatically resize, but are resizeable by the user. */ @@ -518,10 +518,10 @@ packet_list_new(e_prefs *prefs) gtk_clist_set_column_justification(GTK_CLIST(packet_list), i, GTK_JUSTIFY_RIGHT); } - SIGNAL_CONNECT(packet_list, "button_press_event", popup_menu_handler, + g_signal_connect(packet_list, "button_press_event", G_CALLBACK(popup_menu_handler), g_object_get_data(G_OBJECT(popup_menu_object), PM_PACKET_LIST_KEY)); - SIGNAL_CONNECT(packet_list, "button_press_event", - packet_list_button_pressed_cb, NULL); + g_signal_connect(packet_list, "button_press_event", + G_CALLBACK(packet_list_button_pressed_cb), NULL); gtk_clist_set_compare_func(GTK_CLIST(packet_list), packet_list_compare); gtk_widget_show(packet_list); @@ -591,7 +591,7 @@ packet_list_set_column_titles(void) gtk_widget_show(col_arrows[i].table); } gtk_clist_column_titles_show(GTK_CLIST(packet_list)); - SIGNAL_CONNECT(packet_list, "click-column", packet_list_click_column_cb, + g_signal_connect(packet_list, "click-column", G_CALLBACK(packet_list_click_column_cb), col_arrows); } diff --git a/gtk/packet_win.c b/gtk/packet_win.c index 964095b7e6..ef4fcdba7c 100644 --- a/gtk/packet_win.c +++ b/gtk/packet_win.c @@ -161,10 +161,10 @@ void new_window_cb(GtkWidget *w _U_) detail_windows = g_list_append(detail_windows, DataPtr); /* load callback handlers */ - SIGNAL_CONNECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view)), - "changed", new_tree_view_selection_changed_cb, DataPtr); + g_signal_connect(gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view)), + "changed", G_CALLBACK(new_tree_view_selection_changed_cb), DataPtr); - SIGNAL_CONNECT(main_w, "destroy", destroy_new_window, DataPtr); + g_signal_connect(main_w, "destroy", G_CALLBACK(destroy_new_window), DataPtr); /* draw the protocol tree & print hex data */ add_byte_views(DataPtr->edt, tree_view, DataPtr->bv_nb_ptr); diff --git a/gtk/pixmap_save.c b/gtk/pixmap_save.c index 5cf6b867fe..08a0ff532d 100644 --- a/gtk/pixmap_save.c +++ b/gtk/pixmap_save.c @@ -155,7 +155,7 @@ pixmap_save_cb(GtkWidget *w, gpointer pixmap_ptr _U_) g_object_set_data(G_OBJECT(save_as_w), "type_cm", type_cm); gtk_widget_show(type_cm); - SIGNAL_CONNECT(save_as_w, "destroy", pixbuf_save_destroy_cb, NULL); + g_signal_connect(save_as_w, "destroy", G_CALLBACK(pixbuf_save_destroy_cb), NULL); gtk_widget_show(save_as_w); window_present(save_as_w); diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c index 6ae6087d89..d0559ac67e 100644 --- a/gtk/prefs_dlg.c +++ b/gtk/prefs_dlg.c @@ -482,7 +482,7 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_) col_offset - 1); gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column), GTK_TREE_VIEW_COLUMN_AUTOSIZE); - SIGNAL_CONNECT(selection, "changed", prefs_tree_select_cb, NULL); + g_signal_connect(selection, "changed", G_CALLBACK(prefs_tree_select_cb), NULL); gtk_container_add(GTK_CONTAINER(ct_sb), cts.tree); gtk_widget_show(cts.tree); @@ -607,28 +607,28 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_) gtk_widget_show(bbox); ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK); - SIGNAL_CONNECT(ok_bt, "clicked", prefs_main_ok_cb, prefs_w); + g_signal_connect(ok_bt, "clicked", G_CALLBACK(prefs_main_ok_cb), prefs_w); apply_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_APPLY); - SIGNAL_CONNECT(apply_bt, "clicked", prefs_main_apply_cb, prefs_w); + g_signal_connect(apply_bt, "clicked", G_CALLBACK(prefs_main_apply_cb), prefs_w); save_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_SAVE); - SIGNAL_CONNECT(save_bt, "clicked", prefs_main_save_cb, prefs_w); + g_signal_connect(save_bt, "clicked", G_CALLBACK(prefs_main_save_cb), prefs_w); g_object_set_data(G_OBJECT(prefs_w), E_PREFSW_SAVE_BT_KEY, save_bt); cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL); - SIGNAL_CONNECT(cancel_bt, "clicked", prefs_main_cancel_cb, prefs_w); + g_signal_connect(cancel_bt, "clicked", G_CALLBACK(prefs_main_cancel_cb), prefs_w); window_set_cancel_button(prefs_w, cancel_bt, NULL); gtk_widget_grab_default(ok_bt); if(topic_available(HELP_PREFERENCES_DIALOG)) { help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); - SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_PREFERENCES_DIALOG); + g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_PREFERENCES_DIALOG); } - SIGNAL_CONNECT(prefs_w, "delete_event", prefs_main_delete_event_cb, prefs_w); - SIGNAL_CONNECT(prefs_w, "destroy", prefs_main_destroy_cb, prefs_w); + g_signal_connect(prefs_w, "delete_event", G_CALLBACK(prefs_main_delete_event_cb), prefs_w); + g_signal_connect(prefs_w, "destroy", G_CALLBACK(prefs_main_destroy_cb), prefs_w); gtk_widget_show(prefs_w); @@ -909,7 +909,7 @@ create_preference_uat(GtkWidget *main_tb, int table_position, button = gtk_button_new_from_stock(WIRESHARK_STOCK_EDIT); - SIGNAL_CONNECT(button, "clicked", uat_window_cb, uat); + g_signal_connect(button, "clicked", G_CALLBACK(uat_window_cb), uat); gtk_table_attach_defaults(GTK_TABLE(main_tb), button, 1, 2, table_position, table_position+1); diff --git a/gtk/print_dlg.c b/gtk/print_dlg.c index 51386eac5e..85363ffb7d 100644 --- a/gtk/print_dlg.c +++ b/gtk/print_dlg.c @@ -156,7 +156,7 @@ file_print_cmd(gboolean print_selected) } print_win = open_print_dialog("Wireshark: Print", output_action_print, args); - SIGNAL_CONNECT(print_win, "destroy", print_destroy_cb, &print_win); + g_signal_connect(print_win, "destroy", G_CALLBACK(print_destroy_cb), &print_win); } void @@ -216,7 +216,7 @@ export_text_cmd_cb(GtkWidget *widget _U_, gpointer data _U_) packet_range_init(&args->range); export_text_win = open_print_dialog("Wireshark: Export as \"Plain Text\" File", output_action_export_text, args); - SIGNAL_CONNECT(export_text_win, "destroy", print_destroy_cb, &export_text_win); + g_signal_connect(export_text_win, "destroy", G_CALLBACK(print_destroy_cb), &export_text_win); } @@ -265,7 +265,7 @@ export_ps_cmd_cb(GtkWidget *widget _U_, gpointer data _U_) packet_range_init(&args->range); export_ps_win = open_print_dialog("Wireshark: Export as \"PostScript\" file", output_action_export_ps, args); - SIGNAL_CONNECT(export_ps_win, "destroy", print_destroy_cb, &export_ps_win); + g_signal_connect(export_ps_win, "destroy", G_CALLBACK(print_destroy_cb), &export_ps_win); } @@ -314,7 +314,7 @@ export_psml_cmd_cb(GtkWidget *widget _U_, gpointer data _U_) packet_range_init(&args->range); export_psml_win = open_print_dialog("Wireshark: Export as \"PSML\" file", output_action_export_psml, args); - SIGNAL_CONNECT(export_psml_win, "destroy", print_destroy_cb, &export_psml_win); + g_signal_connect(export_psml_win, "destroy", G_CALLBACK(print_destroy_cb), &export_psml_win); } @@ -363,7 +363,7 @@ export_pdml_cmd_cb(GtkWidget *widget _U_, gpointer data _U_) packet_range_init(&args->range); export_pdml_win = open_print_dialog("Wireshark: Export as \"PDML\" file", output_action_export_pdml, args); - SIGNAL_CONNECT(export_pdml_win, "destroy", print_destroy_cb, &export_pdml_win); + g_signal_connect(export_pdml_win, "destroy", G_CALLBACK(print_destroy_cb), &export_pdml_win); } /* @@ -410,7 +410,7 @@ export_csv_cmd_cb(GtkWidget *widget _U_, gpointer data _U_) packet_range_init(&args->range); export_csv_win = open_print_dialog("Wireshark: Export as \"Comma Separated Values\" File", output_action_export_csv, args); - SIGNAL_CONNECT(export_csv_win, "destroy", print_destroy_cb, &export_csv_win); + g_signal_connect(export_csv_win, "destroy", G_CALLBACK(print_destroy_cb), &export_csv_win); } /* @@ -458,7 +458,7 @@ export_carrays_cmd_cb(GtkWidget *widget _U_, gpointer data _U_) export_carrays_win = open_print_dialog("Wireshark: Export as \"C Arrays\" File", output_action_export_carrays, args); - SIGNAL_CONNECT(export_carrays_win, "destroy", print_destroy_cb, &export_carrays_win); + g_signal_connect(export_carrays_win, "destroy", G_CALLBACK(print_destroy_cb), &export_carrays_win); } static void @@ -644,8 +644,8 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args) gtk_widget_show(cmd_te); #endif - SIGNAL_CONNECT(dest_cb, "toggled", print_cmd_toggle_dest, NULL); - SIGNAL_CONNECT(file_bt, "clicked", print_browse_file_cb, file_te); + g_signal_connect(dest_cb, "toggled", G_CALLBACK(print_cmd_toggle_dest), NULL); + g_signal_connect(file_bt, "clicked", G_CALLBACK(print_browse_file_cb), file_te); if(action == output_action_export_ps) { export_format_lb = gtk_label_new("(PostScript files can be easily converted to PDF files using ghostscript's ps2pdf)"); @@ -686,7 +686,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args) /* "Print summary line" check button */ summary_cb = gtk_check_button_new_with_mnemonic("Packet summary line"); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(summary_cb), args->print_summary); - SIGNAL_CONNECT(summary_cb, "clicked", print_cmd_toggle_detail, main_win); + g_signal_connect(summary_cb, "clicked", G_CALLBACK(print_cmd_toggle_detail), main_win); gtk_tooltips_set_tip (tooltips, summary_cb, "Output of a packet summary line, like in the packet list", NULL); gtk_container_add(GTK_CONTAINER(format_vb), summary_cb); gtk_widget_show(summary_cb); @@ -695,7 +695,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args) /* "Details" check button */ details_cb = gtk_check_button_new_with_mnemonic("Packet details:"); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(details_cb), args->print_dissections != print_dissections_none); - SIGNAL_CONNECT(details_cb, "clicked", print_cmd_toggle_detail, main_win); + g_signal_connect(details_cb, "clicked", G_CALLBACK(print_cmd_toggle_detail), main_win); gtk_tooltips_set_tip (tooltips, details_cb, "Output format of the selected packet details (protocol tree).", NULL); gtk_container_add(GTK_CONTAINER(format_vb), details_cb); gtk_widget_show(details_cb); @@ -738,7 +738,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args) /* "Print hex" check button. */ hex_cb = gtk_check_button_new_with_mnemonic("Packet bytes"); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(hex_cb), args->print_hex); - SIGNAL_CONNECT(hex_cb, "clicked", print_cmd_toggle_detail, main_win); + g_signal_connect(hex_cb, "clicked", G_CALLBACK(print_cmd_toggle_detail), main_win); gtk_tooltips_set_tip (tooltips, hex_cb, "Add a hexdump of the packet data", NULL); gtk_container_add(GTK_CONTAINER(format_vb), hex_cb); gtk_widget_show(hex_cb); @@ -800,7 +800,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args) g_object_set_data(G_OBJECT(ok_bt), PRINT_EXPAND_ALL_RB_KEY, expand_all_rb); g_object_set_data(G_OBJECT(ok_bt), PRINT_HEX_CB_KEY, hex_cb); g_object_set_data(G_OBJECT(ok_bt), PRINT_FORMFEED_CB_KEY, formfeed_cb); - SIGNAL_CONNECT(ok_bt, "clicked", print_ok_cb, main_win); + g_signal_connect(ok_bt, "clicked", G_CALLBACK(print_ok_cb), main_win); gtk_tooltips_set_tip (tooltips, ok_bt, "Start output", NULL); cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL); @@ -810,18 +810,18 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args) if(action == output_action_print) { if(topic_available(HELP_PRINT_DIALOG)) { help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); - SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_PRINT_DIALOG); + g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_PRINT_DIALOG); } } else { #if _WIN32 if(topic_available(HELP_EXPORT_FILE_WIN32_DIALOG)) { help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); - SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_EXPORT_FILE_WIN32_DIALOG); + g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_EXPORT_FILE_WIN32_DIALOG); } #else if(topic_available(HELP_EXPORT_FILE_DIALOG)) { help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); - SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_EXPORT_FILE_DIALOG); + g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), HELP_EXPORT_FILE_DIALOG); } #endif } @@ -838,7 +838,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args) if(action != output_action_print) dlg_set_activate(file_te, ok_bt); - SIGNAL_CONNECT(main_win, "delete_event", window_delete_event_cb, NULL); + g_signal_connect(main_win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); gtk_widget_show(main_win); window_present(main_win); diff --git a/gtk/print_prefs.c b/gtk/print_prefs.c index 017e515db4..eb7aac743b 100644 --- a/gtk/print_prefs.c +++ b/gtk/print_prefs.c @@ -127,7 +127,7 @@ GtkWidget * printer_prefs_show(void) gtk_box_pack_start(GTK_BOX(file_bt_hb), file_te, TRUE, TRUE, 0); gtk_widget_show(file_te); - SIGNAL_CONNECT(file_bt, "clicked", printer_browse_file_cb, file_te); + g_signal_connect(file_bt, "clicked", G_CALLBACK(printer_browse_file_cb), file_te); gtk_widget_show(main_vb); return(main_vb); diff --git a/gtk/profile_dlg.c b/gtk/profile_dlg.c index 0704e6ddd5..0acdb1f444 100644 --- a/gtk/profile_dlg.c +++ b/gtk/profile_dlg.c @@ -697,7 +697,7 @@ profile_dialog_new(void) gtk_widget_show(list_bb); new_bt = gtk_button_new_from_stock(GTK_STOCK_NEW); - SIGNAL_CONNECT(new_bt, "clicked", profile_new_bt_clicked_cb, NULL); + g_signal_connect(new_bt, "clicked", G_CALLBACK(profile_new_bt_clicked_cb), NULL); 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, @@ -706,7 +706,7 @@ profile_dialog_new(void) #if 0 copy_bt = gtk_button_new_from_stock(GTK_STOCK_COPY); gtk_widget_set_sensitive(copy_bt, FALSE); - SIGNAL_CONNECT(copy_bt, "clicked", profile_copy_bt_clicked_cb, NULL); + g_signal_connect(copy_bt, "clicked", G_CALLBACK(profile_copy_bt_clicked_cb), NULL); g_object_set_data(G_OBJECT(main_w), E_PROF_COPY_BT_KEY, copy_bt); gtk_widget_show(copy_bt); gtk_box_pack_start (GTK_BOX (list_bb), copy_bt, FALSE, FALSE, 0); @@ -716,7 +716,7 @@ profile_dialog_new(void) del_bt = gtk_button_new_from_stock(GTK_STOCK_DELETE); gtk_widget_set_sensitive(del_bt, FALSE); - SIGNAL_CONNECT(del_bt, "clicked", profile_del_bt_clicked_cb, NULL); + g_signal_connect(del_bt, "clicked", G_CALLBACK(profile_del_bt_clicked_cb), NULL); g_object_set_data(G_OBJECT(main_w), E_PROF_DEL_BT_KEY, del_bt); gtk_widget_show(del_bt); gtk_box_pack_start (GTK_BOX (list_bb), del_bt, FALSE, FALSE, 0); @@ -743,9 +743,9 @@ profile_dialog_new(void) gtk_tree_view_append_column(GTK_TREE_VIEW(profile_l), column); sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(profile_l)); gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE); - SIGNAL_CONNECT(sel, "changed", profile_sel_list_cb, profile_vb); - SIGNAL_CONNECT(profile_l, "button_press_event", profile_button_press_cb, NULL); - SIGNAL_CONNECT(profile_l, "key_release_event", profile_key_release_cb, NULL); + g_signal_connect(sel, "changed", G_CALLBACK(profile_sel_list_cb), profile_vb); + g_signal_connect(profile_l, "button_press_event", G_CALLBACK(profile_button_press_cb), NULL); + g_signal_connect(profile_l, "key_release_event", G_CALLBACK(profile_key_release_cb), NULL); g_object_set_data(G_OBJECT(main_w), E_PROF_PROFILE_L_KEY, profile_l); gtk_container_add(GTK_CONTAINER(profile_sc), profile_l); gtk_widget_show(profile_l); @@ -776,7 +776,7 @@ profile_dialog_new(void) 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_PROF_NAME_TE_KEY, name_te); - SIGNAL_CONNECT(name_te, "changed", profile_name_te_changed_cb, NULL); + g_signal_connect(name_te, "changed", G_CALLBACK(profile_name_te_changed_cb), NULL); #ifdef _WIN32 gtk_tooltips_set_tip (tooltips, name_te, "A profile name cannot start or end with a period (.), and cannot contain any of the following characters:\n \\ / : * ? \" < > |", NULL); #else @@ -790,7 +790,7 @@ profile_dialog_new(void) gtk_widget_show(bbox); ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK); - SIGNAL_CONNECT(ok_bt, "clicked", profile_dlg_ok_cb, NULL); + g_signal_connect(ok_bt, "clicked", G_CALLBACK(profile_dlg_ok_cb), NULL); gtk_tooltips_set_tip (tooltips, ok_bt, "Apply the profiles and close this dialog", NULL); /* Catch the "activate" signal on the profile name and profile @@ -801,16 +801,16 @@ profile_dialog_new(void) dlg_set_activate(name_te, ok_bt); apply_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_APPLY); - SIGNAL_CONNECT(apply_bt, "clicked", profile_dlg_apply_cb, NULL); + g_signal_connect(apply_bt, "clicked", G_CALLBACK(profile_dlg_apply_cb), NULL); gtk_tooltips_set_tip (tooltips, apply_bt, "Apply the profiles 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", profile_dlg_cancel_cb, NULL); + g_signal_connect(cancel_bt, "clicked", G_CALLBACK(profile_dlg_cancel_cb), NULL); window_set_cancel_button(main_w, cancel_bt, NULL); help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); - SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_CONFIG_PROFILES_DIALOG); + g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_CONFIG_PROFILES_DIALOG); gtk_tooltips_set_tip (tooltips, help_bt, "Show topic specific help", NULL); if(ok_bt) { @@ -829,8 +829,8 @@ profile_dialog_new(void) gtk_widget_grab_focus(profile_l); } - SIGNAL_CONNECT(main_w, "delete_event", profile_dlg_delete_event_cb, NULL); - SIGNAL_CONNECT(main_w, "destroy", profile_dlg_destroy_cb, NULL); + g_signal_connect(main_w, "delete_event", G_CALLBACK(profile_dlg_delete_event_cb), NULL); + g_signal_connect(main_w, "destroy", G_CALLBACK(profile_dlg_destroy_cb), NULL); gtk_widget_show(main_w); diff --git a/gtk/progress_dlg.c b/gtk/progress_dlg.c index 7c1842af5c..2182c51c42 100644 --- a/gtk/progress_dlg.c +++ b/gtk/progress_dlg.c @@ -212,8 +212,8 @@ create_progress_dlg(const gchar *task_title, const gchar *item_title, * the close button on the window, to stop an operation in * progress. */ - SIGNAL_CONNECT(cancel_bt, "clicked", stop_cb, stop_flag); - SIGNAL_CONNECT(dlg_w, "delete_event", delete_event_cb, stop_flag); + g_signal_connect(cancel_bt, "clicked", G_CALLBACK(stop_cb), stop_flag); + g_signal_connect(dlg_w, "delete_event", G_CALLBACK(delete_event_cb), stop_flag); gtk_widget_show_all(dlg_w); diff --git a/gtk/proto_dlg.c b/gtk/proto_dlg.c index ce4a64db6b..6db0e8cb38 100644 --- a/gtk/proto_dlg.c +++ b/gtk/proto_dlg.c @@ -132,7 +132,7 @@ proto_cb(GtkWidget *w _U_, gpointer data _U_) proto_list = tree_view_new(GTK_TREE_MODEL(proto_store)); gtk_container_add(GTK_CONTAINER(proto_sw), proto_list); proto_rend = gtk_cell_renderer_toggle_new(); - SIGNAL_CONNECT(proto_rend, "toggled", status_toggled, proto_store); + g_signal_connect(proto_rend, "toggled", G_CALLBACK(status_toggled), proto_store); proto_col = gtk_tree_view_column_new_with_attributes(titles[0], proto_rend, "active", 0, NULL); gtk_tree_view_column_set_sort_column_id(proto_col, 0); @@ -167,19 +167,19 @@ proto_cb(GtkWidget *w _U_, gpointer data _U_) /* Enable All */ button = gtk_button_new_with_label("Enable All"); - SIGNAL_CONNECT(button, "clicked", enable_all_cb, proto_list); + g_signal_connect(button, "clicked", G_CALLBACK(enable_all_cb), proto_list); gtk_box_pack_start(GTK_BOX(bbox), button, TRUE, TRUE, 0); gtk_widget_show(button); /* Disable All */ button = gtk_button_new_with_label("Disable All"); - SIGNAL_CONNECT(button, "clicked", disable_all_cb, proto_list); + g_signal_connect(button, "clicked", G_CALLBACK(disable_all_cb), proto_list); gtk_box_pack_start(GTK_BOX(bbox), button, TRUE, TRUE, 0); gtk_widget_show(button); /* Invert */ button = gtk_button_new_with_label("Invert"); - SIGNAL_CONNECT(button, "clicked", toggle_all_cb, proto_list); + g_signal_connect(button, "clicked", G_CALLBACK(toggle_all_cb), proto_list); gtk_box_pack_start(GTK_BOX(bbox), button, TRUE, TRUE, 0); gtk_widget_show(button); @@ -194,25 +194,25 @@ proto_cb(GtkWidget *w _U_, gpointer data _U_) gtk_widget_show(bbox); ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK); - SIGNAL_CONNECT(ok_bt, "clicked", proto_ok_cb, proto_w); + g_signal_connect(ok_bt, "clicked", G_CALLBACK(proto_ok_cb), proto_w); gtk_widget_grab_default(ok_bt); apply_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_APPLY); - SIGNAL_CONNECT(apply_bt, "clicked", proto_apply_cb, proto_w); + g_signal_connect(apply_bt, "clicked", G_CALLBACK(proto_apply_cb), proto_w); save_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_SAVE); - SIGNAL_CONNECT(save_bt, "clicked", proto_save_cb, proto_w); + g_signal_connect(save_bt, "clicked", G_CALLBACK(proto_save_cb), proto_w); cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL); window_set_cancel_button(proto_w, cancel_bt, proto_cancel_cb); if(topic_available(HELP_ENABLED_PROTOCOLS_DIALOG)) { help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); - SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_ENABLED_PROTOCOLS_DIALOG); + g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_ENABLED_PROTOCOLS_DIALOG); } - SIGNAL_CONNECT(proto_w, "delete_event", proto_delete_event_cb, NULL); - SIGNAL_CONNECT(proto_w, "destroy", proto_destroy_cb, NULL); + g_signal_connect(proto_w, "delete_event", G_CALLBACK(proto_delete_event_cb), NULL); + g_signal_connect(proto_w, "destroy", G_CALLBACK(proto_destroy_cb), NULL); gtk_quit_add_destroy(gtk_main_level(), GTK_OBJECT(proto_w)); diff --git a/gtk/proto_draw.c b/gtk/proto_draw.c index 5954153084..60891866f5 100644 --- a/gtk/proto_draw.c +++ b/gtk/proto_draw.c @@ -641,8 +641,8 @@ add_byte_tab(GtkWidget *byte_nb, const char *name, tvbuff_t *tvb, g_object_set_data(G_OBJECT(byte_view), E_BYTE_VIEW_TVBUFF_KEY, tvb); gtk_container_add(GTK_CONTAINER(byte_scrollw), byte_view); - SIGNAL_CONNECT(byte_view, "show", byte_view_realize_cb, NULL); - SIGNAL_CONNECT(byte_view, "button_press_event", byte_view_button_press_cb, + g_signal_connect(byte_view, "show", G_CALLBACK(byte_view_realize_cb), NULL); + g_signal_connect(byte_view, "button_press_event", G_CALLBACK(byte_view_button_press_cb), g_object_get_data(G_OBJECT(popup_menu_object), PM_HEXDUMP_KEY)); g_object_set_data(G_OBJECT(byte_view), E_BYTE_VIEW_TREE_PTR, tree); @@ -991,7 +991,7 @@ void savehex_cb(GtkWidget * w _U_, gpointer data _U_) file_selection_set_extra_widget(savehex_dlg, dlg_lb); gtk_widget_show(dlg_lb); - SIGNAL_CONNECT(savehex_dlg, "destroy", savehex_dlg_destroy_cb, NULL); + g_signal_connect(savehex_dlg, "destroy", G_CALLBACK(savehex_dlg_destroy_cb), NULL); #if GTK_CHECK_VERSION(2,4,0) if (gtk_dialog_run(GTK_DIALOG(savehex_dlg)) == GTK_RESPONSE_ACCEPT) { @@ -1002,13 +1002,13 @@ void savehex_cb(GtkWidget * w _U_, gpointer data _U_) #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 (savehex_dlg)->ok_button, "clicked", - savehex_save_clicked_cb, savehex_dlg); + g_signal_connect(GTK_FILE_SELECTION (savehex_dlg)->ok_button, "clicked", + G_CALLBACK(savehex_save_clicked_cb), savehex_dlg); window_set_cancel_button(savehex_dlg, GTK_FILE_SELECTION(savehex_dlg)->cancel_button, window_cancel_button_cb); - SIGNAL_CONNECT(savehex_dlg, "delete_event", window_delete_event_cb, NULL); + g_signal_connect(savehex_dlg, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); gtk_file_selection_set_filename(GTK_FILE_SELECTION(savehex_dlg), ""); @@ -1360,7 +1360,7 @@ remember_ptree_widget(GtkWidget *ptreew) /* Catch the "destroy" event on the widget, so that we remove it from the list when it's destroyed. */ - SIGNAL_CONNECT(ptreew, "destroy", forget_ptree_widget, NULL); + g_signal_connect(ptreew, "destroy", G_CALLBACK(forget_ptree_widget), NULL); } /* Remove a protocol tree widget from the list of protocol tree widgets. */ @@ -1560,8 +1560,8 @@ main_tree_view_new(e_prefs *prefs, GtkWidget **tree_view_p) gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column), GTK_TREE_VIEW_COLUMN_AUTOSIZE); - SIGNAL_CONNECT(tree_view, "row-expanded", expand_tree, NULL); - SIGNAL_CONNECT(tree_view, "row-collapsed", collapse_tree, NULL); + g_signal_connect(tree_view, "row-expanded", G_CALLBACK(expand_tree), NULL); + g_signal_connect(tree_view, "row-collapsed", G_CALLBACK(collapse_tree), NULL); gtk_container_add( GTK_CONTAINER(tv_scrollw), tree_view ); set_ptree_sel_browse(tree_view, prefs->gui_ptree_sel_browse); gtk_widget_modify_font(tree_view, user_font_get_regular()); diff --git a/gtk/proto_hier_stats_dlg.c b/gtk/proto_hier_stats_dlg.c index 0f9c3d2dbc..057b155ca6 100644 --- a/gtk/proto_hier_stats_dlg.c +++ b/gtk/proto_hier_stats_dlg.c @@ -339,7 +339,7 @@ proto_hier_create_popup_menu(void) item_factory = gtk_item_factory_new(GTK_TYPE_MENU, "<main>", NULL); gtk_item_factory_create_items_ac(item_factory, sizeof(proto_hier_list_menu_items)/sizeof(proto_hier_list_menu_items[0]), proto_hier_list_menu_items, NULL, 2); popup_menu_object = gtk_item_factory_get_widget (item_factory, "<main>"); - SIGNAL_CONNECT(tree, "button_press_event", proto_hier_show_popup_menu_cb, NULL); + g_signal_connect(tree, "button_press_event", G_CALLBACK(proto_hier_show_popup_menu_cb), NULL); } #define MAX_DLG_HEIGHT 450 @@ -492,10 +492,10 @@ proto_hier_stats_cb(GtkWidget *w _U_, gpointer d _U_) if(topic_available(HELP_STATS_PROTO_HIERARCHY_DIALOG)) { help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); - SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_STATS_PROTO_HIERARCHY_DIALOG); + g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_STATS_PROTO_HIERARCHY_DIALOG); } - SIGNAL_CONNECT(dlg, "delete_event", window_delete_event_cb, NULL); + g_signal_connect(dlg, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); gtk_widget_show_all(dlg); window_present(dlg); diff --git a/gtk/radius_stat.c b/gtk/radius_stat.c index 06504345e9..257745ab0b 100644 --- a/gtk/radius_stat.c +++ b/gtk/radius_stat.c @@ -345,8 +345,8 @@ gtk_radiusstat_init(const char *optarg, void *userdata _U_) bt_close = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE); window_set_cancel_button(rs->win, bt_close, window_cancel_button_cb); - SIGNAL_CONNECT(rs->win, "delete_event", window_delete_event_cb, NULL); - SIGNAL_CONNECT(rs->win, "destroy", win_destroy_cb, rs); + g_signal_connect(rs->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect(rs->win, "destroy", G_CALLBACK(win_destroy_cb), rs); gtk_widget_show_all(rs->win); window_present(rs->win); diff --git a/gtk/range_utils.c b/gtk/range_utils.c index 3cfc3e8459..1d10d8e25c 100644 --- a/gtk/range_utils.c +++ b/gtk/range_utils.c @@ -413,13 +413,13 @@ GtkWidget *range_new(packet_range_t *range) /* captured button */ captured_bt = gtk_toggle_button_new_with_mnemonic("_Captured"); gtk_table_attach_defaults(GTK_TABLE(range_tb), captured_bt, 1, 2, 0, 1); - SIGNAL_CONNECT(captured_bt, "toggled", toggle_captured_cb, range_tb); + g_signal_connect(captured_bt, "toggled", G_CALLBACK(toggle_captured_cb), range_tb); gtk_tooltips_set_tip (tooltips,captured_bt,("Process all the below chosen packets"), NULL); /* displayed button */ displayed_bt = gtk_toggle_button_new_with_mnemonic("_Displayed"); gtk_table_attach_defaults(GTK_TABLE(range_tb), displayed_bt, 2, 3, 0, 1); - SIGNAL_CONNECT(displayed_bt, "toggled", toggle_filtered_cb, range_tb); + g_signal_connect(displayed_bt, "toggled", G_CALLBACK(toggle_filtered_cb), range_tb); gtk_tooltips_set_tip (tooltips,displayed_bt,("Process only the below chosen packets, which also passes the current display filter"), NULL); @@ -428,7 +428,7 @@ GtkWidget *range_new(packet_range_t *range) gtk_table_attach_defaults(GTK_TABLE(range_tb), select_all_rb, 0, 1, 1, 2); gtk_tooltips_set_tip (tooltips, select_all_rb, ("Process all packets"), NULL); - SIGNAL_CONNECT(select_all_rb, "toggled", toggle_select_all, range_tb); + g_signal_connect(select_all_rb, "toggled", G_CALLBACK(toggle_select_all), range_tb); select_all_c_lb = gtk_label_new("?"); gtk_table_attach_defaults(GTK_TABLE(range_tb), select_all_c_lb, 1, 2, 1, 2); @@ -440,7 +440,7 @@ GtkWidget *range_new(packet_range_t *range) select_curr_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(select_all_rb), "_Selected packet only"); gtk_table_attach_defaults(GTK_TABLE(range_tb), select_curr_rb, 0, 1, 2, 3); gtk_tooltips_set_tip (tooltips, select_curr_rb, ("Process the currently selected packet only"), NULL); - SIGNAL_CONNECT(select_curr_rb, "toggled", toggle_select_selected, range_tb); + g_signal_connect(select_curr_rb, "toggled", G_CALLBACK(toggle_select_selected), range_tb); select_curr_c_lb = gtk_label_new("?"); gtk_table_attach_defaults(GTK_TABLE(range_tb), select_curr_c_lb, 1, 2, 2, 3); @@ -452,7 +452,7 @@ GtkWidget *range_new(packet_range_t *range) select_marked_only_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(select_all_rb), "_Marked packets only"); gtk_table_attach_defaults(GTK_TABLE(range_tb), select_marked_only_rb, 0, 1, 3, 4); gtk_tooltips_set_tip (tooltips, select_marked_only_rb, ("Process marked packets only"), NULL); - SIGNAL_CONNECT(select_marked_only_rb, "toggled", toggle_select_marked_only, range_tb); + g_signal_connect(select_marked_only_rb, "toggled", G_CALLBACK(toggle_select_marked_only), range_tb); select_marked_only_c_lb = gtk_label_new("?"); gtk_table_attach_defaults(GTK_TABLE(range_tb), select_marked_only_c_lb, 1, 2, 3, 4); @@ -464,7 +464,7 @@ GtkWidget *range_new(packet_range_t *range) select_marked_range_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(select_all_rb), "From first _to last marked packet"); gtk_table_attach_defaults(GTK_TABLE(range_tb), select_marked_range_rb, 0, 1, 4, 5); gtk_tooltips_set_tip (tooltips,select_marked_range_rb,("Process all packets between the first and last marker"), NULL); - SIGNAL_CONNECT(select_marked_range_rb, "toggled", toggle_select_marked_range, range_tb); + g_signal_connect(select_marked_range_rb, "toggled", G_CALLBACK(toggle_select_marked_range), range_tb); select_marked_range_c_lb = gtk_label_new("?"); gtk_table_attach_defaults(GTK_TABLE(range_tb), select_marked_range_c_lb, 1, 2, 4, 5); @@ -476,7 +476,7 @@ GtkWidget *range_new(packet_range_t *range) select_user_range_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(select_all_rb), "Specify a packet _range:"); gtk_table_attach_defaults(GTK_TABLE(range_tb), select_user_range_rb, 0, 1, 5, 6); gtk_tooltips_set_tip (tooltips,select_user_range_rb,("Process a specified packet range"), NULL); - SIGNAL_CONNECT(select_user_range_rb, "toggled", toggle_select_user_range, range_tb); + g_signal_connect(select_user_range_rb, "toggled", G_CALLBACK(toggle_select_user_range), range_tb); select_user_range_c_lb = gtk_label_new("?"); gtk_table_attach_defaults(GTK_TABLE(range_tb), select_user_range_c_lb, 1, 2, 5, 6); @@ -490,8 +490,8 @@ GtkWidget *range_new(packet_range_t *range) gtk_table_attach_defaults(GTK_TABLE(range_tb), select_user_range_entry, 0, 1, 6, 7); gtk_tooltips_set_tip (tooltips,select_user_range_entry, ("Specify a range of packet numbers : \nExample : 1-10,18,25-100,332-"), NULL); - SIGNAL_CONNECT(select_user_range_entry,"changed", range_entry, range_tb); - SIGNAL_CONNECT(select_user_range_entry,"activate", range_entry_in_event, range_tb); + g_signal_connect(select_user_range_entry,"changed", G_CALLBACK(range_entry), range_tb); + g_signal_connect(select_user_range_entry,"activate", G_CALLBACK(range_entry_in_event), range_tb); gtk_widget_show_all(range_tb); diff --git a/gtk/rpc_progs.c b/gtk/rpc_progs.c index 722282bb9a..5ca868188a 100644 --- a/gtk/rpc_progs.c +++ b/gtk/rpc_progs.c @@ -397,8 +397,8 @@ gtk_rpcprogs_init(const char *optarg _U_, void* userdata _U_) bt_close = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE); window_set_cancel_button(win, bt_close, window_cancel_button_cb); - SIGNAL_CONNECT(win, "delete_event", window_delete_event_cb, NULL); - SIGNAL_CONNECT(win, "destroy", win_destroy_cb, win); + g_signal_connect(win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect(win, "destroy", G_CALLBACK(win_destroy_cb), win); gtk_widget_show_all(win); window_present(win); diff --git a/gtk/rpc_stat.c b/gtk/rpc_stat.c index 1f18235e26..1ef5b02767 100644 --- a/gtk/rpc_stat.c +++ b/gtk/rpc_stat.c @@ -304,8 +304,8 @@ gtk_rpcstat_init(const char *optarg, void* userdata _U_) close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE); window_set_cancel_button(rs->win, close_bt, window_cancel_button_cb); - SIGNAL_CONNECT(rs->win, "delete_event", window_delete_event_cb, NULL); - SIGNAL_CONNECT(rs->win, "destroy", win_destroy_cb, rs); + g_signal_connect(rs->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect(rs->win, "destroy", G_CALLBACK(win_destroy_cb), rs); gtk_widget_show_all(rs->win); window_present(rs->win); @@ -371,8 +371,8 @@ rpcstat_program_select(GtkWidget *item _U_, gpointer key) char vs[5]; g_snprintf(vs, 5, "%d",i); menu_item=gtk_menu_item_new_with_label(vs); - SIGNAL_CONNECT(menu_item, "activate", rpcstat_version_select, - (long) i); + g_signal_connect(menu_item, "activate", G_CALLBACK(rpcstat_version_select), + (gpointer)(long) i); gtk_widget_show(menu_item); gtk_menu_append(GTK_MENU(vers_menu), menu_item); @@ -388,7 +388,7 @@ rpcstat_list_programs(gpointer *key, gpointer *value, gpointer *user_data _U_) GtkWidget *menu_item; menu_item=gtk_menu_item_new_with_label(v->progname); - SIGNAL_CONNECT(menu_item, "activate", rpcstat_program_select, k); + g_signal_connect(menu_item, "activate", G_CALLBACK(rpcstat_program_select), k); gtk_widget_show(menu_item); gtk_menu_append(GTK_MENU(prog_menu), menu_item); @@ -472,8 +472,8 @@ gtk_rpcstat_cb(GtkWidget *w _U_, gpointer d _U_) char vs[5]; g_snprintf(vs, 5, "%d",i); menu_item=gtk_menu_item_new_with_label(vs); - SIGNAL_CONNECT(menu_item, "activate", rpcstat_version_select, - (long) i); + g_signal_connect(menu_item, "activate", G_CALLBACK(rpcstat_version_select), + (gpointer)(long) i); gtk_widget_show(menu_item); gtk_menu_append(GTK_MENU(vers_menu), menu_item); @@ -490,13 +490,13 @@ gtk_rpcstat_cb(GtkWidget *w _U_, gpointer d _U_) /* Filter label */ filter_bt=gtk_button_new_from_stock(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY); - SIGNAL_CONNECT(filter_bt, "clicked", display_filter_construct_cb, &args); + g_signal_connect(filter_bt, "clicked", G_CALLBACK(display_filter_construct_cb), &args); gtk_box_pack_start(GTK_BOX(filter_box), filter_bt, FALSE, FALSE, 0); gtk_widget_show(filter_bt); /* Filter entry */ filter_entry=gtk_entry_new(); - SIGNAL_CONNECT(filter_entry, "changed", filter_te_syntax_check_cb, NULL); + g_signal_connect(filter_entry, "changed", G_CALLBACK(filter_te_syntax_check_cb), NULL); /* filter prefs dialog */ g_object_set_data(G_OBJECT(filter_bt), E_FILT_TE_PTR_KEY, filter_entry); @@ -529,8 +529,8 @@ gtk_rpcstat_cb(GtkWidget *w _U_, gpointer d _U_) gtk_widget_grab_default(start_button ); - SIGNAL_CONNECT(dlg, "delete_event", window_delete_event_cb, NULL); - SIGNAL_CONNECT(dlg, "destroy", dlg_destroy_cb, NULL); + g_signal_connect(dlg, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect(dlg, "destroy", G_CALLBACK(dlg_destroy_cb), NULL); gtk_widget_show_all(dlg); window_present(dlg); diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c index dbe6df72fe..82542f76b7 100644 --- a/gtk/rtp_analysis.c +++ b/gtk/rtp_analysis.c @@ -848,8 +848,8 @@ static void on_graph_bt_clicked(GtkWidget *bt _U_, user_data_t *user_data _U_) user_data->dlg.graph_window = show_conversation_graph(list, title1, title2, &graph_selection_callback, user_data); - SIGNAL_CONNECT(user_data->dlg.graph_window, "destroy", - on_destroy_graph, user_data); + g_signal_connect(user_data->dlg.graph_window, "destroy", + G_CALLBACK(on_destroy_graph), user_data); } #endif /*USE_CONVERSATION_GRAPH*/ @@ -1432,14 +1432,14 @@ static gint scrollbar_changed(GtkWidget *widget _U_, gpointer data) static void create_draw_area(user_data_t* user_data, GtkWidget *box) { user_data->dlg.dialog_graph.draw_area=gtk_drawing_area_new(); - SIGNAL_CONNECT(user_data->dlg.dialog_graph.draw_area, "destroy", quit, user_data); + g_signal_connect(user_data->dlg.dialog_graph.draw_area, "destroy", G_CALLBACK(quit), user_data); g_object_set_data(G_OBJECT(user_data->dlg.dialog_graph.draw_area), "user_data_t", user_data); gtk_widget_set_size_request(user_data->dlg.dialog_graph.draw_area, user_data->dlg.dialog_graph.pixmap_width, user_data->dlg.dialog_graph.pixmap_height); /* signals needed to handle backing pixmap */ - SIGNAL_CONNECT(user_data->dlg.dialog_graph.draw_area, "expose_event", expose_event, NULL); - SIGNAL_CONNECT(user_data->dlg.dialog_graph.draw_area, "configure_event", configure_event, user_data); + g_signal_connect(user_data->dlg.dialog_graph.draw_area, "expose_event", G_CALLBACK(expose_event), NULL); + g_signal_connect(user_data->dlg.dialog_graph.draw_area, "configure_event", G_CALLBACK(configure_event), user_data); gtk_widget_show(user_data->dlg.dialog_graph.draw_area); gtk_box_pack_start(GTK_BOX(box), user_data->dlg.dialog_graph.draw_area, TRUE, TRUE, 0); @@ -1449,7 +1449,7 @@ static void create_draw_area(user_data_t* user_data, GtkWidget *box) user_data->dlg.dialog_graph.scrollbar=gtk_hscrollbar_new(user_data->dlg.dialog_graph.scrollbar_adjustment); gtk_widget_show(user_data->dlg.dialog_graph.scrollbar); gtk_box_pack_start(GTK_BOX(box), user_data->dlg.dialog_graph.scrollbar, FALSE, FALSE, 0); - SIGNAL_CONNECT(user_data->dlg.dialog_graph.scrollbar_adjustment, "value_changed", scrollbar_changed, user_data); + g_signal_connect(user_data->dlg.dialog_graph.scrollbar_adjustment, "value_changed", G_CALLBACK(scrollbar_changed), user_data); } /****************************************************************************/ @@ -1496,7 +1496,7 @@ static void create_filter_box(dialog_graph_graph_t *dgg, GtkWidget *box, int num gtk_box_pack_start(GTK_BOX(hbox), dgg->display_button, FALSE, FALSE, 0); gtk_widget_show(dgg->display_button); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dgg->display_button), dgg->display); - SIGNAL_CONNECT(dgg->display_button, "toggled", filter_callback, dgg); + g_signal_connect(dgg->display_button, "toggled", G_CALLBACK(filter_callback), dgg); label=gtk_label_new(dgg->title); gtk_widget_show(label); @@ -1595,7 +1595,7 @@ static void create_yscale_max_menu_items(user_data_t* user_data, 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, user_data); + g_signal_connect(menu_item, "activate", G_CALLBACK(yscale_select), user_data); gtk_widget_show(menu_item); gtk_menu_append(GTK_MENU(menu), menu_item); } @@ -1615,7 +1615,7 @@ static void create_pixels_per_tick_menu_items(user_data_t* user_data, GtkWidget 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, user_data); + g_signal_connect(menu_item, "activate", G_CALLBACK(pixels_per_tick_select), user_data); gtk_widget_show(menu_item); gtk_menu_append(GTK_MENU(menu), menu_item); } @@ -1645,7 +1645,7 @@ static void create_tick_interval_menu_items(user_data_t* user_data, GtkWidget *m 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)user_data); + g_signal_connect(menu_item, "activate", G_CALLBACK(tick_interval_select), (gpointer)user_data); gtk_widget_show(menu_item); gtk_menu_append(GTK_MENU(menu), menu_item); } @@ -1751,7 +1751,7 @@ static void dialog_graph_init_window(user_data_t* user_data) bt_close = g_object_get_data(G_OBJECT(hbox), GTK_STOCK_CLOSE); window_set_cancel_button(user_data->dlg.dialog_graph.window, bt_close, window_cancel_button_cb); - SIGNAL_CONNECT(user_data->dlg.dialog_graph.window, "delete_event", window_delete_event_cb, NULL); + g_signal_connect(user_data->dlg.dialog_graph.window, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); gtk_widget_show(user_data->dlg.dialog_graph.window); window_present(user_data->dlg.dialog_graph.window); @@ -2071,15 +2071,15 @@ static void save_csv_as_cb(GtkWidget *bt _U_, user_data_t *user_data _U_) g_object_set_data(G_OBJECT(ok_bt), "reversed_rb", reversed_rb); g_object_set_data(G_OBJECT(ok_bt), "both_rb", both_rb); g_object_set_data(G_OBJECT(ok_bt), "user_data", user_data); - SIGNAL_CONNECT(ok_bt, "clicked", save_csv_as_ok_cb, + g_signal_connect(ok_bt, "clicked", G_CALLBACK(save_csv_as_ok_cb), user_data->dlg.save_csv_as_w); window_set_cancel_button(user_data->dlg.save_csv_as_w, GTK_FILE_SELECTION(user_data->dlg.save_csv_as_w)->cancel_button, window_cancel_button_cb); - SIGNAL_CONNECT(user_data->dlg.save_csv_as_w, "delete_event", window_delete_event_cb, NULL); - SIGNAL_CONNECT(user_data->dlg.save_csv_as_w, "destroy", - save_csv_as_destroy_cb, user_data); + g_signal_connect(user_data->dlg.save_csv_as_w, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect(user_data->dlg.save_csv_as_w, "destroy", + G_CALLBACK(save_csv_as_destroy_cb), user_data); gtk_widget_show(user_data->dlg.save_csv_as_w); window_present(user_data->dlg.save_csv_as_w); @@ -2707,16 +2707,16 @@ static void on_save_bt_clicked(GtkWidget *bt _U_, user_data_t *user_data _U_) g_object_set_data(G_OBJECT(ok_bt), "reversed_rb", reversed_rb); g_object_set_data(G_OBJECT(ok_bt), "both_rb", both_rb); g_object_set_data(G_OBJECT(ok_bt), "user_data", user_data); - SIGNAL_CONNECT(ok_bt, "clicked", save_voice_as_ok_cb, + g_signal_connect(ok_bt, "clicked", G_CALLBACK(save_voice_as_ok_cb), user_data->dlg.save_voice_as_w); window_set_cancel_button(user_data->dlg.save_voice_as_w, GTK_FILE_SELECTION(user_data->dlg.save_voice_as_w)->cancel_button, window_cancel_button_cb); - SIGNAL_CONNECT(user_data->dlg.save_voice_as_w, "delete_event", - window_delete_event_cb, NULL); - SIGNAL_CONNECT(user_data->dlg.save_voice_as_w, "destroy", - save_voice_as_destroy_cb, user_data); + g_signal_connect(user_data->dlg.save_voice_as_w, "delete_event", + G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect(user_data->dlg.save_voice_as_w, "destroy", + G_CALLBACK(save_voice_as_destroy_cb), user_data); gtk_widget_show(user_data->dlg.save_voice_as_w); window_present(user_data->dlg.save_voice_as_w); @@ -2901,7 +2901,7 @@ GtkWidget* create_clist(user_data_t* user_data) /* clist for the information */ clist_fwd = gtk_clist_new(NUM_COLS); gtk_widget_show(clist_fwd); - SIGNAL_CONNECT(clist_fwd, "select_row", on_clist_select_row, user_data); + g_signal_connect(clist_fwd, "select_row", G_CALLBACK(on_clist_select_row), user_data); gtk_clist_column_titles_show(GTK_CLIST(clist_fwd)); gtk_clist_set_compare_func(GTK_CLIST(clist_fwd), rtp_sort_column); @@ -2973,7 +2973,7 @@ column_arrows* add_sort_by_column(GtkWidget* window, GtkWidget* clist, gtk_widget_show(col_arrows[i].table); } - SIGNAL_CONNECT(clist, "click-column", click_column_cb, col_arrows); + g_signal_connect(clist, "click-column", G_CALLBACK(click_column_cb), col_arrows); return col_arrows; } @@ -3035,8 +3035,8 @@ static void create_rtp_dialog(user_data_t* user_data) gtk_container_add(GTK_CONTAINER(main_vb), notebook); g_object_set_data(G_OBJECT(window), "notebook", notebook); - user_data->dlg.notebook_signal_id = SIGNAL_CONNECT(notebook, "switch_page", on_notebook_switch_page, - user_data); + user_data->dlg.notebook_signal_id = + g_signal_connect(notebook, "switch_page", G_CALLBACK(on_notebook_switch_page), user_data); /* page for forward connection */ page = gtk_vbox_new(FALSE, 8); @@ -3110,40 +3110,40 @@ static void create_rtp_dialog(user_data_t* user_data) voice_bt = gtk_button_new_with_label("Save payload..."); gtk_container_add(GTK_CONTAINER(box4), voice_bt); gtk_widget_show(voice_bt); - SIGNAL_CONNECT(voice_bt, "clicked", on_save_bt_clicked, user_data); + g_signal_connect(voice_bt, "clicked", G_CALLBACK(on_save_bt_clicked), user_data); csv_bt = gtk_button_new_with_label("Save as CSV..."); gtk_container_add(GTK_CONTAINER(box4), csv_bt); gtk_widget_show(csv_bt); - SIGNAL_CONNECT(csv_bt, "clicked", save_csv_as_cb, user_data); + g_signal_connect(csv_bt, "clicked", G_CALLBACK(save_csv_as_cb), user_data); refresh_bt = gtk_button_new_from_stock(GTK_STOCK_REFRESH); gtk_container_add(GTK_CONTAINER(box4), refresh_bt); gtk_widget_show(refresh_bt); - SIGNAL_CONNECT(refresh_bt, "clicked", on_refresh_bt_clicked, user_data); + g_signal_connect(refresh_bt, "clicked", G_CALLBACK(on_refresh_bt_clicked), user_data); goto_bt = gtk_button_new_from_stock(GTK_STOCK_JUMP_TO); gtk_container_add(GTK_CONTAINER(box4), goto_bt); gtk_widget_show(goto_bt); - SIGNAL_CONNECT(goto_bt, "clicked", on_goto_bt_clicked, user_data); + g_signal_connect(goto_bt, "clicked", G_CALLBACK(on_goto_bt_clicked), user_data); graph_bt = gtk_button_new_with_label("Graph"); gtk_container_add(GTK_CONTAINER(box4), graph_bt); gtk_widget_show(graph_bt); - SIGNAL_CONNECT(graph_bt, "clicked", on_graph_bt_clicked, user_data); + g_signal_connect(graph_bt, "clicked", G_CALLBACK(on_graph_bt_clicked), user_data); #ifdef USE_CONVERSATION_GRAPH graph_bt = gtk_button_new_with_label("Graph"); gtk_container_add(GTK_CONTAINER(box4), graph_bt); gtk_widget_show(graph_bt); - SIGNAL_CONNECT(graph_bt, "clicked", on_graph_bt_clicked, user_data); + g_signal_connect(graph_bt, "clicked", G_CALLBACK(on_graph_bt_clicked), user_data); #endif next_bt = gtk_button_new_with_label("Next non-Ok"); gtk_container_add(GTK_CONTAINER(box4), next_bt); gtk_widget_show(next_bt); - SIGNAL_CONNECT(next_bt, "clicked", on_next_bt_clicked, user_data); + g_signal_connect(next_bt, "clicked", G_CALLBACK(on_next_bt_clicked), user_data); close_bt = gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_container_add(GTK_CONTAINER(box4), close_bt); @@ -3151,8 +3151,8 @@ static void create_rtp_dialog(user_data_t* user_data) gtk_widget_show(close_bt); window_set_cancel_button(window, close_bt, window_cancel_button_cb); - SIGNAL_CONNECT(window, "delete_event", window_delete_event_cb, NULL); - SIGNAL_CONNECT(window, "destroy", on_destroy, user_data); + g_signal_connect(window, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect(window, "destroy", G_CALLBACK(on_destroy), user_data); gtk_widget_show(window); window_present(window); diff --git a/gtk/rtp_player.c b/gtk/rtp_player.c index fe0caa5bf2..30eb1ee932 100644 --- a/gtk/rtp_player.c +++ b/gtk/rtp_player.c @@ -980,7 +980,7 @@ draw_channel_cursor(rtp_channel_info_t *rci, guint32 start_index) /* Connect back the "value" scroll signal */ - SIGNAL_CONNECT(rci->h_scrollbar_adjustment, "value_changed", h_scrollbar_changed, rci); + g_signal_connect(rci->h_scrollbar_adjustment, "value_changed", G_CALLBACK(h_scrollbar_changed), rci); /* if (index/MULT < rci->h_scrollbar_adjustment->page_increment) { @@ -1180,7 +1180,7 @@ on_bt_check_clicked(GtkButton *button _U_, gpointer user_data _U_) /* we disconnect the signal temporarly to avoid been called back */ g_signal_handlers_disconnect_by_func(rtp_channels->rci[rtp_channels->channel]->check_bt, on_bt_check_clicked, rtp_channels->rci[rtp_channels->channel]); gtk_toggle_button_set_active((GtkToggleButton *)rtp_channels->rci[rtp_channels->channel]->check_bt, FALSE); - SIGNAL_CONNECT(rtp_channels->rci[rtp_channels->channel]->check_bt, "clicked", on_bt_check_clicked, rtp_channels->rci[rtp_channels->channel]); + g_signal_connect(rtp_channels->rci[rtp_channels->channel]->check_bt, "clicked", G_CALLBACK(on_bt_check_clicked), rtp_channels->rci[rtp_channels->channel]); rtp_channels->rci[rtp_channels->channel]->selected = FALSE; } @@ -1417,14 +1417,14 @@ button_press_event_channel(GtkWidget *widget, GdkEventButton *event _U_) /* we disconnect the signal temporarly to avoid been called back */ g_signal_handlers_disconnect_by_func(rtp_channels->rci[rtp_channels->channel]->check_bt, on_bt_check_clicked, rtp_channels->rci[rtp_channels->channel]); gtk_toggle_button_set_active((GtkToggleButton *) rtp_channels->rci[rtp_channels->channel]->check_bt, FALSE); - SIGNAL_CONNECT(rtp_channels->rci[rtp_channels->channel]->check_bt, "clicked", on_bt_check_clicked, rtp_channels->rci[rtp_channels->channel]); + g_signal_connect(rtp_channels->rci[rtp_channels->channel]->check_bt, "clicked", G_CALLBACK(on_bt_check_clicked), rtp_channels->rci[rtp_channels->channel]); rtp_channels->rci[rtp_channels->channel]->selected = FALSE; } /* we disconnect the signal temporarly to avoid been called back */ g_signal_handlers_disconnect_by_func(rci->check_bt, on_bt_check_clicked, rci); gtk_toggle_button_set_active((GtkToggleButton *) rci->check_bt, TRUE); - SIGNAL_CONNECT(rci->check_bt, "clicked", on_bt_check_clicked, rci); + g_signal_connect(rci->check_bt, "clicked", G_CALLBACK(on_bt_check_clicked), rci); rtp_channels->rci[rtp_channels->channel] = rci; rtp_channels->channel = !(rtp_channels->channel); @@ -1505,11 +1505,11 @@ add_channel_to_window(gchar *key _U_ , rtp_channel_info_t *rci, guint *counter _ gtk_box_pack_start(GTK_BOX (channels_vb), rci->scroll_window, FALSE, FALSE, 0); /* signals needed to handle backing pixmap */ - SIGNAL_CONNECT(rci->draw_area, "expose_event", expose_event_channels, NULL); - SIGNAL_CONNECT(rci->draw_area, "configure_event", configure_event_channels, rci); + g_signal_connect(rci->draw_area, "expose_event", G_CALLBACK(expose_event_channels), NULL); + g_signal_connect(rci->draw_area, "configure_event", G_CALLBACK(configure_event_channels), rci); gtk_widget_add_events (rci->draw_area, GDK_BUTTON_PRESS_MASK); - SIGNAL_CONNECT(rci->draw_area, "button_press_event", button_press_event_channel, rci); - SIGNAL_CONNECT(rci->h_scrollbar_adjustment, "value_changed", h_scrollbar_changed, rci); + g_signal_connect(rci->draw_area, "button_press_event", G_CALLBACK(button_press_event_channel), rci); + g_signal_connect(rci->h_scrollbar_adjustment, "value_changed", G_CALLBACK(h_scrollbar_changed), rci); label = g_string_new(""); @@ -1528,7 +1528,7 @@ add_channel_to_window(gchar *key _U_ , rtp_channel_info_t *rci, guint *counter _ gtk_box_pack_start(GTK_BOX (channels_vb), rci->separator, FALSE, FALSE, 5); } - SIGNAL_CONNECT(rci->check_bt, "clicked", on_bt_check_clicked, rci); + g_signal_connect(rci->check_bt, "clicked", G_CALLBACK(on_bt_check_clicked), rci); g_string_free(label, TRUE); } @@ -1891,7 +1891,7 @@ rtp_player_dlg_create(void) jitter_spinner = gtk_spin_button_new (jitter_spinner_adj, 5, 0); gtk_box_pack_start(GTK_BOX(h_jitter_buttons_box), jitter_spinner, FALSE, FALSE, 0); gtk_tooltips_set_tip (tooltips, jitter_spinner, "The simulated jitter buffer in [ms]", NULL); - SIGNAL_CONNECT(GTK_OBJECT (jitter_spinner_adj), "value_changed", (GtkSignalFunc) jitter_spinner_value_changed, NULL); + g_signal_connect(GTK_OBJECT (jitter_spinner_adj), "value_changed", G_CALLBACK(jitter_spinner_value_changed), NULL); /* button row */ hbuttonbox = gtk_hbutton_box_new (); @@ -1901,22 +1901,22 @@ rtp_player_dlg_create(void) bt_decode = gtk_button_new_with_label("Decode"); gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_decode); - SIGNAL_CONNECT(bt_decode, "clicked", on_bt_decode_clicked, NULL); + g_signal_connect(bt_decode, "clicked", G_CALLBACK(on_bt_decode_clicked), NULL); gtk_tooltips_set_tip (tooltips, bt_decode, "Decode the RTP stream(s)", NULL); bt_play = gtk_button_new_with_label("Play"); gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_play); - SIGNAL_CONNECT(bt_play, "clicked", on_bt_play_clicked, NULL); + g_signal_connect(bt_play, "clicked", G_CALLBACK(on_bt_play_clicked), NULL); gtk_tooltips_set_tip (tooltips, bt_play, "Play the RTP channel(s)", NULL); bt_pause = gtk_button_new_with_label("Pause"); gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_pause); - SIGNAL_CONNECT(bt_pause, "clicked", on_bt_pause_clicked, NULL); + g_signal_connect(bt_pause, "clicked", G_CALLBACK(on_bt_pause_clicked), NULL); gtk_tooltips_set_tip (tooltips, bt_pause, "Pause the RTP channel(s)", NULL); bt_stop = gtk_button_new_with_label("Stop"); gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_stop); - SIGNAL_CONNECT(bt_stop, "clicked", on_bt_stop_clicked, NULL); + g_signal_connect(bt_stop, "clicked", G_CALLBACK(on_bt_stop_clicked), NULL); gtk_tooltips_set_tip (tooltips, bt_stop, "Stop the RTP channel(s)", NULL); bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE); @@ -1924,8 +1924,8 @@ rtp_player_dlg_create(void) GTK_WIDGET_SET_FLAGS(bt_close, GTK_CAN_DEFAULT); gtk_tooltips_set_tip (tooltips, bt_close, "Close this dialog", NULL); - SIGNAL_CONNECT(bt_close, "clicked", rtp_player_on_destroy, NULL); - SIGNAL_CONNECT(rtp_player_dlg_w, "destroy", rtp_player_on_destroy, NULL); + g_signal_connect(bt_close, "clicked", G_CALLBACK(rtp_player_on_destroy), NULL); + g_signal_connect(rtp_player_dlg_w, "destroy", G_CALLBACK(rtp_player_on_destroy), NULL); /* button row */ hbuttonbox = gtk_hbutton_box_new (); diff --git a/gtk/rtp_stream_dlg.c b/gtk/rtp_stream_dlg.c index 011bdb4608..330d02d030 100644 --- a/gtk/rtp_stream_dlg.c +++ b/gtk/rtp_stream_dlg.c @@ -335,13 +335,13 @@ rtpstream_on_save (GtkButton *button _U_, gtk_widget_show (vertb); ok_bt = GTK_FILE_SELECTION(rtpstream_save_dlg)->ok_button; - SIGNAL_CONNECT(ok_bt, "clicked", save_stream_ok_cb, tapinfo); + g_signal_connect(ok_bt, "clicked", G_CALLBACK(save_stream_ok_cb), tapinfo); window_set_cancel_button(rtpstream_save_dlg, GTK_FILE_SELECTION(rtpstream_save_dlg)->cancel_button, window_cancel_button_cb); - SIGNAL_CONNECT(rtpstream_save_dlg, "delete_event", window_delete_event_cb, NULL); - SIGNAL_CONNECT(rtpstream_save_dlg, "destroy", save_stream_destroy_cb, + g_signal_connect(rtpstream_save_dlg, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect(rtpstream_save_dlg, "destroy", G_CALLBACK(save_stream_destroy_cb), NULL); gtk_widget_show(rtpstream_save_dlg); @@ -741,7 +741,7 @@ static void rtpstream_dlg_create (void) gtk_widget_show(col_arrows[i].table); } - SIGNAL_CONNECT(clist, "click-column", rtpstream_click_column_cb, col_arrows); + g_signal_connect(clist, "click-column", G_CALLBACK(rtpstream_click_column_cb), col_arrows); label_fwd = gtk_label_new (FWD_LABEL_TEXT); gtk_box_pack_start (GTK_BOX (main_vb), label_fwd, FALSE, FALSE, 0); @@ -794,22 +794,22 @@ static void rtpstream_dlg_create (void) gtk_tooltips_set_tip (tooltips, bt_close, "Close this dialog", NULL); GTK_WIDGET_SET_FLAGS(bt_close, GTK_CAN_DEFAULT); - SIGNAL_CONNECT(clist, "select_row", rtpstream_on_select_row, NULL); - SIGNAL_CONNECT(bt_unselect, "clicked", rtpstream_on_unselect, NULL); - SIGNAL_CONNECT(bt_findrev, "clicked", rtpstream_on_findrev, NULL); + g_signal_connect(clist, "select_row", G_CALLBACK(rtpstream_on_select_row), NULL); + g_signal_connect(bt_unselect, "clicked", G_CALLBACK(rtpstream_on_unselect), NULL); + g_signal_connect(bt_findrev, "clicked", G_CALLBACK(rtpstream_on_findrev), NULL); /* - SIGNAL_CONNECT(bt_goto, "clicked", rtpstream_on_goto, NULL); + g_signal_connect(bt_goto, "clicked", G_CALLBACK(rtpstream_on_goto), NULL); */ - SIGNAL_CONNECT(bt_save, "clicked", rtpstream_on_save, NULL); - SIGNAL_CONNECT(bt_mark, "clicked", rtpstream_on_mark, NULL); - SIGNAL_CONNECT(bt_filter, "clicked", rtpstream_on_filter, NULL); - SIGNAL_CONNECT(bt_copy, "clicked", rtpstream_on_copy_as_csv, NULL); - SIGNAL_CONNECT(bt_analyze, "clicked", rtpstream_on_analyse, NULL); + g_signal_connect(bt_save, "clicked", G_CALLBACK(rtpstream_on_save), NULL); + g_signal_connect(bt_mark, "clicked", G_CALLBACK(rtpstream_on_mark), NULL); + g_signal_connect(bt_filter, "clicked", G_CALLBACK(rtpstream_on_filter), NULL); + g_signal_connect(bt_copy, "clicked", G_CALLBACK(rtpstream_on_copy_as_csv), NULL); + g_signal_connect(bt_analyze, "clicked", G_CALLBACK(rtpstream_on_analyse), NULL); window_set_cancel_button(rtpstream_dlg_w, bt_close, window_cancel_button_cb); - SIGNAL_CONNECT(rtpstream_dlg_w, "delete_event", window_delete_event_cb, NULL); - SIGNAL_CONNECT(rtpstream_dlg_w, "destroy", rtpstream_on_destroy, NULL); + g_signal_connect(rtpstream_dlg_w, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect(rtpstream_dlg_w, "destroy", G_CALLBACK(rtpstream_on_destroy), NULL); gtk_widget_show_all(rtpstream_dlg_w); window_present(rtpstream_dlg_w); diff --git a/gtk/scsi_stat.c b/gtk/scsi_stat.c index 8c16d4e34d..60c66cb798 100644 --- a/gtk/scsi_stat.c +++ b/gtk/scsi_stat.c @@ -277,8 +277,8 @@ gtk_scsistat_init(const char *optarg, void* userdata _U_) close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE); window_set_cancel_button(rs->win, close_bt, window_cancel_button_cb); - SIGNAL_CONNECT(rs->win, "delete_event", window_delete_event_cb, NULL); - SIGNAL_CONNECT(rs->win, "destroy", win_destroy_cb, rs); + g_signal_connect(rs->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect(rs->win, "destroy", G_CALLBACK(win_destroy_cb), rs); gtk_widget_show_all(rs->win); window_present(rs->win); @@ -352,20 +352,20 @@ gtk_scsistat_cb(GtkWidget *w _U_, gpointer d _U_) /* SBC */ menu_item=gtk_menu_item_new_with_label("SBC (disk)"); - SIGNAL_CONNECT(menu_item, "activate", scsistat_program_select, SCSI_DEV_SBC); + g_signal_connect(menu_item, "activate", G_CALLBACK(scsistat_program_select), SCSI_DEV_SBC); gtk_widget_show(menu_item); gtk_menu_append(GTK_MENU(prog_menu), menu_item); /* SSC */ menu_item=gtk_menu_item_new_with_label("SSC (tape)"); - SIGNAL_CONNECT(menu_item, "activate", scsistat_program_select, SCSI_DEV_SSC); + g_signal_connect(menu_item, "activate", G_CALLBACK(scsistat_program_select), (gpointer)SCSI_DEV_SSC); gtk_widget_show(menu_item); gtk_menu_append(GTK_MENU(prog_menu), menu_item); /* MMC */ menu_item=gtk_menu_item_new_with_label("MMC (cd/dvd)"); - SIGNAL_CONNECT(menu_item, "activate", scsistat_program_select, SCSI_DEV_CDROM); + g_signal_connect(menu_item, "activate", G_CALLBACK(scsistat_program_select), (gpointer)SCSI_DEV_CDROM); gtk_widget_show(menu_item); gtk_menu_append(GTK_MENU(prog_menu), menu_item); @@ -382,13 +382,13 @@ gtk_scsistat_cb(GtkWidget *w _U_, gpointer d _U_) /* Filter label */ filter_bt=gtk_button_new_from_stock(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY); - SIGNAL_CONNECT(filter_bt, "clicked", display_filter_construct_cb, &args); + g_signal_connect(filter_bt, "clicked", G_CALLBACK(display_filter_construct_cb), &args); gtk_box_pack_start(GTK_BOX(filter_box), filter_bt, FALSE, FALSE, 0); gtk_widget_show(filter_bt); /* Filter entry */ filter_entry=gtk_entry_new(); - SIGNAL_CONNECT(filter_entry, "changed", filter_te_syntax_check_cb, NULL); + g_signal_connect(filter_entry, "changed", G_CALLBACK(filter_te_syntax_check_cb), NULL); /* filter prefs dialog */ g_object_set_data(G_OBJECT(filter_bt), E_FILT_TE_PTR_KEY, filter_entry); @@ -421,8 +421,8 @@ gtk_scsistat_cb(GtkWidget *w _U_, gpointer d _U_) gtk_widget_grab_default(start_button ); - SIGNAL_CONNECT(dlg, "delete_event", window_delete_event_cb, NULL); - SIGNAL_CONNECT(dlg, "destroy", dlg_destroy_cb, NULL); + g_signal_connect(dlg, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect(dlg, "destroy", G_CALLBACK(dlg_destroy_cb), NULL); gtk_widget_show_all(dlg); window_present(dlg); diff --git a/gtk/sctp_assoc_analyse.c b/gtk/sctp_assoc_analyse.c index 1355567a5e..20779cf6af 100644 --- a/gtk/sctp_assoc_analyse.c +++ b/gtk/sctp_assoc_analyse.c @@ -473,7 +473,7 @@ static void create_analyse_window(struct sctp_analyse* u_data) u_data->analyse_nb = g_malloc(sizeof(struct notes)); window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER); - SIGNAL_CONNECT(window, "destroy", on_destroy,u_data); + g_signal_connect(window, "destroy", G_CALLBACK(on_destroy), u_data); /* Container for each row of widgets */ main_vb = gtk_vbox_new(FALSE, 2); @@ -485,7 +485,7 @@ static void create_analyse_window(struct sctp_analyse* u_data) notebook = gtk_notebook_new(); gtk_container_add(GTK_CONTAINER(main_vb), notebook); g_object_set_data(G_OBJECT(window), "notebook", notebook); - SIGNAL_CONNECT(notebook, "switch_page", on_notebook_switch_page,NULL); + g_signal_connect(notebook, "switch_page", G_CALLBACK(on_notebook_switch_page), NULL); page1 = gtk_vbox_new(FALSE, 8); gtk_container_set_border_width(GTK_CONTAINER(page1), 8); @@ -540,17 +540,17 @@ static void create_analyse_window(struct sctp_analyse* u_data) chunk_stat_bt = gtk_button_new_with_label ("Chunk Statistics"); gtk_box_pack_start(GTK_BOX(hbox), chunk_stat_bt, FALSE, FALSE, 0); gtk_widget_show(chunk_stat_bt); - SIGNAL_CONNECT(chunk_stat_bt, "clicked", on_chunk_stat_bt, u_data); + g_signal_connect(chunk_stat_bt, "clicked", G_CALLBACK(on_chunk_stat_bt), u_data); bt_filter = gtk_button_new_with_label ("Set filter"); gtk_box_pack_start(GTK_BOX(hbox), bt_filter, FALSE, FALSE, 0); gtk_widget_show (bt_filter); - SIGNAL_CONNECT(bt_filter, "clicked", sctp_set_filter, u_data); + g_signal_connect(bt_filter, "clicked", G_CALLBACK(sctp_set_filter), u_data); close_bt = gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_box_pack_start(GTK_BOX(hbox), close_bt, FALSE, FALSE, 0); gtk_widget_show(close_bt); - SIGNAL_CONNECT(close_bt, "clicked", on_close_dlg, u_data); + g_signal_connect(close_bt, "clicked", G_CALLBACK(on_close_dlg), u_data); /* tab */ label = gtk_label_new(" Statistics "); @@ -644,17 +644,17 @@ static void create_analyse_window(struct sctp_analyse* u_data) chunk_bt1 = gtk_button_new_with_label("Chunk Statistics"); gtk_box_pack_start(GTK_BOX(h_button_box), chunk_bt1, FALSE, FALSE, 0); gtk_widget_show(chunk_bt1); - SIGNAL_CONNECT(chunk_bt1, "clicked", on_chunk1_dlg,u_data); + g_signal_connect(chunk_bt1, "clicked", G_CALLBACK(on_chunk1_dlg), u_data); graph_bt1 = gtk_button_new_with_label("Graph TSN"); gtk_box_pack_start(GTK_BOX(h_button_box), graph_bt1, FALSE, FALSE, 0); gtk_widget_show(graph_bt1); - SIGNAL_CONNECT(graph_bt1, "clicked", on_graph1_dlg,u_data); + g_signal_connect(graph_bt1, "clicked", G_CALLBACK(on_graph1_dlg), u_data); graph_bt2 = gtk_button_new_with_label("Graph Bytes"); gtk_box_pack_start(GTK_BOX(h_button_box), graph_bt2, FALSE, FALSE, 0); gtk_widget_show(graph_bt2); - SIGNAL_CONNECT(graph_bt2, "clicked", on_graph_byte1_dlg,u_data); + g_signal_connect(graph_bt2, "clicked", G_CALLBACK(on_graph_byte1_dlg), u_data); if (u_data->assoc->n_array_tsn1==0) { gtk_widget_set_sensitive(graph_bt1, FALSE); @@ -663,7 +663,7 @@ static void create_analyse_window(struct sctp_analyse* u_data) close_bt = gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_box_pack_start(GTK_BOX(h_button_box), close_bt, FALSE, FALSE, 0); gtk_widget_show(close_bt); - SIGNAL_CONNECT(close_bt, "clicked", on_close_dlg, u_data); + g_signal_connect(close_bt, "clicked", G_CALLBACK(on_close_dlg), u_data); label = gtk_label_new(" Endpoint 1 "); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), page2, label); @@ -752,16 +752,16 @@ static void create_analyse_window(struct sctp_analyse* u_data) chunk_bt1 = gtk_button_new_with_label("Chunk Statistics"); gtk_box_pack_start(GTK_BOX(h_button_box), chunk_bt1, FALSE, FALSE, 0); gtk_widget_show(chunk_bt1); - SIGNAL_CONNECT(chunk_bt1, "clicked", on_chunk2_dlg, u_data); + g_signal_connect(chunk_bt1, "clicked", G_CALLBACK(on_chunk2_dlg), u_data); graph_bt1 = gtk_button_new_with_label("Graph TSN"); gtk_box_pack_start(GTK_BOX(h_button_box), graph_bt1, FALSE, FALSE, 0); gtk_widget_show(graph_bt1); - SIGNAL_CONNECT(graph_bt1, "clicked", on_graph2_dlg, u_data); + g_signal_connect(graph_bt1, "clicked", G_CALLBACK(on_graph2_dlg), u_data); graph_bt2 = gtk_button_new_with_label("Graph Bytes"); gtk_box_pack_start(GTK_BOX(h_button_box), graph_bt2, FALSE, FALSE, 0); gtk_widget_show(graph_bt2); - SIGNAL_CONNECT(graph_bt2, "clicked", on_graph_byte2_dlg,u_data); + g_signal_connect(graph_bt2, "clicked", G_CALLBACK(on_graph_byte2_dlg), u_data); if (u_data->assoc->n_array_tsn2==0) { gtk_widget_set_sensitive(graph_bt1, FALSE); @@ -770,7 +770,7 @@ static void create_analyse_window(struct sctp_analyse* u_data) close_bt = gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_box_pack_start(GTK_BOX(h_button_box), close_bt, FALSE, FALSE, 0); gtk_widget_show(close_bt); - SIGNAL_CONNECT(close_bt, "clicked", on_close_dlg, u_data); + g_signal_connect(close_bt, "clicked", G_CALLBACK(on_close_dlg), u_data); label = gtk_label_new(" Endpoint 2 "); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), page3, label); diff --git a/gtk/sctp_byte_graph_dlg.c b/gtk/sctp_byte_graph_dlg.c index 5985291df3..da81208ce1 100644 --- a/gtk/sctp_byte_graph_dlg.c +++ b/gtk/sctp_byte_graph_dlg.c @@ -1070,24 +1070,24 @@ static void init_sctp_graph_window(struct sctp_udata *u_data) tsn_bt = gtk_button_new_with_label ("Data bytes sent"); gtk_box_pack_start(GTK_BOX(hbox), tsn_bt, FALSE, FALSE, 0); gtk_widget_show(tsn_bt); - SIGNAL_CONNECT(tsn_bt, "clicked", on_tsn_bt, u_data); + g_signal_connect(tsn_bt, "clicked", G_CALLBACK(on_tsn_bt), u_data); both_bt = gtk_button_new_with_label ("Show both"); gtk_box_pack_start(GTK_BOX(hbox), both_bt, FALSE, FALSE, 0); gtk_widget_show(both_bt); - SIGNAL_CONNECT(both_bt, "clicked", on_both_bt, u_data); + g_signal_connect(both_bt, "clicked", G_CALLBACK(on_both_bt), u_data); zoomin_bt = gtk_button_new_with_label ("Zoom in"); gtk_box_pack_start(GTK_BOX(hbox), zoomin_bt, FALSE, FALSE, 0); gtk_widget_show(zoomin_bt); - SIGNAL_CONNECT(zoomin_bt, "clicked", on_zoomin_bt, u_data); + g_signal_connect(zoomin_bt, "clicked", G_CALLBACK(on_zoomin_bt), u_data); tooltip_in = gtk_tooltips_new(); gtk_tooltips_set_tip(tooltip_in, zoomin_bt, "Zoom in the area you have selected", NULL); zoomout_bt = gtk_button_new_with_label ("Zoom out"); gtk_box_pack_start(GTK_BOX(hbox), zoomout_bt, FALSE, FALSE, 0); gtk_widget_show(zoomout_bt); - SIGNAL_CONNECT(zoomout_bt, "clicked", on_zoomout_bt, u_data); + g_signal_connect(zoomout_bt, "clicked", G_CALLBACK(on_zoomout_bt), u_data); tooltip_out = gtk_tooltips_new(); gtk_tooltips_set_tip(tooltip_out, zoomout_bt, "Zoom out one step", NULL); gtk_widget_set_sensitive(zoomout_bt, FALSE); @@ -1095,7 +1095,7 @@ static void init_sctp_graph_window(struct sctp_udata *u_data) bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_box_pack_start(GTK_BOX(hbox), bt_close, FALSE, FALSE, 0); gtk_widget_show(bt_close); - SIGNAL_CONNECT(bt_close, "clicked", sctp_graph_close_cb, u_data); + g_signal_connect(bt_close, "clicked", G_CALLBACK(sctp_graph_close_cb), u_data); gtk_signal_connect(GTK_OBJECT(u_data->io->draw_area),"button_press_event",(GtkSignalFunc)on_button_press, u_data); gtk_signal_connect(GTK_OBJECT(u_data->io->draw_area),"button_release_event",(GtkSignalFunc)on_button_release, u_data); @@ -1184,14 +1184,14 @@ quit(GtkObject *object _U_, gpointer user_data) static void create_draw_area(GtkWidget *box, struct sctp_udata *u_data) { u_data->io->draw_area=gtk_drawing_area_new(); - SIGNAL_CONNECT(u_data->io->draw_area, "destroy", quit, u_data); + g_signal_connect(u_data->io->draw_area, "destroy", G_CALLBACK(quit), u_data); g_object_set_data(G_OBJECT(u_data->io->draw_area), "sctp_graph_t", u_data->io); gtk_widget_set_size_request(u_data->io->draw_area, u_data->io->pixmap_width, u_data->io->pixmap_height); /* signals needed to handle backing pixmap */ - SIGNAL_CONNECT(u_data->io->draw_area, "expose_event", expose_event, NULL); - SIGNAL_CONNECT(u_data->io->draw_area, "configure_event", configure_event, u_data); + g_signal_connect(u_data->io->draw_area, "expose_event", G_CALLBACK(expose_event), NULL); + g_signal_connect(u_data->io->draw_area, "configure_event", G_CALLBACK(configure_event), u_data); gtk_widget_show(u_data->io->draw_area); gtk_box_pack_start(GTK_BOX(box), u_data->io->draw_area, TRUE, TRUE, 0); diff --git a/gtk/sctp_chunk_stat.c b/gtk/sctp_chunk_stat.c index a1b024e5c0..6a89cdf01a 100644 --- a/gtk/sctp_chunk_stat.c +++ b/gtk/sctp_chunk_stat.c @@ -331,8 +331,8 @@ sctpstat_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); + g_signal_connect(hs->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect(hs->win, "destroy", G_CALLBACK(win_destroy_cb), hs); gtk_widget_show_all(hs->win); window_present(hs->win); diff --git a/gtk/sctp_chunk_stat_dlg.c b/gtk/sctp_chunk_stat_dlg.c index b5168ed20b..5e21ba454d 100644 --- a/gtk/sctp_chunk_stat_dlg.c +++ b/gtk/sctp_chunk_stat_dlg.c @@ -227,7 +227,7 @@ gtk_sctpstat_dlg(struct sctp_udata *u_data, unsigned int direction) u_data->io->window= gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_position (GTK_WINDOW (u_data->io->window), GTK_WIN_POS_CENTER); path_window_set_title(u_data, direction); - SIGNAL_CONNECT(u_data->io->window, "destroy", chunk_dlg_destroy,u_data); + g_signal_connect(u_data->io->window, "destroy", G_CALLBACK(chunk_dlg_destroy), u_data); /* Container for each row of widgets */ vbox1 = gtk_vbox_new(FALSE, 2); @@ -322,7 +322,7 @@ gtk_sctpstat_dlg(struct sctp_udata *u_data, unsigned int direction) gtk_container_add (GTK_CONTAINER (hbuttonbox2), bt_close); gtk_widget_show (bt_close); - SIGNAL_CONNECT(bt_close, "clicked", sctp_chunk_stat_on_close, u_data); + g_signal_connect(bt_close, "clicked", G_CALLBACK(sctp_chunk_stat_on_close), u_data); cf_retap_packets(&cfile, FALSE); @@ -355,7 +355,7 @@ static void sctp_chunk_dlg(struct sctp_udata *u_data) u_data->io->window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_position (GTK_WINDOW (u_data->io->window), GTK_WIN_POS_CENTER); gtk_widget_set_size_request(u_data->io->window, 500, 400); - SIGNAL_CONNECT(u_data->io->window, "destroy", on_destroy,u_data); + g_signal_connect(u_data->io->window, "destroy", G_CALLBACK(on_destroy), u_data); /* Container for each row of widgets */ main_vb = gtk_vbox_new(FALSE, 12); @@ -439,7 +439,7 @@ static void sctp_chunk_dlg(struct sctp_udata *u_data) close_bt = gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_box_pack_start(GTK_BOX(h_button_box), close_bt, FALSE, FALSE, 0); gtk_widget_show(close_bt); - SIGNAL_CONNECT(close_bt, "clicked", on_close_dlg, u_data); + g_signal_connect(close_bt, "clicked", G_CALLBACK(on_close_dlg), u_data); gtk_widget_show_all(u_data->io->window); chunk_window_set_title(u_data); diff --git a/gtk/sctp_error_dlg.c b/gtk/sctp_error_dlg.c index f239521421..3b4838dfd8 100644 --- a/gtk/sctp_error_dlg.c +++ b/gtk/sctp_error_dlg.c @@ -154,7 +154,7 @@ gtk_sctperror_dlg(void) sctp_error_dlg_w = window_new (GTK_WINDOW_TOPLEVEL, "Wireshark: SCTP Associations"); gtk_window_set_position (GTK_WINDOW (sctp_error_dlg_w), GTK_WIN_POS_CENTER); - SIGNAL_CONNECT(sctp_error_dlg_w, "destroy", dlg_destroy,NULL); + g_signal_connect(sctp_error_dlg_w, "destroy", G_CALLBACK(dlg_destroy), NULL); /* Container for each row of widgets */ vbox1 = gtk_vbox_new(FALSE, 2); @@ -220,11 +220,11 @@ gtk_sctperror_dlg(void) gtk_widget_show (bt_close); gtk_container_add (GTK_CONTAINER (hbuttonbox2), bt_close); - SIGNAL_CONNECT(sctp_error_dlg_w, "destroy", dlg_destroy, NULL); - SIGNAL_CONNECT(clist, "select_row", sctp_error_on_select_row, NULL); - SIGNAL_CONNECT(bt_unselect, "clicked", sctp_error_on_unselect, NULL); - SIGNAL_CONNECT(bt_frame, "clicked", sctp_error_on_frame, NULL); - SIGNAL_CONNECT(bt_close, "clicked", sctp_error_on_close, NULL); + g_signal_connect(sctp_error_dlg_w, "destroy", G_CALLBACK(dlg_destroy), NULL); + g_signal_connect(clist, "select_row", G_CALLBACK(sctp_error_on_select_row), NULL); + g_signal_connect(bt_unselect, "clicked", G_CALLBACK(sctp_error_on_unselect), NULL); + g_signal_connect(bt_frame, "clicked", G_CALLBACK(sctp_error_on_frame), NULL); + g_signal_connect(bt_close, "clicked", G_CALLBACK(sctp_error_on_close), NULL); sctp_error_dlg = sctp_error_dlg_w; } diff --git a/gtk/sctp_graph_dlg.c b/gtk/sctp_graph_dlg.c index 502f556e9a..eec43798e1 100644 --- a/gtk/sctp_graph_dlg.c +++ b/gtk/sctp_graph_dlg.c @@ -1146,24 +1146,24 @@ static void init_sctp_graph_window(struct sctp_udata *u_data) tsn_bt = gtk_button_new_with_label ("Show TSNs"); gtk_box_pack_start(GTK_BOX(hbox), tsn_bt, FALSE, FALSE, 0); gtk_widget_show(tsn_bt); - SIGNAL_CONNECT(tsn_bt, "clicked", on_tsn_bt, u_data); + g_signal_connect(tsn_bt, "clicked", G_CALLBACK(on_tsn_bt), u_data); both_bt = gtk_button_new_with_label ("Show both"); gtk_box_pack_start(GTK_BOX(hbox), both_bt, FALSE, FALSE, 0); gtk_widget_show(both_bt); - SIGNAL_CONNECT(both_bt, "clicked", on_both_bt, u_data); + g_signal_connect(both_bt, "clicked", G_CALLBACK(on_both_bt), u_data); zoomin_bt = gtk_button_new_with_label ("Zoom in"); gtk_box_pack_start(GTK_BOX(hbox), zoomin_bt, FALSE, FALSE, 0); gtk_widget_show(zoomin_bt); - SIGNAL_CONNECT(zoomin_bt, "clicked", on_zoomin_bt, u_data); + g_signal_connect(zoomin_bt, "clicked", G_CALLBACK(on_zoomin_bt), u_data); tooltip_in = gtk_tooltips_new(); gtk_tooltips_set_tip(tooltip_in, zoomin_bt, "Zoom in the area you have selected", NULL); zoomout_bt = gtk_button_new_with_label ("Zoom out"); gtk_box_pack_start(GTK_BOX(hbox), zoomout_bt, FALSE, FALSE, 0); gtk_widget_show(zoomout_bt); - SIGNAL_CONNECT(zoomout_bt, "clicked", on_zoomout_bt, u_data); + g_signal_connect(zoomout_bt, "clicked", G_CALLBACK(on_zoomout_bt), u_data); tooltip_out = gtk_tooltips_new(); gtk_tooltips_set_tip(tooltip_out, zoomout_bt, "Zoom out one step", NULL); gtk_widget_set_sensitive(zoomout_bt, FALSE); @@ -1171,7 +1171,7 @@ static void init_sctp_graph_window(struct sctp_udata *u_data) bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_box_pack_start(GTK_BOX(hbox), bt_close, FALSE, FALSE, 0); gtk_widget_show(bt_close); - SIGNAL_CONNECT(bt_close, "clicked", sctp_graph_close_cb, u_data); + g_signal_connect(bt_close, "clicked", G_CALLBACK(sctp_graph_close_cb), u_data); gtk_signal_connect(GTK_OBJECT(u_data->io->draw_area),"button_press_event",(GtkSignalFunc)on_button_press, u_data); gtk_signal_connect(GTK_OBJECT(u_data->io->draw_area),"button_release_event",(GtkSignalFunc)on_button_release, u_data); @@ -1260,14 +1260,14 @@ static void create_draw_area(GtkWidget *box, struct sctp_udata *u_data) { u_data->io->draw_area=gtk_drawing_area_new(); - SIGNAL_CONNECT(u_data->io->draw_area, "destroy", quit, u_data); + g_signal_connect(u_data->io->draw_area, "destroy", G_CALLBACK(quit), u_data); g_object_set_data(G_OBJECT(u_data->io->draw_area), "sctp_graph_t", u_data->io); gtk_widget_set_size_request(u_data->io->draw_area, u_data->io->pixmap_width, u_data->io->pixmap_height); /* signals needed to handle backing pixmap */ - SIGNAL_CONNECT(u_data->io->draw_area, "expose_event", expose_event, NULL); - SIGNAL_CONNECT(u_data->io->draw_area, "configure_event", configure_event, u_data); + g_signal_connect(u_data->io->draw_area, "expose_event", G_CALLBACK(expose_event), NULL); + g_signal_connect(u_data->io->draw_area, "configure_event", G_CALLBACK(configure_event), u_data); gtk_widget_show(u_data->io->draw_area); gtk_box_pack_start(GTK_BOX(box), u_data->io->draw_area, TRUE, TRUE, 0); diff --git a/gtk/sctp_stat_dlg.c b/gtk/sctp_stat_dlg.c index 52b215bd67..a3476a349b 100644 --- a/gtk/sctp_stat_dlg.c +++ b/gtk/sctp_stat_dlg.c @@ -484,7 +484,7 @@ gtk_sctpstat_dlg(void) sctp_stat_dlg_w = window_new (GTK_WINDOW_TOPLEVEL, "Wireshark: SCTP Associations"); gtk_window_set_position (GTK_WINDOW (sctp_stat_dlg_w), GTK_WIN_POS_CENTER); - SIGNAL_CONNECT(sctp_stat_dlg_w, "destroy", dlg_destroy,NULL); + g_signal_connect(sctp_stat_dlg_w, "destroy", G_CALLBACK(dlg_destroy), NULL); /* Container for each row of widgets */ vbox1 = gtk_vbox_new(FALSE, 2); @@ -560,7 +560,7 @@ gtk_sctpstat_dlg(void) gtk_widget_show(col_arrows[i].table); } - SIGNAL_CONNECT(clist, "click-column", clist_click_column_cb, col_arrows); + g_signal_connect(clist, "click-column", G_CALLBACK(clist_click_column_cb), col_arrows); hbuttonbox2 = gtk_hbutton_box_new(); gtk_box_pack_start(GTK_BOX(vbox1), hbuttonbox2, FALSE, FALSE, 0); @@ -597,12 +597,12 @@ gtk_sctpstat_dlg(void) gtk_widget_grab_focus(bt_close); gtk_widget_show (bt_close); - SIGNAL_CONNECT(sctp_stat_dlg_w, "destroy", dlg_destroy, NULL); - SIGNAL_CONNECT(clist, "select_row", sctp_stat_on_select_row, NULL); - SIGNAL_CONNECT(bt_unselect, "clicked", sctp_stat_on_unselect, NULL); - SIGNAL_CONNECT(bt_filter, "clicked", sctp_stat_on_filter, NULL); - SIGNAL_CONNECT(bt_afilter, "clicked", sctp_stat_on_apply_filter, NULL); - SIGNAL_CONNECT(bt_analyse, "clicked", sctp_stat_on_analyse, NULL); + g_signal_connect(sctp_stat_dlg_w, "destroy", G_CALLBACK(dlg_destroy), NULL); + g_signal_connect(clist, "select_row", G_CALLBACK(sctp_stat_on_select_row), NULL); + g_signal_connect(bt_unselect, "clicked", G_CALLBACK(sctp_stat_on_unselect), NULL); + g_signal_connect(bt_filter, "clicked", G_CALLBACK(sctp_stat_on_filter), NULL); + g_signal_connect(bt_afilter, "clicked", G_CALLBACK(sctp_stat_on_apply_filter), NULL); + g_signal_connect(bt_analyse, "clicked", G_CALLBACK(sctp_stat_on_analyse), NULL); sctp_stat_dlg = sctp_stat_dlg_w; cf_retap_packets(&cfile, FALSE); diff --git a/gtk/service_response_time_table.c b/gtk/service_response_time_table.c index de798b293a..87ec08df6b 100644 --- a/gtk/service_response_time_table.c +++ b/gtk/service_response_time_table.c @@ -340,7 +340,7 @@ srt_create_popup_menu(srt_stat_table *rst) gtk_item_factory_create_items_ac(item_factory, sizeof(srt_list_menu_items)/sizeof(srt_list_menu_items[0]), srt_list_menu_items, rst, 2); rst->menu = gtk_item_factory_get_widget(item_factory, "<main>"); - SIGNAL_CONNECT(rst->table, "button_press_event", srt_show_popup_menu_cb, rst); + g_signal_connect(rst->table, "button_press_event", G_CALLBACK(srt_show_popup_menu_cb), rst); } @@ -416,7 +416,7 @@ init_srt_table(srt_stat_table *rst, int num_procs, GtkWidget *vbox, const char * gtk_clist_column_titles_show(rst->table); gtk_container_add(GTK_CONTAINER(rst->scrolled_window), (GtkWidget *)rst->table); - SIGNAL_CONNECT(rst->table, "click-column", srt_click_column_cb, col_arrows); + g_signal_connect(rst->table, "click-column", G_CALLBACK(srt_click_column_cb), col_arrows); gtk_widget_show(GTK_WIDGET(rst->table)); gtk_widget_show(rst->scrolled_window); diff --git a/gtk/simple_dialog.c b/gtk/simple_dialog.c index 2f023c0651..2617a33679 100644 --- a/gtk/simple_dialog.c +++ b/gtk/simple_dialog.c @@ -223,36 +223,36 @@ display_simple_dialog(gint type, gint btn_mask, char *message) ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK); if(ok_bt) { g_object_set_data(G_OBJECT(ok_bt), CALLBACK_BTN_KEY, GINT_TO_POINTER(ESD_BTN_OK)); - SIGNAL_CONNECT(ok_bt, "clicked", simple_dialog_cancel_cb, win); + g_signal_connect(ok_bt, "clicked", G_CALLBACK(simple_dialog_cancel_cb), win); } save_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_SAVE); if (save_bt) { g_object_set_data(G_OBJECT(save_bt), CALLBACK_BTN_KEY, GINT_TO_POINTER(ESD_BTN_SAVE)); - SIGNAL_CONNECT(save_bt, "clicked", simple_dialog_cancel_cb, win); + g_signal_connect(save_bt, "clicked", G_CALLBACK(simple_dialog_cancel_cb), win); } dont_save_bt = g_object_get_data(G_OBJECT(bbox), WIRESHARK_STOCK_DONT_SAVE); if (dont_save_bt) { g_object_set_data(G_OBJECT(dont_save_bt), CALLBACK_BTN_KEY, GINT_TO_POINTER(ESD_BTN_DONT_SAVE)); - SIGNAL_CONNECT(dont_save_bt, "clicked", simple_dialog_cancel_cb, win); + g_signal_connect(dont_save_bt, "clicked", G_CALLBACK(simple_dialog_cancel_cb), win); } bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLEAR); if(bt) { g_object_set_data(G_OBJECT(bt), CALLBACK_BTN_KEY, GINT_TO_POINTER(ESD_BTN_CLEAR)); - SIGNAL_CONNECT(bt, "clicked", simple_dialog_cancel_cb, win); + g_signal_connect(bt, "clicked", G_CALLBACK(simple_dialog_cancel_cb), win); } yes_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_YES); if(yes_bt) { g_object_set_data(G_OBJECT(yes_bt), CALLBACK_BTN_KEY, GINT_TO_POINTER(ESD_BTN_YES)); - SIGNAL_CONNECT(yes_bt, "clicked", simple_dialog_cancel_cb, win); + g_signal_connect(yes_bt, "clicked", G_CALLBACK(simple_dialog_cancel_cb), win); } bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_NO); if(bt) { g_object_set_data(G_OBJECT(bt), CALLBACK_BTN_KEY, GINT_TO_POINTER(ESD_BTN_NO)); - SIGNAL_CONNECT(bt, "clicked", simple_dialog_cancel_cb, win); + g_signal_connect(bt, "clicked", G_CALLBACK(simple_dialog_cancel_cb), win); } bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL); diff --git a/gtk/sip_stat.c b/gtk/sip_stat.c index 6436473b33..c6cb28f655 100644 --- a/gtk/sip_stat.c +++ b/gtk/sip_stat.c @@ -646,8 +646,8 @@ gtk_sipstat_init(const char *optarg, void *userdata _U_) bt_close = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE); window_set_cancel_button(sp->win, bt_close, window_cancel_button_cb); - SIGNAL_CONNECT(sp->win, "delete_event", window_delete_event_cb, NULL); - SIGNAL_CONNECT(sp->win, "destroy", win_destroy_cb, sp); + g_signal_connect(sp->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect(sp->win, "destroy", G_CALLBACK(win_destroy_cb), sp); /* Display up-to-date contents */ gtk_widget_show_all(sp->win); diff --git a/gtk/smb2_stat.c b/gtk/smb2_stat.c index a38b24d297..f0c11a2d2f 100644 --- a/gtk/smb2_stat.c +++ b/gtk/smb2_stat.c @@ -193,8 +193,8 @@ gtk_smb2stat_init(const char *optarg, void *userdata _U_) close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE); window_set_cancel_button(ss->win, close_bt, window_cancel_button_cb); - SIGNAL_CONNECT(ss->win, "delete_event", window_delete_event_cb, NULL); - SIGNAL_CONNECT(ss->win, "destroy", win_destroy_cb, ss); + g_signal_connect(ss->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect(ss->win, "destroy", G_CALLBACK(win_destroy_cb), ss); gtk_widget_show_all(ss->win); window_present(ss->win); diff --git a/gtk/smb_stat.c b/gtk/smb_stat.c index 9cef146bb2..c57ec36e11 100644 --- a/gtk/smb_stat.c +++ b/gtk/smb_stat.c @@ -232,8 +232,8 @@ gtk_smbstat_init(const char *optarg, void *userdata _U_) close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE); window_set_cancel_button(ss->win, close_bt, window_cancel_button_cb); - SIGNAL_CONNECT(ss->win, "delete_event", window_delete_event_cb, NULL); - SIGNAL_CONNECT(ss->win, "destroy", win_destroy_cb, ss); + g_signal_connect(ss->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect(ss->win, "destroy", G_CALLBACK(win_destroy_cb), ss); gtk_widget_show_all(ss->win); window_present(ss->win); diff --git a/gtk/stats_tree_stat.c b/gtk/stats_tree_stat.c index 27588475b5..a6084e946a 100644 --- a/gtk/stats_tree_stat.c +++ b/gtk/stats_tree_stat.c @@ -309,8 +309,8 @@ static void init_gtk_tree(const char* optarg, void *userdata _U_) { bt_close = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE); window_set_cancel_button(st->pr->win, bt_close, window_cancel_button_cb); - SIGNAL_CONNECT(GTK_WINDOW(st->pr->win), "delete_event", window_delete_event_cb, NULL); - SIGNAL_CONNECT(GTK_WINDOW(st->pr->win), "destroy", free_gtk_tree, st); + g_signal_connect(GTK_WINDOW(st->pr->win), "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect(GTK_WINDOW(st->pr->win), "destroy", G_CALLBACK(free_gtk_tree), st); gtk_widget_show_all(st->pr->win); window_present(st->pr->win); diff --git a/gtk/stream_prefs.c b/gtk/stream_prefs.c index 4809c40bf0..198e569075 100644 --- a/gtk/stream_prefs.c +++ b/gtk/stream_prefs.c @@ -107,7 +107,7 @@ stream_prefs_show() for (i = 0; i < mcount; i++){ menuitem = gtk_menu_item_new_with_label (mt[i]); g_object_set_data(G_OBJECT(menuitem), STREAM_CS_KEY, colorsel); - SIGNAL_CONNECT(menuitem, "activate", update_current_color, &tcolors[i]); + g_signal_connect(menuitem, "activate", G_CALLBACK(update_current_color), &tcolors[i]); gtk_widget_show (menuitem); gtk_menu_append (GTK_MENU (menu), menuitem); } @@ -147,7 +147,7 @@ stream_prefs_show() GTK_SHRINK, GTK_SHRINK, 0, 0); g_object_set_data(G_OBJECT(colorsel), STREAM_SAMPLE_KEY, sample); - SIGNAL_CONNECT(colorsel, "color-changed", update_text_color, NULL); + g_signal_connect(colorsel, "color-changed", G_CALLBACK(update_text_color), NULL); gtk_widget_show(colorsel); gtk_widget_show(main_vb); diff --git a/gtk/summary_dlg.c b/gtk/summary_dlg.c index d43ddd15d7..a9dfdc9d42 100644 --- a/gtk/summary_dlg.c +++ b/gtk/summary_dlg.c @@ -418,12 +418,12 @@ summary_open_cb(GtkWidget *w _U_, gpointer d _U_) if(topic_available(HELP_STATS_SUMMARY_DIALOG)) { help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); - SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_STATS_SUMMARY_DIALOG); + g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_STATS_SUMMARY_DIALOG); } gtk_widget_grab_focus(close_bt); - SIGNAL_CONNECT(sum_open_w, "delete_event", window_delete_event_cb, NULL); + g_signal_connect(sum_open_w, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); gtk_widget_show_all(sum_open_w); window_present(sum_open_w); diff --git a/gtk/supported_protos_dlg.c b/gtk/supported_protos_dlg.c index a8c084ee70..d288de013c 100644 --- a/gtk/supported_protos_dlg.c +++ b/gtk/supported_protos_dlg.c @@ -163,8 +163,8 @@ void supported_cb(GtkWidget *w _U_, gpointer data _U_) gtk_quit_add_destroy(gtk_main_level(), GTK_OBJECT(supported_w)); - SIGNAL_CONNECT(supported_w, "delete_event", window_delete_event_cb, NULL); - SIGNAL_CONNECT(supported_w, "destroy", supported_destroy_cb, NULL); + g_signal_connect(supported_w, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect(supported_w, "destroy", G_CALLBACK(supported_destroy_cb), NULL); gtk_widget_show(supported_w); window_present(supported_w); diff --git a/gtk/tap_dfilter_dlg.c b/gtk/tap_dfilter_dlg.c index 0e8befb0cb..ae94ad6f50 100644 --- a/gtk/tap_dfilter_dlg.c +++ b/gtk/tap_dfilter_dlg.c @@ -202,13 +202,13 @@ tap_dfilter_dlg_cb(GtkWidget *w _U_, gpointer data) /* Filter button */ filter_bt=gtk_button_new_from_stock(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY); - SIGNAL_CONNECT(filter_bt, "clicked", display_filter_construct_cb, &(current_dlg->args)); + g_signal_connect(filter_bt, "clicked", G_CALLBACK(display_filter_construct_cb), &(current_dlg->args)); gtk_box_pack_start(GTK_BOX(filter_box), filter_bt, FALSE, TRUE, 0); gtk_widget_show(filter_bt); /* Filter entry */ current_dlg->filter_entry=gtk_entry_new(); - SIGNAL_CONNECT(current_dlg->filter_entry, "changed", filter_te_syntax_check_cb, NULL); + g_signal_connect(current_dlg->filter_entry, "changed", G_CALLBACK(filter_te_syntax_check_cb), NULL); /* filter prefs dialog */ g_object_set_data(G_OBJECT(filter_bt), E_FILT_TE_PTR_KEY, current_dlg->filter_entry); @@ -230,8 +230,8 @@ tap_dfilter_dlg_cb(GtkWidget *w _U_, gpointer data) gtk_widget_show(bbox); start_button = g_object_get_data(G_OBJECT(bbox), WIRESHARK_STOCK_CREATE_STAT); - SIGNAL_CONNECT(start_button, "clicked", - tap_dfilter_dlg_start_button_clicked, current_dlg); + g_signal_connect(start_button, "clicked", + G_CALLBACK(tap_dfilter_dlg_start_button_clicked), current_dlg); cancel_button = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL); window_set_cancel_button(current_dlg->dlg, cancel_button, window_cancel_button_cb); @@ -248,8 +248,8 @@ tap_dfilter_dlg_cb(GtkWidget *w _U_, gpointer data) gtk_widget_grab_default(start_button ); - SIGNAL_CONNECT(current_dlg->dlg, "delete_event", window_delete_event_cb, NULL); - SIGNAL_CONNECT(current_dlg->dlg, "destroy", dlg_destroy_cb, current_dlg); + g_signal_connect(current_dlg->dlg, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect(current_dlg->dlg, "destroy", G_CALLBACK(dlg_destroy_cb), current_dlg); gtk_widget_show_all(current_dlg->dlg); window_present(current_dlg->dlg); diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c index 115daf0e9f..da0fa6fb73 100644 --- a/gtk/tcp_graph.c +++ b/gtk/tcp_graph.c @@ -664,26 +664,26 @@ static void create_drawing_area (struct graph *g) g->wp.height + g->wp.y + g->x_axis->s.height); gtk_widget_show (g->drawing_area); - SIGNAL_CONNECT(g->drawing_area, "expose_event", expose_event, NULL); + g_signal_connect(g->drawing_area, "expose_event", G_CALLBACK(expose_event), NULL); /* this has to be done later, after the widget has been shown */ /* - SIGNAL_CONNECT(g->drawing_area,"configure_event", configure_event, + g_signal_connect(g->drawing_area,"configure_event", G_CALLBACK(configure_event), NULL); */ - SIGNAL_CONNECT(g->drawing_area, "motion_notify_event", - motion_notify_event, NULL); - SIGNAL_CONNECT(g->drawing_area, "button_press_event", - button_press_event, NULL); - SIGNAL_CONNECT(g->drawing_area, "button_release_event", - button_release_event, NULL); - SIGNAL_CONNECT(g->drawing_area, "leave_notify_event", - leave_notify_event, NULL); - SIGNAL_CONNECT(g->drawing_area, "enter_notify_event", - enter_notify_event, NULL); - SIGNAL_CONNECT(g->toplevel, "destroy", callback_toplevel_destroy, g); + g_signal_connect(g->drawing_area, "motion_notify_event", + G_CALLBACK(motion_notify_event), NULL); + g_signal_connect(g->drawing_area, "button_press_event", + G_CALLBACK(button_press_event), NULL); + g_signal_connect(g->drawing_area, "button_release_event", + G_CALLBACK(button_release_event), NULL); + g_signal_connect(g->drawing_area, "leave_notify_event", + G_CALLBACK(leave_notify_event), NULL); + g_signal_connect(g->drawing_area, "enter_notify_event", + G_CALLBACK(enter_notify_event), NULL); + g_signal_connect(g->toplevel, "destroy", G_CALLBACK(callback_toplevel_destroy), g); /* why doesn't drawing area send key_press_signals? */ - SIGNAL_CONNECT(g->toplevel, "key_press_event", key_press_event, NULL); - SIGNAL_CONNECT(g->toplevel, "key_release_event", key_release_event, + g_signal_connect(g->toplevel, "key_press_event", G_CALLBACK(key_press_event), NULL); + g_signal_connect(g->toplevel, "key_release_event", G_CALLBACK(key_release_event), NULL); gtk_widget_set_events(g->toplevel, GDK_KEY_PRESS_MASK|GDK_KEY_RELEASE_MASK); @@ -773,7 +773,7 @@ static void create_drawing_area (struct graph *g) * !!! NEMĚLO BY TO BÝT NA KONCI graph_init_sequence()? !!! * */ - SIGNAL_CONNECT(g->drawing_area,"configure_event", configure_event, + g_signal_connect(g->drawing_area,"configure_event", G_CALLBACK(configure_event), NULL); /* puts ("exiting create_drawing_area()"); */ @@ -823,14 +823,14 @@ static void control_panel_create (struct graph *g) GTK_FILL|GTK_EXPAND, GTK_FILL, 5, 5); help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); - SIGNAL_CONNECT(help_bt, "clicked", callback_create_help, g); + g_signal_connect(help_bt, "clicked", G_CALLBACK(callback_create_help), g); close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE); window_set_cancel_button(toplevel, close_bt, NULL); - SIGNAL_CONNECT(close_bt, "clicked", callback_close, g); + g_signal_connect(close_bt, "clicked", G_CALLBACK(callback_close), g); - SIGNAL_CONNECT(toplevel, "delete_event", callback_delete_event, g); - SIGNAL_CONNECT(toplevel, "destroy", callback_toplevel_destroy, g); + g_signal_connect(toplevel, "delete_event", G_CALLBACK(callback_delete_event), g); + g_signal_connect(toplevel, "destroy", G_CALLBACK(callback_toplevel_destroy), g); /* gtk_widget_show_all (table); */ /* g->gui.control_panel = table; */ @@ -905,8 +905,8 @@ static void control_panel_add_origin_page (struct graph *g, GtkWidget *n) g->gui.time_orig_conn = (GtkToggleButton * )time_orig_conn; g->gui.seq_orig_isn = (GtkToggleButton * )seq_orig_isn; - SIGNAL_CONNECT(time_orig_conn, "toggled", callback_time_origin, g); - SIGNAL_CONNECT(seq_orig_isn, "toggled", callback_seq_origin, g); + g_signal_connect(time_orig_conn, "toggled", G_CALLBACK(callback_time_origin), g); + g_signal_connect(seq_orig_isn, "toggled", G_CALLBACK(callback_seq_origin), g); box = gtk_vbox_new (FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (box), 5); @@ -986,7 +986,7 @@ static void callback_create_help(GtkWidget *widget _U_, gpointer data _U_) close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE); window_set_cancel_button(toplevel, close_bt, window_cancel_button_cb); - SIGNAL_CONNECT(toplevel, "delete_event", window_delete_event_cb, NULL); + g_signal_connect(toplevel, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); gtk_widget_show_all (toplevel); window_present(toplevel); @@ -1066,8 +1066,8 @@ static GtkWidget *control_panel_create_zoom_group (struct graph *g) g_object_set_data(G_OBJECT(zoom_same_toggle), "flag", (gpointer)ZOOM_STEPS_SAME); g_object_set_data(G_OBJECT(zoom_ratio_toggle), "flag", (gpointer)ZOOM_STEPS_KEEP_RATIO); - SIGNAL_CONNECT(zoom_same_toggle, "clicked", callback_zoom_flags, g); - SIGNAL_CONNECT(zoom_ratio_toggle, "clicked", callback_zoom_flags, g); + g_signal_connect(zoom_same_toggle, "clicked", G_CALLBACK(callback_zoom_flags), g); + g_signal_connect(zoom_ratio_toggle, "clicked", G_CALLBACK(callback_zoom_flags), g); zoom_step_table = gtk_table_new (4, 2, FALSE); gtk_table_attach (GTK_TABLE (zoom_step_table), zoom_h_step_label, 0,1,0,1, @@ -1095,9 +1095,9 @@ static GtkWidget *control_panel_create_zoom_group (struct graph *g) g_object_set_data(G_OBJECT(zoom_h_step), "direction", GINT_TO_POINTER(0)); g_object_set_data(G_OBJECT(zoom_v_step), "direction", GINT_TO_POINTER(1)); - SIGNAL_CONNECT(zoom_in, "toggled", callback_zoom_inout, g); - SIGNAL_CONNECT(zoom_h_step, "changed", callback_zoom_step, g); - SIGNAL_CONNECT(zoom_v_step, "changed", callback_zoom_step, g); + g_signal_connect(zoom_in, "toggled", G_CALLBACK(callback_zoom_inout), g); + g_signal_connect(zoom_h_step, "changed", G_CALLBACK(callback_zoom_step), g); + g_signal_connect(zoom_v_step, "changed", G_CALLBACK(callback_zoom_step), g); g->zoom.widget.in_toggle = (GtkToggleButton * )zoom_in; g->zoom.widget.out_toggle = (GtkToggleButton * )zoom_out; @@ -1270,14 +1270,14 @@ static GtkWidget *control_panel_create_magnify_group (struct graph *g) g_object_set_data(G_OBJECT(mag_zoom_same), "flag", (gpointer)MAGZOOMS_SAME); g_object_set_data(G_OBJECT(mag_zoom_ratio), "flag", (gpointer)MAGZOOMS_SAME_RATIO); - SIGNAL_CONNECT(mag_width, "changed", callback_mag_width, g); - SIGNAL_CONNECT(mag_height, "changed", callback_mag_height, g); - SIGNAL_CONNECT(mag_x, "changed", callback_mag_x, g); - SIGNAL_CONNECT(mag_y, "changed", callback_mag_y, g); - SIGNAL_CONNECT(mag_h_zoom, "changed", callback_mag_zoom, g); - SIGNAL_CONNECT(mag_v_zoom, "changed", callback_mag_zoom, g); - SIGNAL_CONNECT(mag_zoom_same, "clicked", callback_mag_flags, g); - SIGNAL_CONNECT(mag_zoom_ratio, "clicked", callback_mag_flags, g); + g_signal_connect(mag_width, "changed", G_CALLBACK(callback_mag_width), g); + g_signal_connect(mag_height, "changed", G_CALLBACK(callback_mag_height), g); + g_signal_connect(mag_x, "changed", G_CALLBACK(callback_mag_x), g); + g_signal_connect(mag_y, "changed", G_CALLBACK(callback_mag_y), g); + g_signal_connect(mag_h_zoom, "changed", G_CALLBACK(callback_mag_zoom), g); + g_signal_connect(mag_v_zoom, "changed", G_CALLBACK(callback_mag_zoom), g); + g_signal_connect(mag_zoom_same, "clicked", G_CALLBACK(callback_mag_flags), g); + g_signal_connect(mag_zoom_ratio, "clicked", G_CALLBACK(callback_mag_flags), g); return mag_frame; } @@ -1396,8 +1396,8 @@ static GtkWidget *control_panel_create_zoomlock_group (struct graph *g) zoom_lock_frame = gtk_frame_new ("Zoom lock:"); gtk_container_add (GTK_CONTAINER (zoom_lock_frame), zoom_lock_box); - SIGNAL_CONNECT(zoom_lock_h, "toggled", callback_zoomlock_h, g); - SIGNAL_CONNECT(zoom_lock_v, "toggled", callback_zoomlock_v, g); + g_signal_connect(zoom_lock_h, "toggled", G_CALLBACK(callback_zoomlock_h), g); + g_signal_connect(zoom_lock_v, "toggled", G_CALLBACK(callback_zoomlock_v), g); return zoom_lock_frame; } @@ -1441,7 +1441,7 @@ static GtkWidget *control_panel_create_cross_group (struct graph *g) frame = gtk_frame_new (NULL); gtk_container_add (GTK_CONTAINER (frame), vbox); - SIGNAL_CONNECT(on, "toggled", callback_cross_on_off, g); + g_signal_connect(on, "toggled", G_CALLBACK(callback_cross_on_off), g); g->cross.on_toggle = (GtkToggleButton * )on; g->cross.off_toggle = (GtkToggleButton * )off; @@ -1512,11 +1512,11 @@ static GtkWidget *control_panel_create_graph_type_group (struct graph *g) g_object_set_data(G_OBJECT(graph_tput), "new-graph-type", GINT_TO_POINTER(2)); g_object_set_data(G_OBJECT(graph_rtt), "new-graph-type", GINT_TO_POINTER(3)); - SIGNAL_CONNECT(graph_tseqttrace, "toggled", callback_graph_type, g); - SIGNAL_CONNECT(graph_tseqstevens, "toggled", callback_graph_type, g); - SIGNAL_CONNECT(graph_tput, "toggled", callback_graph_type, g); - SIGNAL_CONNECT(graph_rtt, "toggled", callback_graph_type, g); - SIGNAL_CONNECT(graph_init, "toggled", callback_graph_init_on_typechg, + g_signal_connect(graph_tseqttrace, "toggled", G_CALLBACK(callback_graph_type), g); + g_signal_connect(graph_tseqstevens, "toggled", G_CALLBACK(callback_graph_type), g); + g_signal_connect(graph_tput, "toggled", G_CALLBACK(callback_graph_type), g); + g_signal_connect(graph_rtt, "toggled", G_CALLBACK(callback_graph_type), g); + g_signal_connect(graph_init, "toggled", G_CALLBACK(callback_graph_init_on_typechg), g); return graph_frame; diff --git a/gtk/uat_gui.c b/gtk/uat_gui.c index 6c2bd07cc1..f3dc57306a 100644 --- a/gtk/uat_gui.c +++ b/gtk/uat_gui.c @@ -124,12 +124,12 @@ static void set_buttons(uat_t* uat, gint row) { if (uat->changed) { g_signal_handlers_disconnect_by_func(uat->rep->window, uat_window_delete_event_cb, uat); - SIGNAL_CONNECT(uat->rep->window, "delete_event", unsaved_dialog, uat); - SIGNAL_CONNECT(uat->rep->window, "destroy", unsaved_dialog, uat); + g_signal_connect(uat->rep->window, "delete_event", G_CALLBACK(unsaved_dialog), uat); + g_signal_connect(uat->rep->window, "destroy", G_CALLBACK(unsaved_dialog), uat); } else { g_signal_handlers_disconnect_by_func(uat->rep->window, unsaved_dialog, uat); - SIGNAL_CONNECT(GTK_WINDOW(uat->rep->window), "delete_event", uat_window_delete_event_cb, uat); - SIGNAL_CONNECT(GTK_WINDOW(uat->rep->window), "destroy", uat_window_delete_event_cb, uat); + g_signal_connect(GTK_WINDOW(uat->rep->window), "delete_event", G_CALLBACK(uat_window_delete_event_cb), uat); + g_signal_connect(GTK_WINDOW(uat->rep->window), "destroy", G_CALLBACK(uat_window_delete_event_cb), uat); } } @@ -475,8 +475,8 @@ static void uat_edit_dialog(uat_t* uat, gint row) { *((char const**)valptr) = str; } - SIGNAL_CONNECT(menu_item, "activate", fld_menu_item_cb, md); - SIGNAL_CONNECT(menu_item, "destroy", fld_menu_item_destroy_cb, md); + g_signal_connect(menu_item, "activate", G_CALLBACK(fld_menu_item_cb), md); + g_signal_connect(menu_item, "destroy", G_CALLBACK(fld_menu_item_destroy_cb), md); } g_ptr_array_add(dd->entries,valptr); @@ -504,10 +504,10 @@ static void uat_edit_dialog(uat_t* uat, gint row) { gtk_box_pack_end(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", uat_dlg_cb, dd); + g_signal_connect(bt_ok, "clicked", G_CALLBACK(uat_dlg_cb), dd); bt_cancel = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL); - SIGNAL_CONNECT(bt_cancel, "clicked", uat_cancel_dlg_cb, dd); + g_signal_connect(bt_cancel, "clicked", G_CALLBACK(uat_cancel_dlg_cb), dd); window_set_cancel_button(win, bt_cancel, NULL); gtk_widget_show_all(win); @@ -587,10 +587,10 @@ static void uat_del_dlg(uat_t* uat, int idx) { gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 0); bt_ok = g_object_get_data(G_OBJECT(bbox),GTK_STOCK_DELETE); - SIGNAL_CONNECT(bt_ok, "clicked", uat_del_cb, ud); + g_signal_connect(bt_ok, "clicked", G_CALLBACK(uat_del_cb), ud); bt_cancel = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL); - SIGNAL_CONNECT(bt_cancel, "clicked", uat_cancel_del_cb, ud); + g_signal_connect(bt_cancel, "clicked", G_CALLBACK(uat_cancel_del_cb), ud); window_set_cancel_button( win, bt_cancel, NULL); gtk_widget_show_all(win); @@ -795,8 +795,8 @@ static gboolean unsaved_dialog(GtkWindow *w _U_, GdkEvent* e _U_, gpointer u) { yes_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_YES); no_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_NO); - SIGNAL_CONNECT(no_bt, "clicked", uat_nosave_cb, uat); - SIGNAL_CONNECT(yes_bt, "clicked", uat_yessave_cb, uat); + g_signal_connect(no_bt, "clicked", G_CALLBACK(uat_nosave_cb), uat); + g_signal_connect(yes_bt, "clicked", G_CALLBACK(uat_yessave_cb), uat); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 0); @@ -874,7 +874,7 @@ static GtkWidget* uat_window(void* u) { GtkWidget* help_btn; rep->bbox = dlg_button_row_new(GTK_STOCK_HELP, GTK_STOCK_OK, GTK_STOCK_APPLY, GTK_STOCK_CANCEL, NULL); help_btn = g_object_get_data(G_OBJECT(rep->bbox),GTK_STOCK_HELP); - SIGNAL_CONNECT(help_btn, "clicked", uat_help_cb, uat); + g_signal_connect(help_btn, "clicked", G_CALLBACK(uat_help_cb), uat); } else { rep->bbox = dlg_button_row_new(GTK_STOCK_OK, GTK_STOCK_APPLY, GTK_STOCK_CANCEL, NULL); @@ -915,27 +915,27 @@ static GtkWidget* uat_window(void* u) { gtk_widget_set_sensitive (rep->bt_delete, FALSE); - SIGNAL_CONNECT(rep->selection, "changed", remember_selected_row, uat); + g_signal_connect(rep->selection, "changed", G_CALLBACK(remember_selected_row), uat); - SIGNAL_CONNECT(rep->bt_new, "clicked", uat_new_cb, uat); - SIGNAL_CONNECT(rep->bt_edit, "clicked", uat_edit_cb, uat); - SIGNAL_CONNECT(rep->bt_delete, "clicked", uat_delete_cb, uat); + g_signal_connect(rep->bt_new, "clicked", G_CALLBACK(uat_new_cb), uat); + g_signal_connect(rep->bt_edit, "clicked", G_CALLBACK(uat_edit_cb), uat); + g_signal_connect(rep->bt_delete, "clicked", G_CALLBACK(uat_delete_cb), uat); - SIGNAL_CONNECT(rep->bt_up, "clicked", uat_up_cb, uat); - SIGNAL_CONNECT(rep->bt_down, "clicked", uat_down_cb, uat); + g_signal_connect(rep->bt_up, "clicked", G_CALLBACK(uat_up_cb), uat); + g_signal_connect(rep->bt_down, "clicked", G_CALLBACK(uat_down_cb), uat); - SIGNAL_CONNECT(rep->bt_apply, "clicked", uat_apply_cb, uat); - SIGNAL_CONNECT(rep->bt_cancel, "clicked", uat_cancel_cb, uat); - SIGNAL_CONNECT(rep->bt_ok, "clicked", uat_ok_cb, uat); + g_signal_connect(rep->bt_apply, "clicked", G_CALLBACK(uat_apply_cb), uat); + g_signal_connect(rep->bt_cancel, "clicked", G_CALLBACK(uat_cancel_cb), uat); + g_signal_connect(rep->bt_ok, "clicked", G_CALLBACK(uat_ok_cb), uat); window_set_cancel_button(rep->window, rep->bt_cancel, NULL); /* set esc to activate cancel button */ if (uat->changed) { - SIGNAL_CONNECT(GTK_WINDOW(rep->window), "delete_event", unsaved_dialog, uat); - SIGNAL_CONNECT(GTK_WINDOW(rep->window), "destroy", unsaved_dialog, uat); + g_signal_connect(GTK_WINDOW(rep->window), "delete_event", G_CALLBACK(unsaved_dialog), uat); + g_signal_connect(GTK_WINDOW(rep->window), "destroy", G_CALLBACK(unsaved_dialog), uat); } else { - SIGNAL_CONNECT(GTK_WINDOW(rep->window), "delete_event", uat_window_delete_event_cb, uat); - SIGNAL_CONNECT(GTK_WINDOW(rep->window), "destroy", uat_window_delete_event_cb, uat); + g_signal_connect(GTK_WINDOW(rep->window), "delete_event", G_CALLBACK(uat_window_delete_event_cb), uat); + g_signal_connect(GTK_WINDOW(rep->window), "destroy", G_CALLBACK(uat_window_delete_event_cb), uat); } gtk_widget_grab_focus(rep->clist); diff --git a/gtk/voip_calls_dlg.c b/gtk/voip_calls_dlg.c index 3f1fd15562..5fb16122be 100644 --- a/gtk/voip_calls_dlg.c +++ b/gtk/voip_calls_dlg.c @@ -746,7 +746,7 @@ static void voip_calls_dlg_create (void) gtk_widget_show(col_arrows[i].table); } - SIGNAL_CONNECT(clist, "click-column", voip_calls_click_column_cb, col_arrows); + g_signal_connect(clist, "click-column", G_CALLBACK(voip_calls_click_column_cb), col_arrows); /* label_fwd = gtk_label_new (FWD_LABEL_TEXT); gtk_box_pack_start (GTK_BOX (main_vb), label_fwd, FALSE, FALSE, 0); @@ -771,14 +771,14 @@ static void voip_calls_dlg_create (void) bt_graph = gtk_button_new_with_label("Graph"); gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_graph); gtk_widget_show(bt_graph); - SIGNAL_CONNECT(bt_graph, "clicked", on_graph_bt_clicked, NULL); + g_signal_connect(bt_graph, "clicked", G_CALLBACK(on_graph_bt_clicked), NULL); gtk_tooltips_set_tip (tooltips, bt_graph, "Show a flow graph of the selected calls.", NULL); #ifdef HAVE_LIBPORTAUDIO bt_player = gtk_button_new_with_label("Player"); gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_player); gtk_widget_show(bt_player); - SIGNAL_CONNECT(bt_player, "clicked", on_player_bt_clicked, NULL); + g_signal_connect(bt_player, "clicked", G_CALLBACK(on_player_bt_clicked), NULL); gtk_tooltips_set_tip (tooltips, bt_player, "Launch the RTP player to listen the selected calls.", NULL); #endif /* HAVE_LIBPORTAUDIO */ @@ -792,16 +792,16 @@ static void voip_calls_dlg_create (void) GTK_WIDGET_SET_FLAGS(bt_close, GTK_CAN_DEFAULT); gtk_tooltips_set_tip (tooltips, bt_close, "Close this dialog", NULL); - SIGNAL_CONNECT(clist, "select_row", voip_calls_on_select_row, NULL); - SIGNAL_CONNECT(clist, "unselect_row", voip_calls_on_unselect_row, NULL); - /*SIGNAL_CONNECT(bt_unselect, "clicked", voip_calls_on_unselect, NULL);*/ - SIGNAL_CONNECT(bt_filter, "clicked", voip_calls_on_filter, NULL); + g_signal_connect(clist, "select_row", G_CALLBACK(voip_calls_on_select_row), NULL); + g_signal_connect(clist, "unselect_row", G_CALLBACK(voip_calls_on_unselect_row), NULL); + /*g_signal_connect(bt_unselect, "clicked", G_CALLBACK(voip_calls_on_unselect), NULL);*/ + g_signal_connect(bt_filter, "clicked", G_CALLBACK(voip_calls_on_filter), NULL); window_set_cancel_button(voip_calls_dlg_w, bt_close, window_cancel_button_cb); - SIGNAL_CONNECT(voip_calls_dlg_w, "delete_event", window_delete_event_cb, NULL); - SIGNAL_CONNECT(voip_calls_dlg_w, "destroy", voip_calls_on_destroy, NULL); - SIGNAL_CONNECT(bt_select_all, "clicked", voip_calls_on_select_all, NULL); + g_signal_connect(voip_calls_dlg_w, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect(voip_calls_dlg_w, "destroy", G_CALLBACK(voip_calls_on_destroy), NULL); + g_signal_connect(bt_select_all, "clicked", G_CALLBACK(voip_calls_on_select_all), NULL); gtk_widget_show_all(voip_calls_dlg_w); window_present(voip_calls_dlg_w); diff --git a/gtk/wlan_stat_dlg.c b/gtk/wlan_stat_dlg.c index f8c2d6acae..f18d91ec6a 100644 --- a/gtk/wlan_stat_dlg.c +++ b/gtk/wlan_stat_dlg.c @@ -500,7 +500,7 @@ wlanstat_dlg_create (void) gtk_widget_show(col_arrows[i].table); } - SIGNAL_CONNECT(GTK_CLIST(hs->table), "click-column", wlan_click_column_cb, col_arrows); + g_signal_connect(GTK_CLIST(hs->table), "click-column", G_CALLBACK(wlan_click_column_cb), col_arrows); error_string=register_tap_listener ("wlan", hs, NULL, wlanstat_reset, wlanstat_packet, wlanstat_draw); @@ -520,14 +520,14 @@ wlanstat_dlg_create (void) 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", wlan_resolve_toggle_dest, hs); + g_signal_connect(resolv_cb, "toggled", G_CALLBACK(wlan_resolve_toggle_dest), hs); existing_cb = gtk_check_button_new_with_mnemonic("Only show existing networks"); gtk_container_add(GTK_CONTAINER(hbox), existing_cb); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(existing_cb), FALSE); gtk_tooltips_set_tip(tooltips, existing_cb, "This option disables probe requests for " "unknown networks.", NULL); - SIGNAL_CONNECT(existing_cb, "toggled", wlan_existing_toggle_dest, hs); + g_signal_connect(existing_cb, "toggled", G_CALLBACK(wlan_existing_toggle_dest), hs); /* Button row. */ if (topic_available (HELP_STATS_WLAN_TRAFFIC_DIALOG)) { @@ -544,15 +544,15 @@ wlanstat_dlg_create (void) 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 Seperated Values) format.", NULL); - SIGNAL_CONNECT(copy_bt, "clicked", wlan_copy_as_csv, hs->table); + g_signal_connect(copy_bt, "clicked", G_CALLBACK(wlan_copy_as_csv), hs->table); if (topic_available (HELP_STATS_WLAN_TRAFFIC_DIALOG)) { help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); - SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_STATS_WLAN_TRAFFIC_DIALOG); + g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_STATS_WLAN_TRAFFIC_DIALOG); } - SIGNAL_CONNECT (wlanstat_dlg_w, "delete_event", window_delete_event_cb, NULL); - SIGNAL_CONNECT (wlanstat_dlg_w, "destroy", win_destroy_cb, hs); + g_signal_connect (wlanstat_dlg_w, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect (wlanstat_dlg_w, "destroy", G_CALLBACK(win_destroy_cb), hs); gtk_widget_show_all (wlanstat_dlg_w); window_present (wlanstat_dlg_w); diff --git a/gtk/wsp_stat.c b/gtk/wsp_stat.c index b99b955e64..0b3f2e0909 100644 --- a/gtk/wsp_stat.c +++ b/gtk/wsp_stat.c @@ -405,8 +405,8 @@ gtk_wspstat_init(const char *optarg, void *userdata _U_) bt_close = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE); window_set_cancel_button(sp->win, bt_close, window_cancel_button_cb); - SIGNAL_CONNECT(sp->win, "delete_event", window_delete_event_cb, NULL); - SIGNAL_CONNECT(sp->win, "destroy", win_destroy_cb, sp); + g_signal_connect(sp->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect(sp->win, "destroy", G_CALLBACK(win_destroy_cb), sp); gtk_widget_show_all(sp->win); window_present(sp->win); |