diff options
| -rw-r--r-- | gtk/airpcap_dlg.c | 28 | ||||
| -rw-r--r-- | gtk/airpcap_dlg.h | 16 | ||||
| -rw-r--r-- | gtk/ansi_map_stat.c | 2 | ||||
| -rw-r--r-- | gtk/capture_dlg.c | 6 | ||||
| -rw-r--r-- | gtk/dcerpc_stat.c | 4 | ||||
| -rw-r--r-- | gtk/decode_as_dlg.c | 73 | ||||
| -rw-r--r-- | gtk/expert_comp_table.c | 11 | ||||
| -rw-r--r-- | gtk/expert_dlg.c | 2 | ||||
| -rw-r--r-- | gtk/gsm_a_stat.c | 2 | ||||
| -rw-r--r-- | gtk/gsm_map_stat.c | 2 | ||||
| -rw-r--r-- | gtk/main_airpcap_toolbar.c | 2 | ||||
| -rw-r--r-- | gtk/mtp3_stat.c | 2 | ||||
| -rw-r--r-- | gtk/prefs_dlg.c | 6 | ||||
| -rw-r--r-- | gtk/prefs_layout.c | 2 | ||||
| -rw-r--r-- | gtk/rpc_progs.c | 2 |
15 files changed, 82 insertions, 78 deletions
diff --git a/gtk/airpcap_dlg.c b/gtk/airpcap_dlg.c index cac072d70d..e74f32dddf 100644 --- a/gtk/airpcap_dlg.c +++ b/gtk/airpcap_dlg.c @@ -333,7 +333,7 @@ on_fcs_filter_cb_changed(GtkWidget *fcs_filter_cb, gpointer data _U_) * Changed callback for the capture type combobox */ static void -on_capture_type_cb_changed(GtkWidget *cb, gpointer data _U_) +on_capture_type_cb_changed(GtkWidget *cb, gpointer user_data _U_) { gchar *s; @@ -384,7 +384,7 @@ gboolean update_blink(gpointer data) * Blink button callback */ void -on_blink_bt_clicked( GtkWidget *blink_bt, gpointer if_data _U_) +on_blink_bt_clicked( GtkWidget *blink_bt, gpointer data _U_) { PAirpcapHandle ad = NULL; gchar ebuf[AIRPCAP_ERRBUF_SIZE]; @@ -419,7 +419,7 @@ on_blink_bt_clicked( GtkWidget *blink_bt, gpointer if_data _U_) * Callback for the 'Any' adapter What's This button. */ void -on_what_s_this_bt_clicked( GtkWidget *blink_bt _U_, gpointer if_data _U_) +on_what_s_this_bt_clicked( GtkWidget *blink_bt _U_, gpointer data _U_) { simple_dialog(ESD_TYPE_INFO,ESD_BTN_OK, "The Multi-Channel Aggregator is a virtual device " @@ -434,7 +434,7 @@ on_what_s_this_bt_clicked( GtkWidget *blink_bt _U_, gpointer if_data _U_) /* the window was closed, cleanup things */ void -on_key_management_destroy(GtkWidget *w _U_, gpointer data _U_) +on_key_management_destroy(GtkWidget *w _U_, gpointer data) { GtkWidget *airpcap_advanced_w, *toolbar; @@ -575,7 +575,7 @@ on_reset_configuration_bt_clicked(GtkWidget *button _U_, gpointer data _U_) * Callback used to add a WEP key in the add new key box; */ static void -on_add_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data _U_) +on_add_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data) { GtkWidget *type_cb, *key_en, @@ -762,7 +762,7 @@ on_add_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data _U_) * Callback used to edit a WEP key in the edit key box; */ static void -on_edit_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data _U_) +on_edit_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data) { GtkWidget *type_cb, *key_en, @@ -949,7 +949,7 @@ on_edit_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data _U_) * Callback for the 'Add Key' button. */ void -on_add_new_key_bt_clicked(GtkWidget *button _U_, gpointer data _U_) +on_add_new_key_bt_clicked(GtkWidget *button _U_, gpointer data) { GtkWidget *add_key_window; GtkWidget *add_frame; @@ -1949,19 +1949,19 @@ display_airpcap_advanced_cb(GtkWidget *w _U_, gpointer data) if (!airpcap_if_is_any(airpcap_if_selected)) { - g_signal_connect (blink_bt, "clicked", G_CALLBACK(on_blink_bt_clicked), airpcap_advanced_w); + g_signal_connect (blink_bt, "clicked", G_CALLBACK(on_blink_bt_clicked), NULL); } else { - g_signal_connect (blink_bt, "clicked", G_CALLBACK(on_what_s_this_bt_clicked), airpcap_advanced_w); + g_signal_connect (blink_bt, "clicked", G_CALLBACK(on_what_s_this_bt_clicked), NULL); } g_signal_connect (channel_cb, "changed", G_CALLBACK(airpcap_channel_changed_noset_cb), channel_offset_cb); /* We don't attach the channel offset combo because we don't want it changing anything yet. */ - g_signal_connect (capture_type_cb, "changed", G_CALLBACK(on_capture_type_cb_changed), airpcap_advanced_w); - g_signal_connect (fcs_ck, "toggled", G_CALLBACK(on_fcs_ck_toggled), airpcap_advanced_w); + g_signal_connect (capture_type_cb, "changed", G_CALLBACK(on_capture_type_cb_changed), NULL); + g_signal_connect (fcs_ck, "toggled", G_CALLBACK(on_fcs_ck_toggled), NULL); g_signal_connect (fcs_filter_cb, "changed", G_CALLBACK(on_fcs_filter_cb_changed), NULL); - g_signal_connect (reset_configuration_bt, "clicked", G_CALLBACK(on_reset_configuration_bt_clicked), airpcap_advanced_w); + g_signal_connect (reset_configuration_bt, "clicked", G_CALLBACK(on_reset_configuration_bt_clicked), NULL); g_signal_connect (apply_bt, "clicked", G_CALLBACK(on_advanced_apply_bt_clicked), airpcap_advanced_w); g_signal_connect (ok_bt,"clicked", G_CALLBACK(on_advanced_ok_bt_clicked), airpcap_advanced_w); g_signal_connect (cancel_bt,"clicked", G_CALLBACK(on_advanced_cancel_bt_clicked), airpcap_advanced_w); @@ -2404,13 +2404,13 @@ display_airpcap_key_management_cb(GtkWidget *w _U_, gpointer data) g_signal_connect (edit_key_bt, "clicked", G_CALLBACK(on_edit_key_bt_clicked), key_management_w); g_signal_connect (move_key_up_bt, "clicked", G_CALLBACK(on_move_key_up_bt_clicked), key_management_w); g_signal_connect (move_key_down_bt, "clicked", G_CALLBACK(on_move_key_down_bt_clicked), key_management_w); - g_signal_connect (reset_configuration_bt, "clicked", G_CALLBACK(on_reset_configuration_bt_clicked), key_management_w); + g_signal_connect (reset_configuration_bt, "clicked", G_CALLBACK(on_reset_configuration_bt_clicked), NULL); g_signal_connect (apply_bt, "clicked", G_CALLBACK(on_key_management_apply_bt_clicked), key_management_w); g_signal_connect (ok_bt, "clicked", G_CALLBACK(on_key_management_ok_bt_clicked), key_management_w); g_signal_connect (cancel_bt, "clicked", G_CALLBACK(on_key_management_cancel_bt_clicked), key_management_w); g_signal_connect (key_ls, "select_row", G_CALLBACK(on_key_ls_select_row), key_management_w); g_signal_connect (key_ls, "unselect_row", G_CALLBACK(on_key_ls_unselect_row), key_management_w); - g_signal_connect (key_ls, "click_column", G_CALLBACK(on_key_ls_click_column), key_management_w); + g_signal_connect (key_ls, "click_column", G_CALLBACK(on_key_ls_click_column), NULL); /* Different because the window will be closed ... */ /*window_set_cancel_button(key_management_w, ok_bt, window_cancel_button_cb); diff --git a/gtk/airpcap_dlg.h b/gtk/airpcap_dlg.h index 3649337188..caa9e8f33c 100644 --- a/gtk/airpcap_dlg.h +++ b/gtk/airpcap_dlg.h @@ -60,7 +60,7 @@ update_decryption_mode_list(GtkWidget *w); * Callback for the 'Add Key' button. */ void -on_add_new_key_bt_clicked(GtkWidget *button, gpointer data _U_); +on_add_new_key_bt_clicked(GtkWidget *button _U_, gpointer data); /* * Callback for the 'Remove Key' button. @@ -124,7 +124,7 @@ on_key_management_cancel_bt_clicked(GtkWidget *button, gpointer data _U_); /* the window was closed, cleanup things */ void -on_key_management_destroy(GtkWidget *w _U_, gpointer data _U_); +on_key_management_destroy(GtkWidget *w _U_, gpointer data); /* * Callback for the 'Reset Configuration' button. @@ -136,7 +136,7 @@ on_reset_configuration_bt_clicked(GtkWidget *button, gpointer data _U_); * Turns the decryption on or off */ void -on_decryption_mode_cb_changed(GtkWidget *w, gpointer data); +on_decryption_mode_cb_changed(GtkWidget *w, gpointer data _U_); /* * Selects the current decryption mode in the given combo box @@ -168,9 +168,9 @@ on_key_ls_unselect_row(GtkWidget *widget, * Callback for the click column event in the key list widget */ void -on_key_ls_click_column(GtkWidget *widget, - gint column, - gpointer data); +on_key_ls_click_column(GtkWidget *widget _U_, + gint column _U_, + gpointer data _U_); /* * Thread function used to blink the led @@ -181,13 +181,13 @@ gboolean update_blink(gpointer data _U_); * Blink button callback */ void -on_blink_bt_clicked(GtkWidget *blink_bt _U_, gpointer if_data); +on_blink_bt_clicked(GtkWidget *blink_bt, gpointer data _U_); /* * Callback for the 'Any' adapter What's This button. */ void -on_what_s_this_bt_clicked( GtkWidget *blink_bt _U_, gpointer if_data ); +on_what_s_this_bt_clicked( GtkWidget *blink_bt _U_, gpointer data _U_); /** Create a "Airpcap" dialog box caused by a button click. * diff --git a/gtk/ansi_map_stat.c b/gtk/ansi_map_stat.c index 9e5d5f5139..52a8101f14 100644 --- a/gtk/ansi_map_stat.c +++ b/gtk/ansi_map_stat.c @@ -285,7 +285,7 @@ ansi_map_stat_draw( static void ansi_map_stat_gtk_win_destroy_cb( GtkWindow *win _U_, - gpointer user_data _U_) + gpointer user_data) { memset((void *) user_data, 0, sizeof(ansi_map_stat_dlg_t)); } diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c index 81a23e8e3f..efc01ce832 100644 --- a/gtk/capture_dlg.c +++ b/gtk/capture_dlg.c @@ -676,8 +676,8 @@ guint32 value) /* * Sets the toolbar before calling the advanced dialog with for the right interface */ -void -options_airpcap_advanced_cb(GtkWidget *w _U_, gpointer d _U_) +static void +options_airpcap_advanced_cb(GtkWidget *w, gpointer d) { int *from_widget; @@ -2326,7 +2326,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 5); ok_bt = g_object_get_data(G_OBJECT(bbox), WIRESHARK_STOCK_CAPTURE_START); - g_signal_connect(ok_bt, "clicked", G_CALLBACK(capture_start_cb), cap_open_w); + g_signal_connect(ok_bt, "clicked", G_CALLBACK(capture_start_cb), NULL); gtk_tooltips_set_tip(tooltips, ok_bt, "Start the capture process.", NULL); diff --git a/gtk/dcerpc_stat.c b/gtk/dcerpc_stat.c index f01114cf65..5e403195aa 100644 --- a/gtk/dcerpc_stat.c +++ b/gtk/dcerpc_stat.c @@ -515,7 +515,7 @@ dcerpcstat_find_next_program(gpointer *key, gpointer *value, gpointer *user_data static void -dlg_destroy_cb(void) +dlg_destroy_cb(GtkWidget *w _U_, gpointer user_data _U_) { dlg = NULL; } @@ -682,7 +682,7 @@ gtk_dcerpcstat_cb(GtkWidget *w _U_, gpointer d _U_) window_set_cancel_button(dlg, cancel_button, window_cancel_button_cb); g_signal_connect(dlg, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); - g_signal_connect(dlg, "destroy", dlg_destroy_cb, NULL); + g_signal_connect(dlg, "destroy", G_CALLBACK(dlg_destroy_cb), NULL); /* Catch the "activate" signal on the filter text entry, so that if the user types Return there, we act as if the "Create Stat" diff --git a/gtk/decode_as_dlg.c b/gtk/decode_as_dlg.c index 3d4b07bfb7..f7667f629b 100644 --- a/gtk/decode_as_dlg.c +++ b/gtk/decode_as_dlg.c @@ -226,11 +226,11 @@ decode_build_reset_list (const gchar *table_name, ftenum_t selector_type, static gint sort_iter_compare_func (GtkTreeModel *model, -GtkTreeIter *a, -GtkTreeIter *b, -gpointer userdata) + GtkTreeIter *a, + GtkTreeIter *b, + gpointer user_data) { - gint sortcol = GPOINTER_TO_INT(userdata); + gint sortcol = GPOINTER_TO_INT(user_data); gint ret = 0; switch (sortcol) { @@ -262,11 +262,11 @@ gpointer userdata) void decode_add_to_show_list ( -gpointer list_data, -const gchar *table_name, -gchar *selector_name, -const gchar *initial_proto_name, -const gchar *current_proto_name) + gpointer list_data, + const gchar *table_name, + gchar *selector_name, + const gchar *initial_proto_name, + const gchar *current_proto_name) { const gchar *text[E_LIST_D_COLUMNS]; GtkListStore *store; @@ -472,12 +472,14 @@ decode_show_clear_cb (GtkWidget *clear_bt _U_, gpointer parent_w) * the "Decode As:Show..." dialog window. This routine simply calls the * ok routine as if the user had clicked the ok button. * - * @param GtkWidget * A pointer to the dialog box. + * @param win A pointer to the dialog box. * - * @param gpointer Unknown + * @param event A pointer to the event struct + * + * @param user_data Unused */ static gboolean -decode_show_delete_cb (GtkWidget *win _U_, gpointer dummy _U_) +decode_show_delete_cb (GtkWidget *win _U_, GdkEvent *event _U_, gpointer user_data _U_) { decode_show_ok_cb(NULL, decode_show_w); return FALSE; @@ -506,11 +508,12 @@ decode_show_destroy_cb (GtkWidget *win _U_, gpointer user_data _U_) * This routine creates the "Decode As:Show" dialog box. This dialog box * shows the user which protocols have had their dissectors changed. * - * @param w Unknown - * @param data Unknown + * @param w Unused + * + * @param user_data Unused */ void -decode_show_cb (GtkWidget * w _U_, gpointer data _U_) +decode_show_cb (GtkWidget *w _U_, gpointer user_data _U_) { GtkWidget *main_vb, *bbox, *ok_bt, *clear_bt, *help_bt, *scrolled_window; const gchar *titles[E_LIST_D_COLUMNS] = { @@ -914,12 +917,14 @@ decode_close_cb (GtkWidget *close_bt _U_, gpointer parent_w) * close routine as if the user had clicked the close button instead * of the close button. * - * @param decode_w A pointer to the dialog box. + * @param decode_w_lcl A pointer to the dialog box. + * + * @param event A pointer to the GdkEvent struct * - * @param dummy Unknown + * @param user_data Unused */ static gboolean -decode_delete_cb (GtkWidget *decode_w_lcl, gpointer dummy _U_) +decode_delete_cb (GtkWidget *decode_w_lcl, GdkEvent *event _U_, gpointer user_data _U_) { decode_close_cb(NULL, decode_w_lcl); return FALSE; @@ -951,11 +956,12 @@ decode_destroy_cb (GtkWidget *win _U_, gpointer user_data _U_) * the "Decode As..." dialog window. This routine resets all the * dissector values and performs other housekeeping functions. * - * @param GtkWidget * A pointer to the "Clear" button. - * @param gpointer A pointer to the dialog window. + * @param clear_bt A pointer to the "Clear" button. + * + * @param user_data Unused */ static void -decode_clear_cb(GtkWidget *clear_bt _U_, gpointer parent_w _U_) +decode_clear_cb(GtkWidget *clear_bt _U_, gpointer user_data _U_) { decode_clear_all(); } @@ -973,16 +979,16 @@ decode_clear_cb(GtkWidget *clear_bt _U_, gpointer parent_w _U_) * * @param w The radio button that was clicked. * - * @param data The enum value assigned to this radio button. This + * @param user_data The enum value assigned to this radio button. This * will be either E_DECODE_YES or E_DECODE_NO */ static void -decode_update_action (GtkWidget *w _U_, gpointer data) +decode_update_action (GtkWidget *w _U_, gpointer user_data) { GSList *tmp; gboolean enable; - requested_action = GPOINTER_TO_INT(data); + requested_action = GPOINTER_TO_INT(user_data); enable = (requested_action == E_DECODE_YES); for (tmp = decode_dimmable; tmp; tmp = g_slist_next(tmp)) { gtk_widget_set_sensitive(tmp->data, enable); @@ -1118,10 +1124,10 @@ struct handle_lookup_info { static gboolean lookup_handle(GtkTreeModel *model, GtkTreePath *path _U_, GtkTreeIter *iter, - gpointer data) + gpointer user_data) { dissector_handle_t handle; - struct handle_lookup_info *hli = (struct handle_lookup_info *)data; + struct handle_lookup_info *hli = user_data; gtk_tree_model_get(model, iter, E_LIST_S_TABLE+1, &handle, -1); if (hli->handle == handle) { @@ -1202,7 +1208,7 @@ decode_proto_add_to_list (const gchar *table_name, gpointer value, gpointer user static gboolean -decode_list_button_press_cb(GtkWidget *list, GdkEventButton *event, gpointer data _U_) +decode_list_button_press_cb(GtkWidget *list, GdkEventButton *event, gpointer user_data _U_) { if (event->type == GDK_2BUTTON_PRESS) { GtkWidget *main_w = gtk_widget_get_toplevel(list); @@ -1214,7 +1220,7 @@ decode_list_button_press_cb(GtkWidget *list, GdkEventButton *event, gpointer dat } static gboolean -decode_list_key_release_cb(GtkWidget *list, GdkEventKey *event, gpointer data _U_) +decode_list_key_release_cb(GtkWidget *list, GdkEventKey *event, gpointer user_data _U_) { if (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter) { GtkWidget *main_w = gtk_widget_get_toplevel(list); @@ -1719,11 +1725,12 @@ decode_add_notebook (GtkWidget *format_hb) * dialog box, and then hand crafts the button box at the bottom of * the dialog. * - * @param w Unknown - * @param data Unknown + * @param w Unused + * + * @param user_data Unused */ void -decode_as_cb (GtkWidget * w _U_, gpointer data _U_) +decode_as_cb (GtkWidget * w _U_, gpointer user_data _U_) { GtkWidget *main_vb, *format_hb, *bbox, *ok_bt, *close_bt, *help_bt, *button; GtkWidget *button_vb, *apply_bt; @@ -1753,14 +1760,14 @@ decode_as_cb (GtkWidget * w _U_, gpointer data _U_) gtk_box_pack_start(GTK_BOX(format_hb), button_vb, TRUE, TRUE, 10); button = gtk_button_new_with_label("Show Current"); - g_signal_connect(button, "clicked", G_CALLBACK(decode_show_cb), decode_w); + g_signal_connect(button, "clicked", G_CALLBACK(decode_show_cb), NULL); GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); gtk_box_pack_start(GTK_BOX(button_vb), button, FALSE, FALSE, 0); gtk_tooltips_set_tip(tooltips, button, "Open a dialog showing the current settings.", NULL); button = gtk_button_new_from_stock(GTK_STOCK_CLEAR); - g_signal_connect(button, "clicked", G_CALLBACK(decode_clear_cb), decode_w); + g_signal_connect(button, "clicked", G_CALLBACK(decode_clear_cb), NULL); GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); gtk_box_pack_start(GTK_BOX(button_vb), button, FALSE, FALSE, 0); gtk_tooltips_set_tip(tooltips, button, diff --git a/gtk/expert_comp_table.c b/gtk/expert_comp_table.c index 7b79c62f8b..f64c1e4a78 100644 --- a/gtk/expert_comp_table.c +++ b/gtk/expert_comp_table.c @@ -349,8 +349,9 @@ error_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint call } static gboolean -error_show_popup_menu_cb(void *widg _U_, GdkEvent *event, error_equiv_table *err) +error_show_popup_menu_cb(void *widg _U_, GdkEvent *event, gpointer user_data) { + error_equiv_table *err = user_data; GdkEventButton *bevent = (GdkEventButton *)event; if(event->type==GDK_BUTTON_PRESS && bevent->button==3){ @@ -700,9 +701,7 @@ error_create_popup_menu(error_equiv_table *err) err->select = gtk_tree_view_get_selection (GTK_TREE_VIEW (err->tree_view)); gtk_tree_selection_set_mode (err->select, GTK_SELECTION_SINGLE); - g_signal_connect (G_OBJECT (err->select), "changed", - G_CALLBACK (expert_goto_pkt_cb), - err); + g_signal_connect (G_OBJECT (err->select), "changed", G_CALLBACK(expert_goto_pkt_cb), NULL); item_factory = gtk_item_factory_new(GTK_TYPE_MENU, "<main>", NULL); gtk_item_factory_create_items_ac(item_factory, sizeof(error_list_menu_items)/sizeof(error_list_menu_items[0]), error_list_menu_items, err, 2); @@ -716,9 +715,7 @@ error_create_popup_menu(error_equiv_table *err) err->select = gtk_tree_view_get_selection (GTK_TREE_VIEW (err->tree_view)); gtk_tree_selection_set_mode (err->select, GTK_SELECTION_SINGLE); - g_signal_connect (G_OBJECT (err->select), "changed", - G_CALLBACK (expert_goto_pkt_cb), - err); + g_signal_connect (G_OBJECT (err->select), "changed", G_CALLBACK(expert_goto_pkt_cb), NULL); action_group = gtk_action_group_new ("ExpertFilterPopupActionGroup"); gtk_action_group_add_actions (action_group, /* the action group */ diff --git a/gtk/expert_dlg.c b/gtk/expert_dlg.c index a54fab17b3..742e4a84e6 100644 --- a/gtk/expert_dlg.c +++ b/gtk/expert_dlg.c @@ -549,7 +549,7 @@ expert_dlg_init(const char *optarg, void* userdata _U_) } g_object_set_data(G_OBJECT(severity_combo_box), "tapdata", etd); - g_signal_connect(severity_combo_box, "changed", G_CALLBACK(expert_dlg_severity_cb), etd->win); + g_signal_connect(severity_combo_box, "changed", G_CALLBACK(expert_dlg_severity_cb), NULL); gtk_box_pack_start(GTK_BOX(severity_box), severity_combo_box, FALSE, FALSE, 0); diff --git a/gtk/gsm_a_stat.c b/gtk/gsm_a_stat.c index 4b17cc7288..8422ed98bb 100644 --- a/gtk/gsm_a_stat.c +++ b/gtk/gsm_a_stat.c @@ -393,7 +393,7 @@ gsm_a_stat_draw( static void gsm_a_stat_gtk_win_destroy_cb( GtkWindow *win _U_, - gpointer user_data _U_) + gpointer user_data) { memset((void *) user_data, 0, sizeof(gsm_a_stat_dlg_t)); } diff --git a/gtk/gsm_map_stat.c b/gtk/gsm_map_stat.c index c174e86569..4be0179d4f 100644 --- a/gtk/gsm_map_stat.c +++ b/gtk/gsm_map_stat.c @@ -386,7 +386,7 @@ gsm_map_stat_draw( static void gsm_map_stat_gtk_win_destroy_cb( GtkWindow *win _U_, - gpointer user_data _U_) + gpointer user_data) { memset((void *) user_data, 0, sizeof(gsm_map_stat_dlg_t)); } diff --git a/gtk/main_airpcap_toolbar.c b/gtk/main_airpcap_toolbar.c index 27d1f0b350..fcd38a3257 100644 --- a/gtk/main_airpcap_toolbar.c +++ b/gtk/main_airpcap_toolbar.c @@ -359,7 +359,7 @@ GtkWidget *airpcap_toolbar_new() /* Set current decryption mode!!!! */ update_decryption_mode(decryption_mode_cb); - g_signal_connect(decryption_mode_cb, "changed", G_CALLBACK(on_decryption_mode_cb_changed), airpcap_tb); + g_signal_connect(decryption_mode_cb, "changed", G_CALLBACK(on_decryption_mode_cb_changed), NULL); g_object_set_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_DECRYPTION_KEY,decryption_mode_cb); /* Advanced button */ diff --git a/gtk/mtp3_stat.c b/gtk/mtp3_stat.c index dec1f27fba..e18b0f6e20 100644 --- a/gtk/mtp3_stat.c +++ b/gtk/mtp3_stat.c @@ -354,7 +354,7 @@ mtp3_stat_draw( static void mtp3_stat_gtk_win_destroy_cb( GtkWindow *win _U_, - gpointer user_data _U_) + gpointer user_data) { memset((void *) user_data, 0, sizeof(mtp3_stat_dlg_t)); } diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c index aa72be3206..6c9942eb83 100644 --- a/gtk/prefs_dlg.c +++ b/gtk/prefs_dlg.c @@ -412,7 +412,7 @@ prefs_nb_page_add(GtkWidget *notebook, const gchar *title, GtkWidget *page, cons /* show the dialog */ void -prefs_cb(GtkWidget *w _U_, gpointer dummy _U_) +prefs_cb(GtkWidget *w, gpointer dummy) { prefs_page_cb (w, dummy, PREFS_PAGE_USER_INTERFACE); } @@ -620,7 +620,7 @@ prefs_page_cb(GtkWidget *w _U_, gpointer dummy _U_, PREFS_PAGE_E prefs_page) help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_PREFERENCES_DIALOG); - g_signal_connect(prefs_w, "delete_event", G_CALLBACK(prefs_main_delete_event_cb), prefs_w); + g_signal_connect(prefs_w, "delete_event", G_CALLBACK(prefs_main_delete_event_cb), NULL); g_signal_connect(prefs_w, "destroy", G_CALLBACK(prefs_main_destroy_cb), prefs_w); gtk_widget_show(prefs_w); @@ -1653,7 +1653,7 @@ prefs_main_cancel_cb(GtkWidget *cancel_bt _U_, gpointer parent_w) /* Treat this as a cancel, by calling "prefs_main_cancel_cb()" */ static gboolean prefs_main_delete_event_cb(GtkWidget *prefs_w_lcl, GdkEvent *event _U_, - gpointer parent_w _U_) + gpointer user_data _U_) { prefs_main_cancel_cb(NULL, prefs_w_lcl); return FALSE; diff --git a/gtk/prefs_layout.c b/gtk/prefs_layout.c index 7f10c4efd2..68f32fd7c7 100644 --- a/gtk/prefs_layout.c +++ b/gtk/prefs_layout.c @@ -233,7 +233,7 @@ static void layout_validate_cb(GtkWidget *w _U_, gpointer data) { } static void -layout_defaults_cb (GtkWidget * w _U_, gpointer data _U_) +layout_defaults_cb (GtkWidget * w _U_, gpointer data) { layout_t default_layout = { layout_type_5, diff --git a/gtk/rpc_progs.c b/gtk/rpc_progs.c index 047a80d986..178ed378fc 100644 --- a/gtk/rpc_progs.c +++ b/gtk/rpc_progs.c @@ -401,7 +401,7 @@ gtk_rpcprogs_init(const char *optarg _U_, void* userdata _U_) window_set_cancel_button(win, bt_close, window_cancel_button_cb); g_signal_connect(win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); - g_signal_connect(win, "destroy", G_CALLBACK(win_destroy_cb), win); + g_signal_connect(win, "destroy", G_CALLBACK(win_destroy_cb), NULL); gtk_widget_show_all(win); window_present(win); |