diff options
| author | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-04-11 21:39:16 +0000 |
|---|---|---|
| committer | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-04-11 21:39:16 +0000 |
| commit | a9827d65f9611a4708f09a056da2e46baae70a7c (patch) | |
| tree | 7cc7aae14329930ca23cbd036474474f4dec1c78 /gtk/export_object.c | |
| parent | 3e13d8cdb42fb2e79fedc9d18c3d9f0eb81aac02 (diff) | |
second round to replace SIGNAL_CONNECT with g_signal_connect
This requires some casts to be added and I just don't want to add casts at all possible places. So I compile and only add casts where the (MSVC) compiler has a hard time.
Unfortunately this won't find any problems in Linux/Unix only code - I'll keep an eye on the buildbot and try to fix things as I'm going on ...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24913 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk/export_object.c')
| -rw-r--r-- | gtk/export_object.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/gtk/export_object.c b/gtk/export_object.c index b28c25cbc4..c907e2fd60 100644 --- a/gtk/export_object.c +++ b/gtk/export_object.c @@ -369,21 +369,21 @@ export_object_window(const gchar *tapname, const gchar *name, tap_packet_cb tap_ gtk_container_add(GTK_CONTAINER(sw), object_list->tree); selection = gtk_tree_view_get_selection(object_list->tree_view); - SIGNAL_CONNECT(selection, "changed", eo_remember_row_num, object_list); + g_signal_connect(selection, "changed", G_CALLBACK(eo_remember_row_num), object_list); bbox = gtk_hbox_new(FALSE, 5); /* Help button */ help_bt = gtk_button_new_from_stock(GTK_STOCK_HELP); - SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_EXPORT_OBJECT_LIST); + g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_EXPORT_OBJECT_LIST); gtk_tooltips_set_tip(GTK_TOOLTIPS(button_bar_tips), help_bt, "Show help for this dialog.", NULL); gtk_box_pack_start(GTK_BOX(bbox), help_bt, FALSE, FALSE, 0); /* Save All button */ save_all_bt = gtk_button_new_with_mnemonic("Save A_ll"); - SIGNAL_CONNECT(save_all_bt, "clicked", eo_save_all_clicked_cb, + g_signal_connect(save_all_bt, "clicked", G_CALLBACK(eo_save_all_clicked_cb), object_list); gtk_tooltips_set_tip(GTK_TOOLTIPS(button_bar_tips), save_all_bt, "Save all listed objects with their displayed " @@ -392,7 +392,7 @@ export_object_window(const gchar *tapname, const gchar *name, tap_packet_cb tap_ /* Save button */ save_bt = gtk_button_new_from_stock(GTK_STOCK_SAVE_AS); - SIGNAL_CONNECT(save_bt, "clicked", eo_save_clicked_cb, object_list); + g_signal_connect(save_bt, "clicked", G_CALLBACK(eo_save_clicked_cb), object_list); gtk_tooltips_set_tip(GTK_TOOLTIPS(button_bar_tips), save_bt, "Saves the currently selected content to a file.", NULL); @@ -410,10 +410,9 @@ export_object_window(const gchar *tapname, const gchar *name, tap_packet_cb tap_ gtk_widget_show(bbox); /* Setup cancel/delete/destroy signal handlers */ - SIGNAL_CONNECT(object_list->dlg, "delete_event", - window_delete_event_cb, NULL); - SIGNAL_CONNECT(object_list->dlg, "destroy", - eo_win_destroy_cb, object_list); + g_signal_connect(object_list->dlg, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect(object_list->dlg, "destroy", + G_CALLBACK(eo_win_destroy_cb), object_list); window_set_cancel_button(object_list->dlg, close_bt, window_cancel_button_cb); |