diff options
| author | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-06-29 15:51:43 +0000 |
|---|---|---|
| committer | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-06-29 15:51:43 +0000 |
| commit | 7c0986fad5928cd296d40335270b9d650c30adce (patch) | |
| tree | 91bb7cc0fd615b6c41bc56ac5af00c4b9e767d05 /gtk | |
| parent | 6ebf2ce020599bcc9c6229199002550c3ed87c0f (diff) | |
Fix some simple cases of GTK2 deprecated API usage by using a renamed or equivalent API
gtk_container_border_width() ==> gtk_container_set_border_width()
gtk_container_children() ==> gtk_container_get_children()
gtk_entry_new_with_max_length() ==> gtk_entry_new(); gtk_entry_set_max_length()
gtk_menu_append() ==> gtk_menu_shell_append()
gtk_menu_prepend() ==> gtk_menu_shell_prepend()
gtk_notebook_set_page() ==> gtk_notebook_set_current_page()
gtk_paned_gutter_size() ==> gtk_paned_set_gutter_size()
gtk_radio_button_group() ==> gtk_radio_button_get_group()
gtk_signal_connect() ==> g_signal_connect()
gtk_signal_disconnect() ==> g_signal_handler_disconnect()
gtk_signal_emit_by_name() ==> g_signal_emit_by_name()
gtk_signal_handler_block_by_data() ==> g_signal_handlers_block_matched()
gtk_signal_handler_block_by_func() ==> g_signal_handlers_block_by_func()
gtk_signal_handler_unblock_by_data() ==> g_signal-handlers_unblock_matched()
gtk_signal_handler_unblock_by_func() ==> g_signal-handlers_unblock_by_func()
gtk_spin_button_get_value_as_float() ==> gtk_spin_button_get_value()
gtk_toggle_button_set_state() ==> gtk_toggle_button_set_active()
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25634 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk')
77 files changed, 300 insertions, 300 deletions
diff --git a/gtk/about_dlg.c b/gtk/about_dlg.c index b8dd0916e0..df09c8736c 100644 --- a/gtk/about_dlg.c +++ b/gtk/about_dlg.c @@ -116,7 +116,7 @@ splash_new(const char *message) gtk_widget_realize(win); main_vb = gtk_vbox_new(FALSE, 6); - gtk_container_border_width(GTK_CONTAINER(main_vb), 24); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 24); gtk_container_add(GTK_CONTAINER(win), main_vb); about_wireshark(win, main_vb); @@ -277,7 +277,7 @@ about_wireshark_page_new(void) gchar *message; main_vb = gtk_vbox_new(FALSE, 6); - gtk_container_border_width(GTK_CONTAINER(main_vb), 12); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 12); about_wireshark(top_level, main_vb); @@ -370,8 +370,8 @@ about_folders_page_new(void) table = simple_list_new(3, titles); /* connect a callback so we can spot a double-click */ - gtk_signal_connect(GTK_OBJECT(table), "button_press_event", - GTK_SIGNAL_FUNC(about_folders_callback), (gpointer)0); + g_signal_connect(table, "button_press_event", + G_CALLBACK(about_folders_callback), NULL); simple_list_url_col(table, 1); @@ -483,10 +483,10 @@ about_wireshark_cb( GtkWidget *w _U_, gpointer data _U_ ) /* default position is not appropriate for the about dialog */ gtk_window_set_position(GTK_WINDOW(about_wireshark_w), GTK_WIN_POS_CENTER_ON_PARENT); gtk_window_set_default_size(GTK_WINDOW(about_wireshark_w), 600, 400); - gtk_container_border_width(GTK_CONTAINER(about_wireshark_w), 6); + gtk_container_set_border_width(GTK_CONTAINER(about_wireshark_w), 6); main_vb = gtk_vbox_new(FALSE, 12); - gtk_container_border_width(GTK_CONTAINER(main_vb), 6); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 6); gtk_container_add(GTK_CONTAINER(about_wireshark_w), main_vb); main_nb = gtk_notebook_new(); diff --git a/gtk/airpcap_dlg.c b/gtk/airpcap_dlg.c index 4fbddc0ee8..c56df03951 100644 --- a/gtk/airpcap_dlg.c +++ b/gtk/airpcap_dlg.c @@ -741,12 +741,12 @@ airpcap_advanced_ok_cb(GtkWidget *w, gpointer data _U_) airpcap_update_channel_combo(GTK_WIDGET(toolbar_channel_cm),airpcap_if_selected); airpcap_validation_type_combo_set_by_type(toolbar_wrong_crc_cm,airpcap_if_selected->CrcValidationOn); - gtk_signal_handler_block_by_func (GTK_OBJECT(toolbar_decryption_ck),GTK_SIGNAL_FUNC(airpcap_toolbar_encryption_cb), toolbar); + g_signal_handlers_block_by_func (toolbar_decryption_ck,airpcap_toolbar_encryption_cb, toolbar); if (airpcap_if_active->DecryptionOn == AIRPCAP_DECRYPTION_ON) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar_decryption_ck),TRUE); else gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar_decryption_ck),FALSE); - gtk_signal_handler_unblock_by_func (GTK_OBJECT(toolbar_decryption_ck),GTK_SIGNAL_FUNC(airpcap_toolbar_encryption_cb), toolbar); + g_signal_handlers_unblock_by_func (toolbar_decryption_ck,airpcap_toolbar_encryption_cb, toolbar); } } @@ -1878,11 +1878,11 @@ update_decryption_mode_list(GtkWidget *w) } } - gtk_signal_handler_block_by_data(GTK_OBJECT(entry),(gpointer)airpcap_tb); + g_signal_handlers_block_matched(entry,G_SIGNAL_MATCH_DATA,0,0,0,0,airpcap_tb); gtk_combo_set_popdown_strings (GTK_COMBO (w), enable_decryption_cb_items); /* The 'changed' callback will be called twice */ gtk_entry_set_text(GTK_ENTRY(entry),current_text); - gtk_signal_handler_unblock_by_data(GTK_OBJECT(entry),(gpointer)airpcap_tb); + g_signal_handlers_unblock_matched(entry,G_SIGNAL_MATCH_DATA,0,0,0,0,airpcap_tb); if (current_text != NULL) g_free(current_text); diff --git a/gtk/airpcap_gui_utils.c b/gtk/airpcap_gui_utils.c index 38ad38f34b..79543d6799 100644 --- a/gtk/airpcap_gui_utils.c +++ b/gtk/airpcap_gui_utils.c @@ -147,12 +147,12 @@ airpcap_set_toolbar_start_capture(airpcap_if_info_t* if_info) gtk_widget_set_sensitive(airpcap_toolbar_keys_button,FALSE); /*decription check box*/ - gtk_signal_handler_block_by_func (GTK_OBJECT(airpcap_toolbar_decryption),GTK_SIGNAL_FUNC(airpcap_toolbar_encryption_cb), airpcap_tb); + g_signal_handlers_block_by_func (airpcap_toolbar_decryption,airpcap_toolbar_encryption_cb, airpcap_tb); if(if_info->DecryptionOn == AIRPCAP_DECRYPTION_ON) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(airpcap_toolbar_decryption),TRUE); else gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(airpcap_toolbar_decryption),FALSE); - gtk_signal_handler_unblock_by_func (GTK_OBJECT(airpcap_toolbar_decryption),GTK_SIGNAL_FUNC(airpcap_toolbar_encryption_cb), airpcap_tb); + g_signal_handlers_unblock_by_func (airpcap_toolbar_decryption,airpcap_toolbar_encryption_cb, airpcap_tb); if_label_text = g_strdup_printf("Current Wireless Interface: #%s", airpcap_get_if_string_number(if_info)); gtk_label_set_text(GTK_LABEL(airpcap_toolbar_label),if_label_text); @@ -247,12 +247,12 @@ airpcap_set_toolbar_stop_capture(airpcap_if_info_t* if_info) airpcap_validation_type_combo_set_by_type(GTK_WIDGET(airpcap_toolbar_crc_filter_combo),if_info->CrcValidationOn); /*decription check box*/ - gtk_signal_handler_block_by_func (GTK_OBJECT(airpcap_toolbar_decryption),GTK_SIGNAL_FUNC(airpcap_toolbar_encryption_cb), airpcap_tb); + g_signal_handlers_block_by_func (airpcap_toolbar_decryption,airpcap_toolbar_encryption_cb, airpcap_tb); if(if_info->DecryptionOn == AIRPCAP_DECRYPTION_ON) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(airpcap_toolbar_decryption),TRUE); else gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(airpcap_toolbar_decryption),FALSE); - gtk_signal_handler_unblock_by_func (GTK_OBJECT(airpcap_toolbar_decryption),GTK_SIGNAL_FUNC(airpcap_toolbar_encryption_cb), airpcap_tb); + g_signal_handlers_unblock_by_func (airpcap_toolbar_decryption,airpcap_toolbar_encryption_cb, airpcap_tb); if_label_text = g_strdup_printf("Current Wireless Interface: #%s", airpcap_get_if_string_number(if_info)); gtk_label_set_text(GTK_LABEL(airpcap_toolbar_label),if_label_text); diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c index c71a4c14df..2e5ef7e771 100644 --- a/gtk/capture_dlg.c +++ b/gtk/capture_dlg.c @@ -358,13 +358,13 @@ set_link_type_list(GtkWidget *linktype_om, GtkWidget *entry) /* Found a matching dlt, selecth this */ linktype_select = linktype_count; } - gtk_menu_append(GTK_MENU(lt_menu), lt_menu_item); + gtk_menu_shell_append(GTK_MENU_SHELL(lt_menu), lt_menu_item); gtk_widget_show(lt_menu_item); linktype_count++; } if (lt_list == NULL) { lt_menu_item = gtk_menu_item_new_with_label("(not supported)"); - gtk_menu_append(GTK_MENU(lt_menu), lt_menu_item); + gtk_menu_shell_append(GTK_MENU_SHELL(lt_menu), lt_menu_item); gtk_widget_show(lt_menu_item); } else { free_pcap_linktype_list(lt_list); @@ -413,7 +413,7 @@ static GtkWidget *time_unit_option_menu_new(guint32 value) { for(i=0;i<MAX_TIME_UNITS;i++){ menu_item=gtk_menu_item_new_with_label(time_unit_name[i]); g_object_set_data(G_OBJECT(menu_item), "time_unit", GINT_TO_POINTER(i)); - gtk_menu_append(GTK_MENU(menu), menu_item); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item); } /* the selected menu item can't be changed, once the option_menu @@ -514,7 +514,7 @@ static GtkWidget *size_unit_option_menu_new(guint32 value) { for(i=0;i<MAX_SIZE_UNITS;i++){ menu_item=gtk_menu_item_new_with_label(size_unit_name[i]); g_object_set_data(G_OBJECT(menu_item), "size_unit", GINT_TO_POINTER(i)); - gtk_menu_append(GTK_MENU(menu), menu_item); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item); } /* the selected menu item can't be changed, once the option_menu @@ -637,7 +637,7 @@ iftype_option_menu_new(capture_source value) g_object_set_data(G_OBJECT(menu_item), E_CAP_IFTYPE_OM_KEY, iftype_om); g_signal_connect(menu_item, "activate", G_CALLBACK(select_if_type_cb), GINT_TO_POINTER((int)iftype[i].id)); - gtk_menu_append(GTK_MENU(menu), menu_item); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item); if (value == iftype[i].id) active = i; } @@ -798,7 +798,7 @@ capture_remote_cb(GtkWidget *w _U_, gpointer d _U_) tooltips = gtk_tooltips_new(); main_vb = gtk_vbox_new(FALSE, 0); - gtk_container_border_width(GTK_CONTAINER(main_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); gtk_container_add(GTK_CONTAINER(remote_w), main_vb); /* Host/port table */ @@ -836,7 +836,7 @@ capture_remote_cb(GtkWidget *w _U_, gpointer d _U_) gtk_container_add(GTK_CONTAINER(main_vb), auth_fr); auth_vb = gtk_vbox_new(FALSE, 3); - gtk_container_border_width(GTK_CONTAINER(auth_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(auth_vb), 5); gtk_container_add(GTK_CONTAINER(auth_fr), auth_vb); auth_null_rb = gtk_radio_button_new_with_label(NULL, @@ -1041,7 +1041,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) tooltips = gtk_tooltips_new(); main_vb = gtk_vbox_new(FALSE, 0); - gtk_container_border_width(GTK_CONTAINER(main_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); gtk_container_add(GTK_CONTAINER(cap_open_w), main_vb); /* Capture-related options frame */ @@ -1049,7 +1049,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) gtk_container_add(GTK_CONTAINER(main_vb), capture_fr); capture_vb = gtk_vbox_new(FALSE, 3); - gtk_container_border_width(GTK_CONTAINER(capture_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(capture_vb), 5); gtk_container_add(GTK_CONTAINER(capture_fr), capture_vb); /* Interface row */ @@ -1175,7 +1175,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) /* Promiscuous mode row */ promisc_cb = gtk_check_button_new_with_mnemonic( "Capture packets in _promiscuous mode"); - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(promisc_cb), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(promisc_cb), global_capture_opts.promisc_mode); gtk_tooltips_set_tip(tooltips, promisc_cb, "Usually a network card will only capture the traffic sent to its own network address. " @@ -1187,13 +1187,13 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) /* RPCAP-related flags */ nocap_rpcap_cb = gtk_check_button_new_with_mnemonic( "Do not capture RPCAP own traffic"); - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(nocap_rpcap_cb), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(nocap_rpcap_cb), global_capture_opts.nocap_rpcap); gtk_container_add(GTK_CONTAINER(capture_vb), nocap_rpcap_cb); datatx_udp_cb = gtk_check_button_new_with_mnemonic( "Use UDP for RPCAP data transfer"); - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(datatx_udp_cb), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(datatx_udp_cb), global_capture_opts.datatx_udp); gtk_container_add(GTK_CONTAINER(capture_vb), datatx_udp_cb); #endif @@ -1203,7 +1203,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) gtk_container_add(GTK_CONTAINER(capture_vb), snap_hb); snap_cb = gtk_check_button_new_with_mnemonic("_Limit each packet to"); - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(snap_cb), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(snap_cb), global_capture_opts.has_snaplen); g_signal_connect(snap_cb, "toggled", G_CALLBACK(capture_prep_adjust_sensitivity), cap_open_w); gtk_tooltips_set_tip(tooltips, snap_cb, @@ -1256,15 +1256,15 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) gtk_widget_set_size_request(filter_cm, 400, -1); gtk_box_pack_start(GTK_BOX(filter_hb), filter_cm, FALSE, FALSE, 3); main_hb = gtk_hbox_new(FALSE, 5); - gtk_container_border_width(GTK_CONTAINER(main_hb), 0); + gtk_container_set_border_width(GTK_CONTAINER(main_hb), 0); gtk_container_add(GTK_CONTAINER(main_vb), main_hb); left_vb = gtk_vbox_new(FALSE, 0); - gtk_container_border_width(GTK_CONTAINER(left_vb), 0); + gtk_container_set_border_width(GTK_CONTAINER(left_vb), 0); gtk_box_pack_start(GTK_BOX(main_hb), left_vb, TRUE, TRUE, 0); right_vb = gtk_vbox_new(FALSE, 0); - gtk_container_border_width(GTK_CONTAINER(right_vb), 0); + gtk_container_set_border_width(GTK_CONTAINER(right_vb), 0); gtk_box_pack_start(GTK_BOX(main_hb), right_vb, FALSE, FALSE, 0); /* let an eventually capture filters dialog know the text entry to fill in */ @@ -1302,7 +1302,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) gtk_container_add(GTK_CONTAINER(left_vb), file_fr); file_vb = gtk_vbox_new(FALSE, 3); - gtk_container_border_width(GTK_CONTAINER(file_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(file_vb), 5); gtk_container_add(GTK_CONTAINER(file_fr), file_vb); /* File row */ @@ -1337,7 +1337,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) /* multiple files row */ multi_files_on_cb = gtk_check_button_new_with_mnemonic("Use _multiple files"); - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(multi_files_on_cb), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(multi_files_on_cb), global_capture_opts.multi_files_on); g_signal_connect(multi_files_on_cb, "toggled", G_CALLBACK(capture_prep_adjust_sensitivity), cap_open_w); @@ -1349,7 +1349,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) /* Ring buffer filesize row */ ring_filesize_cb = gtk_check_button_new_with_label("Next file every"); - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(ring_filesize_cb), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ring_filesize_cb), global_capture_opts.has_autostop_filesize || !global_capture_opts.has_file_duration); g_signal_connect(ring_filesize_cb, "toggled", G_CALLBACK(capture_prep_adjust_sensitivity), cap_open_w); gtk_tooltips_set_tip(tooltips, ring_filesize_cb, @@ -1375,7 +1375,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) /* Ring buffer duration row */ file_duration_cb = gtk_check_button_new_with_label("Next file every"); - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(file_duration_cb), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(file_duration_cb), global_capture_opts.has_file_duration); g_signal_connect(file_duration_cb, "toggled", G_CALLBACK(capture_prep_adjust_sensitivity), cap_open_w); @@ -1401,7 +1401,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) /* Ring buffer files row */ ringbuffer_nbf_cb = gtk_check_button_new_with_label("Ring buffer with"); - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(ringbuffer_nbf_cb), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ringbuffer_nbf_cb), global_capture_opts.has_ring_num_files); g_signal_connect(ringbuffer_nbf_cb, "toggled", G_CALLBACK(capture_prep_adjust_sensitivity), cap_open_w); gtk_tooltips_set_tip(tooltips, ringbuffer_nbf_cb, @@ -1425,7 +1425,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) /* Files row */ stop_files_cb = gtk_check_button_new_with_label("Stop capture after"); - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(stop_files_cb), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(stop_files_cb), global_capture_opts.has_autostop_files); g_signal_connect(stop_files_cb, "toggled", G_CALLBACK(capture_prep_adjust_sensitivity), cap_open_w); gtk_tooltips_set_tip(tooltips, stop_files_cb, @@ -1449,7 +1449,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) gtk_container_add(GTK_CONTAINER(left_vb), limit_fr); limit_vb = gtk_vbox_new(FALSE, 3); - gtk_container_border_width(GTK_CONTAINER(limit_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(limit_vb), 5); gtk_container_add(GTK_CONTAINER(limit_fr), limit_vb); /* limits table */ @@ -1461,7 +1461,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) /* Packet count row */ stop_packets_cb = gtk_check_button_new_with_label("... after"); - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(stop_packets_cb), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(stop_packets_cb), global_capture_opts.has_autostop_packets); g_signal_connect(stop_packets_cb, "toggled", G_CALLBACK(capture_prep_adjust_sensitivity), cap_open_w); gtk_tooltips_set_tip(tooltips, stop_packets_cb, @@ -1482,7 +1482,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) /* Filesize row */ stop_filesize_cb = gtk_check_button_new_with_label("... after"); - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(stop_filesize_cb), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(stop_filesize_cb), global_capture_opts.has_autostop_filesize); g_signal_connect(stop_filesize_cb, "toggled", G_CALLBACK(capture_prep_adjust_sensitivity), cap_open_w); gtk_tooltips_set_tip(tooltips, stop_filesize_cb, @@ -1506,7 +1506,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) /* Duration row */ stop_duration_cb = gtk_check_button_new_with_label("... after"); - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(stop_duration_cb), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(stop_duration_cb), global_capture_opts.has_autostop_duration); g_signal_connect(stop_duration_cb, "toggled", G_CALLBACK(capture_prep_adjust_sensitivity), cap_open_w); gtk_tooltips_set_tip(tooltips, stop_duration_cb, @@ -1533,7 +1533,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) gtk_container_add(GTK_CONTAINER(right_vb), sampling_fr); sampling_vb = gtk_vbox_new(FALSE, 0); - gtk_container_border_width(GTK_CONTAINER(sampling_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(sampling_vb), 5); gtk_container_add(GTK_CONTAINER(sampling_fr), sampling_vb); sampling_tb = gtk_table_new(3, 3, FALSE); @@ -1595,13 +1595,13 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) gtk_container_add(GTK_CONTAINER(right_vb), display_fr); display_vb = gtk_vbox_new(FALSE, 0); - gtk_container_border_width(GTK_CONTAINER(display_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(display_vb), 5); gtk_container_add(GTK_CONTAINER(display_fr), display_vb); /* "Update display in real time" row */ sync_cb = gtk_check_button_new_with_mnemonic( "_Update list of packets in real time"); - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(sync_cb), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(sync_cb), global_capture_opts.real_time_mode); g_signal_connect(sync_cb, "toggled", G_CALLBACK(capture_prep_adjust_sensitivity), cap_open_w); gtk_tooltips_set_tip(tooltips, sync_cb, @@ -1612,7 +1612,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) /* "Auto-scroll live update" row */ auto_scroll_cb = gtk_check_button_new_with_mnemonic( "_Automatic scrolling in live capture"); - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(auto_scroll_cb), auto_scroll_live); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(auto_scroll_cb), auto_scroll_live); gtk_tooltips_set_tip(tooltips, auto_scroll_cb, "This will scroll the \"Packet List\" automatically to the latest captured packet, " "when the \"Update List of packets in real time\" option is used.", NULL); @@ -1621,7 +1621,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) /* "Hide capture info" row */ hide_info_cb = gtk_check_button_new_with_mnemonic( "_Hide capture info dialog"); - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(hide_info_cb), !global_capture_opts.show_info); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(hide_info_cb), !global_capture_opts.show_info); gtk_tooltips_set_tip(tooltips, hide_info_cb, "Hide the capture info dialog while capturing.", NULL); gtk_container_add(GTK_CONTAINER(display_vb), hide_info_cb); @@ -1631,12 +1631,12 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) gtk_container_add(GTK_CONTAINER(right_vb), resolv_fr); resolv_vb = gtk_vbox_new(FALSE, 0); - gtk_container_border_width(GTK_CONTAINER(resolv_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(resolv_vb), 5); gtk_container_add(GTK_CONTAINER(resolv_fr), resolv_vb); m_resolv_cb = gtk_check_button_new_with_mnemonic( "Enable _MAC name resolution"); - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(m_resolv_cb), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_resolv_cb), g_resolv_flags & RESOLV_MAC); gtk_tooltips_set_tip(tooltips, m_resolv_cb, "Perform MAC layer name resolution while capturing.", NULL); @@ -1644,7 +1644,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) n_resolv_cb = gtk_check_button_new_with_mnemonic( "Enable _network name resolution"); - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(n_resolv_cb), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(n_resolv_cb), g_resolv_flags & RESOLV_NETWORK); gtk_tooltips_set_tip(tooltips, n_resolv_cb, "Perform network layer name resolution while capturing.", NULL); @@ -1652,7 +1652,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) t_resolv_cb = gtk_check_button_new_with_mnemonic( "Enable _transport name resolution"); - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(t_resolv_cb), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(t_resolv_cb), g_resolv_flags & RESOLV_TRANSPORT); gtk_tooltips_set_tip(tooltips, t_resolv_cb, "Perform transport layer name resolution while capturing.", NULL); diff --git a/gtk/capture_file_dlg.c b/gtk/capture_file_dlg.c index a5586f171c..f1ac9988eb 100644 --- a/gtk/capture_file_dlg.c +++ b/gtk/capture_file_dlg.c @@ -476,13 +476,13 @@ file_open_cmd(GtkWidget *w) /* Container for each row of widgets */ main_vb = gtk_vbox_new(FALSE, 3); - gtk_container_border_width(GTK_CONTAINER(main_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); gtk_box_pack_start(GTK_BOX(main_hb), main_vb, FALSE, FALSE, 0); gtk_widget_show(main_vb); /* filter row */ filter_hbox = gtk_hbox_new(FALSE, 1); - gtk_container_border_width(GTK_CONTAINER(filter_hbox), 0); + gtk_container_set_border_width(GTK_CONTAINER(filter_hbox), 0); gtk_box_pack_start(GTK_BOX(main_vb), filter_hbox, FALSE, FALSE, 0); gtk_widget_show(filter_hbox); @@ -766,7 +766,7 @@ file_merge_cmd(GtkWidget *w) /* Container for each row of widgets */ main_vb = gtk_vbox_new(FALSE, 3); - gtk_container_border_width(GTK_CONTAINER(main_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); gtk_box_pack_start(GTK_BOX(main_hb), main_vb, FALSE, FALSE, 0); gtk_widget_show(main_vb); @@ -788,7 +788,7 @@ file_merge_cmd(GtkWidget *w) gtk_widget_show(ft_om); filter_hbox = gtk_hbox_new(FALSE, 1); - gtk_container_border_width(GTK_CONTAINER(filter_hbox), 0); + gtk_container_set_border_width(GTK_CONTAINER(filter_hbox), 0); gtk_box_pack_start(GTK_BOX(main_vb), filter_hbox, FALSE, FALSE, 0); gtk_widget_show(filter_hbox); @@ -1106,7 +1106,7 @@ set_file_type_list(GtkWidget *option_menu) } g_signal_connect(ft_menu_item, "activate", G_CALLBACK(select_file_type_cb), GINT_TO_POINTER(ft)); - gtk_menu_append(GTK_MENU(ft_menu), ft_menu_item); + gtk_menu_shell_append(GTK_MENU_SHELL(ft_menu), ft_menu_item); gtk_widget_show(ft_menu_item); index++; } @@ -1201,7 +1201,7 @@ file_save_as_cmd(action_after_save_e action_after_save, gpointer action_after_sa /* Container for each row of widgets */ main_vb = gtk_vbox_new(FALSE, 5); - gtk_container_border_width(GTK_CONTAINER(main_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); file_selection_set_extra_widget(file_save_as_w, main_vb); gtk_widget_show(main_vb); @@ -1511,7 +1511,7 @@ file_color_import_cmd_cb(GtkWidget *color_filters, gpointer filter_list _U_) /* Container for each row of widgets */ main_vb = gtk_vbox_new(FALSE, 3); - gtk_container_border_width(GTK_CONTAINER(main_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); file_selection_set_extra_widget(file_color_import_w, main_vb); gtk_widget_show(main_vb); @@ -1647,7 +1647,7 @@ file_color_export_cmd_cb(GtkWidget *w _U_, gpointer filter_list) /* Container for each row of widgets */ main_vb = gtk_vbox_new(FALSE, 3); - gtk_container_border_width(GTK_CONTAINER(main_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); file_selection_set_extra_widget(file_color_export_w, main_vb); gtk_widget_show(main_vb); diff --git a/gtk/capture_if_details_dlg_win32.c b/gtk/capture_if_details_dlg_win32.c index 2600acb584..8577a01767 100644 --- a/gtk/capture_if_details_dlg_win32.c +++ b/gtk/capture_if_details_dlg_win32.c @@ -2246,7 +2246,7 @@ capture_if_details_page_new(GtkWidget **table) GtkWidget *main_vb; main_vb = gtk_vbox_new(FALSE, 6); - gtk_container_border_width(GTK_CONTAINER(main_vb), 12); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 12); /* table */ *table = gtk_table_new(1, 2, FALSE); @@ -2286,7 +2286,7 @@ capture_if_details_open_win(char *iface) /* Container for the window contents */ main_vb = gtk_vbox_new(FALSE, 12); - gtk_container_border_width(GTK_CONTAINER(main_vb), 12); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 12); gtk_container_add(GTK_CONTAINER(details_open_w), main_vb); /* notebook */ diff --git a/gtk/capture_if_dlg.c b/gtk/capture_if_dlg.c index 6022b54591..b2b887dae8 100644 --- a/gtk/capture_if_dlg.c +++ b/gtk/capture_if_dlg.c @@ -450,7 +450,7 @@ capture_if_cb(GtkWidget *w _U_, gpointer d _U_) gtk_container_add(GTK_CONTAINER(cap_if_w), main_sw); main_vb = gtk_vbox_new(FALSE, 0); - gtk_container_border_width(GTK_CONTAINER(main_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(main_sw), main_vb); diff --git a/gtk/capture_info_dlg.c b/gtk/capture_info_dlg.c index 5a47567a53..5acdfa048f 100644 --- a/gtk/capture_info_dlg.c +++ b/gtk/capture_info_dlg.c @@ -178,7 +178,7 @@ capture_options *capture_opts) /* Container for capture display widgets */ main_vb = gtk_vbox_new(FALSE, 1); - gtk_container_border_width(GTK_CONTAINER(main_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); gtk_container_add(GTK_CONTAINER(info->cap_w), main_vb); gtk_widget_show(main_vb); @@ -189,7 +189,7 @@ capture_options *capture_opts) /* Individual statistic elements */ counts_tb = gtk_table_new(PACKET_COUNTS_SIZE, 4, TRUE); gtk_container_add(GTK_CONTAINER(counts_fr), counts_tb); - gtk_container_border_width(GTK_CONTAINER(counts_tb), 5); + gtk_container_set_border_width(GTK_CONTAINER(counts_tb), 5); gtk_widget_show(counts_tb); gtk_table_set_row_spacings(GTK_TABLE(counts_tb), 0); diff --git a/gtk/color_edit_dlg.c b/gtk/color_edit_dlg.c index 6762b142ef..a7cd328892 100644 --- a/gtk/color_edit_dlg.c +++ b/gtk/color_edit_dlg.c @@ -227,7 +227,7 @@ edit_color_filter_dialog(GtkWidget *color_filters, gtk_container_add(GTK_CONTAINER(status_fr), status_vbox); disabled_cb = gtk_check_button_new_with_label("Disabled"); - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(disabled_cb), colorf->disabled); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(disabled_cb), colorf->disabled); gtk_box_pack_start (GTK_BOX (status_vbox), disabled_cb, TRUE, FALSE, 0); gtk_tooltips_set_tip (tooltips, disabled_cb, ("Color rule won't be checked if this box is selected"), NULL); diff --git a/gtk/conversations_table.c b/gtk/conversations_table.c index 36b1bfb011..dcd1d3c8df 100644 --- a/gtk/conversations_table.c +++ b/gtk/conversations_table.c @@ -1564,7 +1564,7 @@ init_conversation_notebook_cb(GtkWidget *w _U_, gpointer d _U_) resolv_cb = gtk_check_button_new_with_mnemonic("Name resolution"); gtk_container_add(GTK_CONTAINER(hbox), resolv_cb); - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(resolv_cb), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(resolv_cb), TRUE); 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); @@ -1572,7 +1572,7 @@ init_conversation_notebook_cb(GtkWidget *w _U_, gpointer d _U_) 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_toggle_button_set_active(GTK_TOGGLE_BUTTON(filter_cb), FALSE); gtk_tooltips_set_tip(tooltips, filter_cb, "Limit the list to conversations matching the current display filter.", NULL); g_signal_connect(filter_cb, "toggled", G_CALLBACK(ct_filter_toggle_dest), pages); diff --git a/gtk/dcerpc_stat.c b/gtk/dcerpc_stat.c index 9b474f90db..553ce382c4 100644 --- a/gtk/dcerpc_stat.c +++ b/gtk/dcerpc_stat.c @@ -406,7 +406,7 @@ dcerpcstat_find_vers(gpointer *key, gpointer *value _U_, gpointer *user_data _U_ g_signal_connect(menu_item, "activate", G_CALLBACK(dcerpcstat_version_select), (gpointer)((long)k->ver)); gtk_widget_show(menu_item); - gtk_menu_append(GTK_MENU(vers_menu), menu_item); + gtk_menu_shell_append(GTK_MENU_SHELL(vers_menu), menu_item); if(dcerpc_version==0xffff){ dcerpc_version=k->ver; @@ -458,7 +458,7 @@ dcerpcstat_add_program_to_menu(dcerpc_uuid_key *k, dcerpc_uuid_value *v) gtk_widget_show(program_submenu_label); gtk_widget_show(box); - gtk_menu_append(GTK_MENU(prog_menu), program_submenu_item); + gtk_menu_shell_append(GTK_MENU_SHELL(prog_menu), program_submenu_item); gtk_widget_show(program_submenu_item); program_submenu_menu=gtk_menu_new(); @@ -476,7 +476,7 @@ dcerpcstat_add_program_to_menu(dcerpc_uuid_key *k, dcerpc_uuid_value *v) g_signal_connect(program_menu_item, "activate", G_CALLBACK(dcerpcstat_program_select), k); gtk_widget_show(program_menu_item); - gtk_menu_append(GTK_MENU(program_submenu_menu), program_menu_item); + gtk_menu_shell_append(GTK_MENU_SHELL(program_submenu_menu), program_menu_item); if(!dcerpc_uuid_program){ dcerpc_uuid_program=&k->uuid; @@ -568,7 +568,7 @@ gtk_dcerpcstat_cb(GtkWidget *w _U_, gpointer d _U_) gtk_window_set_default_size(GTK_WINDOW(dlg), 400, -1); dlg_box=gtk_vbox_new(FALSE, 10); - gtk_container_border_width(GTK_CONTAINER(dlg_box), 10); + gtk_container_set_border_width(GTK_CONTAINER(dlg_box), 10); gtk_container_add(GTK_CONTAINER(dlg), dlg_box); gtk_widget_show(dlg_box); diff --git a/gtk/decode_as_dlg.c b/gtk/decode_as_dlg.c index 791ba7baae..9d003d3160 100644 --- a/gtk/decode_as_dlg.c +++ b/gtk/decode_as_dlg.c @@ -534,7 +534,7 @@ decode_show_cb (GtkWidget * w _U_, gpointer data _U_) /* Container for each row of widgets */ main_vb = gtk_vbox_new(FALSE, 2); - gtk_container_border_width(GTK_CONTAINER(main_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); gtk_container_add(GTK_CONTAINER(decode_show_w), main_vb); { @@ -997,14 +997,14 @@ decode_add_yes_no (void) format_vb = gtk_vbox_new(FALSE, 2); radio_button = gtk_radio_button_new_with_label(NULL, "Decode"); - format_grp = gtk_radio_button_group(GTK_RADIO_BUTTON(radio_button)); + format_grp = gtk_radio_button_get_group(GTK_RADIO_BUTTON(radio_button)); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_button), TRUE); g_signal_connect(radio_button, "clicked", G_CALLBACK(decode_update_action), GINT_TO_POINTER(E_DECODE_YES)); gtk_box_pack_start(GTK_BOX(format_vb), radio_button, TRUE, TRUE, 0); radio_button = gtk_radio_button_new_with_label(format_grp, "Do not decode"); - format_grp = gtk_radio_button_group(GTK_RADIO_BUTTON(radio_button)); + format_grp = gtk_radio_button_get_group(GTK_RADIO_BUTTON(radio_button)); g_signal_connect(radio_button, "clicked", G_CALLBACK(decode_update_action), GINT_TO_POINTER(E_DECODE_NO)); gtk_box_pack_start(GTK_BOX(format_vb), radio_button, TRUE, TRUE, 0); @@ -1060,18 +1060,18 @@ decode_add_srcdst_menu (GtkWidget *page) g_snprintf(tmp, 100, "source (%u)", cfile.edt->pi.srcport); menuitem = gtk_menu_item_new_with_label(tmp); g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(E_DECODE_SPORT)); - gtk_menu_append(GTK_MENU(menu), menuitem); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); gtk_widget_show(menuitem); /* gtk_widget_show_all() doesn't show this */ g_snprintf(tmp, 100, "destination (%u)", cfile.edt->pi.destport); menuitem = gtk_menu_item_new_with_label(tmp); g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(E_DECODE_DPORT)); - gtk_menu_append(GTK_MENU(menu), menuitem); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); gtk_widget_show(menuitem); /* gtk_widget_show_all() doesn't show this */ menuitem = gtk_menu_item_new_with_label("both"); g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(E_DECODE_BPORT)); - gtk_menu_append(GTK_MENU(menu), menuitem); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); gtk_widget_show(menuitem); /* gtk_widget_show_all() doesn't show this */ g_object_set_data(G_OBJECT(page), E_MENU_SRCDST, menu); @@ -1097,7 +1097,7 @@ decode_add_ppid_menu (GtkWidget *page) g_snprintf(tmp, 100, "PPID (%u)", 0); menuitem = gtk_menu_item_new_with_label(tmp); g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(E_DECODE_PPID)); - gtk_menu_append(GTK_MENU(menu), menuitem); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); gtk_widget_show(menuitem); /* gtk_widget_show_all() doesn't show this */ for(number_of_ppid = 0; number_of_ppid < MAX_NUMBER_OF_PPIDS; number_of_ppid++) @@ -1105,7 +1105,7 @@ decode_add_ppid_menu (GtkWidget *page) g_snprintf(tmp, 100, "PPID (%u)", cfile.edt->pi.ppid[number_of_ppid]); menuitem = gtk_menu_item_new_with_label(tmp); g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(E_DECODE_PPID + 1 + number_of_ppid)); - gtk_menu_append(GTK_MENU(menu), menuitem); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); gtk_widget_show(menuitem); /* gtk_widget_show_all() doesn't show this */ } else break; @@ -1470,14 +1470,14 @@ decode_sctp_update_ppid_menu(GtkWidget *w _U_, GtkWidget *page) g_snprintf(tmp, 100, "PPID (%u)", 0); menuitem = gtk_menu_item_new_with_label(tmp); g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(E_DECODE_PPID)); - gtk_menu_append(GTK_MENU(menu), menuitem); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); gtk_widget_show(menuitem); /* gtk_widget_show_all() doesn't show this */ for(number_of_ppid = 0; number_of_ppid < MAX_NUMBER_OF_PPIDS; number_of_ppid++) if (cfile.edt->pi.ppid[number_of_ppid] != 0) { g_snprintf(tmp, 100, "PPID (%u)", cfile.edt->pi.ppid[number_of_ppid]); menuitem = gtk_menu_item_new_with_label(tmp); g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(E_DECODE_PPID + 1 + number_of_ppid)); - gtk_menu_append(GTK_MENU(menu), menuitem); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); gtk_widget_show(menuitem); /* gtk_widget_show_all() doesn't show this */ } else break; @@ -1506,18 +1506,18 @@ decode_sctp_update_srcdst_menu(GtkWidget *w _U_, GtkWidget *page) g_snprintf(tmp, 100, "source (%u)", cfile.edt->pi.srcport); menuitem = gtk_menu_item_new_with_label(tmp); g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(E_DECODE_SPORT)); - gtk_menu_append(GTK_MENU(menu), menuitem); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); gtk_widget_show(menuitem); /* gtk_widget_show_all() doesn't show this */ g_snprintf(tmp, 100, "destination (%u)", cfile.edt->pi.destport); menuitem = gtk_menu_item_new_with_label(tmp); g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(E_DECODE_DPORT)); - gtk_menu_append(GTK_MENU(menu), menuitem); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); gtk_widget_show(menuitem); /* gtk_widget_show_all() doesn't show this */ menuitem = gtk_menu_item_new_with_label("both"); g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(E_DECODE_BPORT)); - gtk_menu_append(GTK_MENU(menu), menuitem); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); gtk_widget_show(menuitem); /* gtk_widget_show_all() doesn't show this */ g_object_set_data(G_OBJECT(page), E_MENU_SRCDST, menu); @@ -1544,14 +1544,14 @@ decode_sctp_add_port_ppid (GtkWidget *page) format_vb = gtk_vbox_new(FALSE, 2); radio_button = gtk_radio_button_new_with_label(NULL, "PPID"); - format_grp = gtk_radio_button_group(GTK_RADIO_BUTTON(radio_button)); + format_grp = gtk_radio_button_get_group(GTK_RADIO_BUTTON(radio_button)); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_button), TRUE); g_signal_connect(radio_button, "clicked", G_CALLBACK(decode_sctp_update_ppid_menu), page); gtk_box_pack_start(GTK_BOX(format_vb), radio_button, TRUE, TRUE, 0); radio_button = gtk_radio_button_new_with_label(format_grp, "Port"); - format_grp = gtk_radio_button_group(GTK_RADIO_BUTTON(radio_button)); + format_grp = gtk_radio_button_get_group(GTK_RADIO_BUTTON(radio_button)); g_signal_connect(radio_button, "clicked", G_CALLBACK(decode_sctp_update_srcdst_menu), page); gtk_box_pack_start(GTK_BOX(format_vb), radio_button, TRUE, TRUE, 0); @@ -1693,7 +1693,7 @@ decode_add_notebook (GtkWidget *format_hb) /* Select the last added page (selects first by default) */ /* Notebook must be visible for set_page to work. */ gtk_widget_show_all(notebook); - gtk_notebook_set_page(GTK_NOTEBOOK(notebook), -1); + gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook), -1); } @@ -1732,7 +1732,7 @@ decode_as_cb (GtkWidget * w _U_, gpointer data _U_) /* Container for each row of widgets */ main_vb = gtk_vbox_new(FALSE, 2); - gtk_container_border_width(GTK_CONTAINER(main_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); gtk_container_add(GTK_CONTAINER(decode_w), main_vb); /* First row - Buttons and Notebook */ diff --git a/gtk/dfilter_expr_dlg.c b/gtk/dfilter_expr_dlg.c index ce06338f7f..cc4d693a23 100644 --- a/gtk/dfilter_expr_dlg.c +++ b/gtk/dfilter_expr_dlg.c @@ -950,15 +950,15 @@ dfilter_expr_dlg_new(GtkWidget *filter_te) gtk_container_set_border_width(GTK_CONTAINER(window), 5); main_vb = gtk_vbox_new(FALSE, 5); - gtk_container_border_width(GTK_CONTAINER(main_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); gtk_container_add(GTK_CONTAINER(window), main_vb); main_hb = gtk_hbox_new(FALSE, 5); - gtk_container_border_width(GTK_CONTAINER(main_hb), 5); + gtk_container_set_border_width(GTK_CONTAINER(main_hb), 5); gtk_container_add(GTK_CONTAINER(main_vb), main_hb); field_vb = gtk_vbox_new(FALSE, 5); - gtk_container_border_width(GTK_CONTAINER(field_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(field_vb), 5); gtk_container_add(GTK_CONTAINER(main_hb), field_vb); field_tree_lb = gtk_label_new("Field name"); @@ -987,7 +987,7 @@ dfilter_expr_dlg_new(GtkWidget *filter_te) gtk_container_add(GTK_CONTAINER(tree_scrolled_win), field_tree); relation_vb = gtk_vbox_new(FALSE, 5); - gtk_container_border_width(GTK_CONTAINER(relation_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(relation_vb), 5); gtk_container_add(GTK_CONTAINER(main_hb), relation_vb); relation_label = gtk_label_new("Relation"); @@ -1062,7 +1062,7 @@ dfilter_expr_dlg_new(GtkWidget *filter_te) */ /* value column */ value_vb = gtk_vbox_new(FALSE, 5); - gtk_container_border_width(GTK_CONTAINER(value_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(value_vb), 5); gtk_container_add(GTK_CONTAINER(main_hb), value_vb); value_label = gtk_label_new("Value"); diff --git a/gtk/dlg_utils.c b/gtk/dlg_utils.c index e5cc8fdfa8..85d115f6b2 100644 --- a/gtk/dlg_utils.c +++ b/gtk/dlg_utils.c @@ -70,7 +70,7 @@ dlg_button_focus_nth(GtkWidget *hbox, gint focus_item) { return; button_hbox = g_object_get_data(G_OBJECT(hbox), BUTTON_HBOX_KEY); - children = gtk_container_children(GTK_CONTAINER(button_hbox)); + children = gtk_container_get_children(GTK_CONTAINER(button_hbox)); while (children) { if (cur_item == focus_item) { diff --git a/gtk/drag_and_drop.c b/gtk/drag_and_drop.c index acbb0862ab..5a1121c143 100644 --- a/gtk/drag_and_drop.c +++ b/gtk/drag_and_drop.c @@ -379,8 +379,7 @@ dnd_init(GtkWidget *w) (GdkDragAction)(GDK_ACTION_MOVE | GDK_ACTION_COPY) ); /* get notified, if some dnd coming in */ - gtk_signal_connect(GTK_OBJECT(w), "drag_data_received", - GTK_SIGNAL_FUNC(dnd_data_received), NULL); + g_signal_connect(w, "drag_data_received", G_CALLBACK(dnd_data_received), NULL); } diff --git a/gtk/expert_dlg.c b/gtk/expert_dlg.c index b6e9bc3154..a379ead037 100644 --- a/gtk/expert_dlg.c +++ b/gtk/expert_dlg.c @@ -526,7 +526,7 @@ expert_dlg_init(const char *optarg, void* userdata _U_) menu_item=gtk_menu_item_new_with_label(expert_severity_om_vals[i].strptr); g_object_set_data(G_OBJECT(menu_item), "tapdata", etd); g_signal_connect(menu_item, "activate", G_CALLBACK(expert_dlg_severity_cb), (gpointer)(long) i); - gtk_menu_append(GTK_MENU(menu), menu_item); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item); if(expert_severity_om_vals[i].value == (guint) etd->severity_report_level) { gtk_menu_set_active(GTK_MENU(menu), i); } diff --git a/gtk/export_object.c b/gtk/export_object.c index b73cb3bff7..c20ac67171 100644 --- a/gtk/export_object.c +++ b/gtk/export_object.c @@ -299,7 +299,7 @@ export_object_window(const gchar *tapname, const gchar *name, tap_packet_cb tap_ vbox = gtk_vbox_new(FALSE, 5); - gtk_container_border_width(GTK_CONTAINER(vbox), 5); + gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); gtk_container_add(GTK_CONTAINER(object_list->dlg), vbox); sw = scrolled_window_new(NULL, NULL); diff --git a/gtk/fileset_dlg.c b/gtk/fileset_dlg.c index f7ab53254b..9b7bca36be 100644 --- a/gtk/fileset_dlg.c +++ b/gtk/fileset_dlg.c @@ -294,7 +294,7 @@ fileset_cb(GtkWidget *w _U_, gpointer d _U_) tooltips = gtk_tooltips_new(); main_vb = gtk_vbox_new(FALSE, 5); - gtk_container_border_width(GTK_CONTAINER(main_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); gtk_container_add(GTK_CONTAINER(fs_w), main_vb); fs_sw = gtk_scrolled_window_new(NULL, NULL); diff --git a/gtk/filter_dlg.c b/gtk/filter_dlg.c index d529cf544b..e76ddadf7d 100644 --- a/gtk/filter_dlg.c +++ b/gtk/filter_dlg.c @@ -413,7 +413,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te, g_object_set_data(G_OBJECT(main_w), E_FILT_CONSTRUCT_ARGS_KEY, construct_args); main_vb = gtk_vbox_new(FALSE, 0); - gtk_container_border_width(GTK_CONTAINER(main_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); gtk_container_add(GTK_CONTAINER(main_w), main_vb); gtk_widget_show(main_vb); @@ -423,7 +423,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te, /* Container for each row of widgets */ filter_vb = gtk_vbox_new(FALSE, 0); - gtk_container_border_width(GTK_CONTAINER(filter_vb), 0); + gtk_container_set_border_width(GTK_CONTAINER(filter_vb), 0); gtk_container_add(GTK_CONTAINER(main_vb), filter_vb); gtk_widget_show(filter_vb); @@ -437,7 +437,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te, gtk_widget_show(edit_fr); list_bb = gtk_vbox_new(TRUE, 0); - gtk_container_border_width(GTK_CONTAINER(list_bb), 5); + gtk_container_set_border_width(GTK_CONTAINER(list_bb), 5); gtk_container_add(GTK_CONTAINER(edit_fr), list_bb); gtk_widget_show(list_bb); @@ -503,7 +503,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te, gtk_widget_show(props_fr); props_vb = gtk_vbox_new(FALSE, 3); - gtk_container_border_width(GTK_CONTAINER(props_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(props_vb), 5); gtk_container_add(GTK_CONTAINER(props_fr), props_vb); gtk_widget_show(props_vb); diff --git a/gtk/find_dlg.c b/gtk/find_dlg.c index 950f8e03ae..6f00b06b6a 100644 --- a/gtk/find_dlg.c +++ b/gtk/find_dlg.c @@ -140,7 +140,7 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_) /* Container for each row of widgets */ main_vb = gtk_vbox_new(FALSE, 3); - gtk_container_border_width(GTK_CONTAINER(main_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); gtk_container_add(GTK_CONTAINER(find_frame_w), main_vb); gtk_widget_show(main_vb); @@ -157,7 +157,7 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_) gtk_widget_show(find_type_frame); find_type_vb = gtk_vbox_new(FALSE, 3); - gtk_container_border_width(GTK_CONTAINER(find_type_vb), 3); + gtk_container_set_border_width(GTK_CONTAINER(find_type_vb), 3); gtk_container_add(GTK_CONTAINER(find_type_frame), find_type_vb); gtk_widget_show(find_type_vb); @@ -226,7 +226,7 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_) /* search in row */ data_vb = gtk_vbox_new(TRUE, 0); - gtk_container_border_width(GTK_CONTAINER(data_vb), 3); + gtk_container_set_border_width(GTK_CONTAINER(data_vb), 3); gtk_container_add(GTK_CONTAINER(data_frame), data_vb); gtk_widget_show(data_vb); @@ -258,7 +258,7 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_) string_opt_vb = gtk_vbox_new(FALSE, 0); gtk_container_add(GTK_CONTAINER(string_opt_frame), string_opt_vb); - gtk_container_border_width(GTK_CONTAINER(string_opt_vb), 3); + gtk_container_set_border_width(GTK_CONTAINER(string_opt_vb), 3); gtk_widget_show(string_opt_vb); case_cb = gtk_check_button_new_with_mnemonic("Case sensitive"); @@ -296,7 +296,7 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_) /* Direction row: Forward and reverse radio buttons */ direction_vb = gtk_vbox_new(FALSE, 0); - gtk_container_border_width(GTK_CONTAINER(direction_vb), 3); + gtk_container_set_border_width(GTK_CONTAINER(direction_vb), 3); gtk_container_add(GTK_CONTAINER(direction_frame), direction_vb); gtk_widget_show(direction_vb); diff --git a/gtk/firewall_dlg.c b/gtk/firewall_dlg.c index edb10d6e80..f74ecbe1cd 100644 --- a/gtk/firewall_dlg.c +++ b/gtk/firewall_dlg.c @@ -222,7 +222,7 @@ firewall_rule_cb(GtkWidget *w _U_, gpointer data _U_) rule_w = dlg_window_new("Firewall ACL Rules"); gtk_widget_set_name(rule_w, "Firewall ACL rule window"); - gtk_container_border_width(GTK_CONTAINER(rule_w), 6); + gtk_container_set_border_width(GTK_CONTAINER(rule_w), 6); /* setup the container */ tooltips = gtk_tooltips_new (); @@ -244,7 +244,7 @@ firewall_rule_cb(GtkWidget *w _U_, gpointer data _U_) menu_item = gtk_menu_item_new_with_label(products[i].name); g_signal_connect(menu_item, "activate", G_CALLBACK(select_product), GUINT_TO_POINTER(i)); g_object_set_data(G_OBJECT(menu_item), WS_RULE_INFO_KEY, rule_info); - gtk_menu_append(GTK_MENU(menu), menu_item); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item); /* if (i == 0) gtk_menu_item_select(GTK_MENU_ITEM(menu_item)); */ } @@ -328,7 +328,7 @@ firewall_rule_cb(GtkWidget *w _U_, gpointer data _U_) g_signal_connect(menu_item, "activate", G_CALLBACK(select_filter), \ GUINT_TO_POINTER(rt)); \ g_object_set_data(G_OBJECT(menu_item), WS_RULE_INFO_KEY, rule_info); \ - gtk_menu_append(GTK_MENU(menu), menu_item); \ + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item); \ if (! rt_set) { \ rt_set = TRUE; \ first_mi = menu_item; \ diff --git a/gtk/flow_graph.c b/gtk/flow_graph.c index 3169c4e279..076018485e 100644 --- a/gtk/flow_graph.c +++ b/gtk/flow_graph.c @@ -508,7 +508,7 @@ static void flow_graph_dlg_create (void) gtk_box_pack_start(GTK_BOX(main_vb), range_fr, FALSE, FALSE, 0); range_tb = gtk_table_new(4, 4, FALSE); - gtk_container_border_width(GTK_CONTAINER(range_tb), 5); + gtk_container_set_border_width(GTK_CONTAINER(range_tb), 5); gtk_container_add(GTK_CONTAINER(range_fr), range_tb); /* Process all packets */ @@ -542,7 +542,7 @@ static void flow_graph_dlg_create (void) gtk_box_pack_start(GTK_BOX(main_vb), flow_type_fr, FALSE, FALSE, 0); flow_type_tb = gtk_table_new(4, 4, FALSE); - gtk_container_border_width(GTK_CONTAINER(flow_type_tb), 5); + gtk_container_set_border_width(GTK_CONTAINER(flow_type_tb), 5); gtk_container_add(GTK_CONTAINER(flow_type_fr), flow_type_tb); /* General information */ @@ -576,7 +576,7 @@ static void flow_graph_dlg_create (void) gtk_box_pack_start(GTK_BOX(main_vb), node_addr_fr, FALSE, FALSE, 0); node_addr_tb = gtk_table_new(4, 4, FALSE); - gtk_container_border_width(GTK_CONTAINER(node_addr_tb), 5); + gtk_container_set_border_width(GTK_CONTAINER(node_addr_tb), 5); gtk_container_add(GTK_CONTAINER(node_addr_fr), node_addr_tb); /* Source / Dest address */ diff --git a/gtk/follow_stream.c b/gtk/follow_stream.c index 458d41c541..6a154430c7 100644 --- a/gtk/follow_stream.c +++ b/gtk/follow_stream.c @@ -281,7 +281,7 @@ follow_find_cb(GtkWidget * w _U_, gpointer data) /* Main vertical box */ main_vb = gtk_vbox_new(FALSE, 3); - gtk_container_border_width(GTK_CONTAINER(main_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); gtk_container_add(GTK_CONTAINER(find_dlg_w), main_vb); /* Horizontal box for find label, entry field and up/down radio @@ -680,7 +680,7 @@ follow_stream(gchar *title, follow_info_t *follow_info, gtk_widget_set_name(streamwindow, title); gtk_window_set_default_size(GTK_WINDOW(streamwindow), DEF_WIDTH, DEF_HEIGHT); - gtk_container_border_width(GTK_CONTAINER(streamwindow), 6); + gtk_container_set_border_width(GTK_CONTAINER(streamwindow), 6); /* setup the container */ tooltips = gtk_tooltips_new (); @@ -775,7 +775,7 @@ follow_stream(gchar *title, follow_info_t *follow_info, follow_info->ascii_bt = radio_bt; /* EBCDIC radio button */ - radio_bt = gtk_radio_button_new_with_label(gtk_radio_button_group + radio_bt = gtk_radio_button_new_with_label(gtk_radio_button_get_group (GTK_RADIO_BUTTON(radio_bt)), "EBCDIC"); gtk_tooltips_set_tip (tooltips, radio_bt, "Stream data output in \"EBCDIC\" format", NULL); @@ -787,7 +787,7 @@ follow_stream(gchar *title, follow_info_t *follow_info, follow_info->ebcdic_bt = radio_bt; /* HEX DUMP radio button */ - radio_bt = gtk_radio_button_new_with_label(gtk_radio_button_group + radio_bt = gtk_radio_button_new_with_label(gtk_radio_button_get_group (GTK_RADIO_BUTTON(radio_bt)), "Hex Dump"); gtk_tooltips_set_tip (tooltips, radio_bt, "Stream data output in \"Hexdump\" format", NULL); @@ -799,7 +799,7 @@ follow_stream(gchar *title, follow_info_t *follow_info, follow_info->hexdump_bt = radio_bt; /* C Array radio button */ - radio_bt = gtk_radio_button_new_with_label(gtk_radio_button_group + radio_bt = gtk_radio_button_new_with_label(gtk_radio_button_get_group (GTK_RADIO_BUTTON(radio_bt)), "C Arrays"); gtk_tooltips_set_tip (tooltips, radio_bt, "Stream data output in \"C Array\" format", NULL); @@ -811,7 +811,7 @@ follow_stream(gchar *title, follow_info_t *follow_info, follow_info->carray_bt = radio_bt; /* Raw radio button */ - radio_bt = gtk_radio_button_new_with_label(gtk_radio_button_group + radio_bt = gtk_radio_button_new_with_label(gtk_radio_button_get_group (GTK_RADIO_BUTTON(radio_bt)), "Raw"); gtk_tooltips_set_tip (tooltips, radio_bt, "Stream data output in \"Raw\" (binary) format. As this contains non printable characters, the screen output will be in ASCII format", NULL); diff --git a/gtk/funnel_stat.c b/gtk/funnel_stat.c index ead592780d..2995ef6a9a 100644 --- a/gtk/funnel_stat.c +++ b/gtk/funnel_stat.c @@ -162,7 +162,7 @@ static funnel_text_window_t* new_text_window(const gchar* title) { txt_scrollw = scrolled_window_new(NULL, NULL); main_vb = gtk_vbox_new(FALSE, 3); - gtk_container_border_width(GTK_CONTAINER(main_vb), 6); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 6); gtk_container_add(GTK_CONTAINER(tw->win), main_vb); gtk_container_add(GTK_CONTAINER(main_vb), txt_scrollw); @@ -421,7 +421,7 @@ static void funnel_new_dialog(const gchar* title, main_vb = gtk_vbox_new(TRUE,5); gtk_container_add(GTK_CONTAINER(win), main_vb); - gtk_container_border_width(GTK_CONTAINER(main_vb), 6); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 6); main_tb = gtk_table_new(i+1, 2, FALSE); gtk_box_pack_start(GTK_BOX(main_vb), main_tb, FALSE, FALSE, 0); diff --git a/gtk/goto_dlg.c b/gtk/goto_dlg.c index a7f144a736..d893492330 100644 --- a/gtk/goto_dlg.c +++ b/gtk/goto_dlg.c @@ -56,7 +56,7 @@ goto_frame_cb(GtkWidget *w _U_, gpointer d _U_) /* Container for each row of widgets */ main_vb = gtk_vbox_new(FALSE, 3); - gtk_container_border_width(GTK_CONTAINER(main_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); gtk_container_add(GTK_CONTAINER(goto_frame_w), main_vb); gtk_widget_show(main_vb); diff --git a/gtk/graph_analysis.c b/gtk/graph_analysis.c index b99c6e0689..98995ceb9c 100644 --- a/gtk/graph_analysis.c +++ b/gtk/graph_analysis.c @@ -546,7 +546,7 @@ on_save_bt_clicked (GtkButton *button _U_, /* Container for each row of widgets */ vertb = gtk_vbox_new(FALSE, 0); - gtk_container_border_width(GTK_CONTAINER(vertb), 5); + gtk_container_set_border_width(GTK_CONTAINER(vertb), 5); gtk_box_pack_start(GTK_BOX(GTK_FILE_SELECTION(save_to_file_w)->action_area), vertb, FALSE, FALSE, 0); gtk_widget_show (vertb); diff --git a/gtk/gsm_map_summary.c b/gtk/gsm_map_summary.c index 8553672590..c12a1cae37 100644 --- a/gtk/gsm_map_summary.c +++ b/gtk/gsm_map_summary.c @@ -99,7 +99,7 @@ gsm_map_stat_gtk_sum_cb(GtkWidget *w _U_, gpointer d _U_) /* Container for each row of widgets */ main_vb = gtk_vbox_new(FALSE, 3); - gtk_container_border_width(GTK_CONTAINER(main_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); gtk_container_add(GTK_CONTAINER(sum_open_w), main_vb); gtk_widget_show(main_vb); diff --git a/gtk/hostlist_table.c b/gtk/hostlist_table.c index 7b3af77ef8..2e4d19421e 100644 --- a/gtk/hostlist_table.c +++ b/gtk/hostlist_table.c @@ -942,7 +942,7 @@ init_hostlist_notebook_cb(GtkWidget *w _U_, gpointer d _U_) resolv_cb = gtk_check_button_new_with_mnemonic("Name resolution"); gtk_container_add(GTK_CONTAINER(hbox), resolv_cb); - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(resolv_cb), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(resolv_cb), TRUE); 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); @@ -950,7 +950,7 @@ init_hostlist_notebook_cb(GtkWidget *w _U_, gpointer d _U_) 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_toggle_button_set_active(GTK_TOGGLE_BUTTON(filter_cb), FALSE); gtk_tooltips_set_tip(tooltips, filter_cb, "Limit the list to endpoints matching the current display filter.", NULL); g_signal_connect(filter_cb, "toggled", G_CALLBACK(hostlist_filter_toggle_dest), pages); diff --git a/gtk/io_stat.c b/gtk/io_stat.c index 0ceb2349c9..34b86b4f3b 100644 --- a/gtk/io_stat.c +++ b/gtk/io_stat.c @@ -1455,7 +1455,7 @@ create_pixels_per_tick_menu_items(io_stat_t *io, GtkWidget *menu) GUINT_TO_POINTER(pixels_per_tick[i])); 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); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item); } gtk_menu_set_active(GTK_MENU(menu), DEFAULT_PIXELS_PER_TICK); return; @@ -1500,7 +1500,7 @@ create_tick_interval_menu_items(io_stat_t *io, GtkWidget *menu) GUINT_TO_POINTER(tick_interval_values[i])); 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); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item); } gtk_menu_set_active(GTK_MENU(menu), DEFAULT_TICK_VALUE); return; @@ -1526,7 +1526,7 @@ create_yscale_max_menu_items(io_stat_t *io, GtkWidget *menu) GUINT_TO_POINTER(yscale_max[i])); g_signal_connect(menu_item, "activate", G_CALLBACK(yscale_select), io); gtk_widget_show(menu_item); - gtk_menu_append(GTK_MENU(menu), menu_item); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item); } gtk_menu_set_active(GTK_MENU(menu), DEFAULT_YSCALE); return; @@ -1581,7 +1581,7 @@ create_frames_or_bytes_menu_items(io_stat_t *io, GtkWidget *menu) g_object_set_data(G_OBJECT(menu_item), "count_type", GINT_TO_POINTER(i)); 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); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item); } return; } @@ -1640,7 +1640,7 @@ create_ctrl_area(io_stat_t *io, GtkWidget *box) vbox=gtk_vbox_new(FALSE, 0); gtk_container_add(GTK_CONTAINER(frame), vbox); - gtk_container_border_width(GTK_CONTAINER(vbox), 3); + gtk_container_set_border_width(GTK_CONTAINER(vbox), 3); gtk_box_set_child_packing(GTK_BOX(box), vbox, FALSE, FALSE, 0, GTK_PACK_END); gtk_widget_show(vbox); @@ -1649,7 +1649,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); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(view_cb), io->view_as_time); g_signal_connect(view_cb, "toggled", G_CALLBACK(view_as_time_toggle_dest), io); gtk_widget_show(view_cb); @@ -1659,7 +1659,7 @@ create_ctrl_area(io_stat_t *io, GtkWidget *box) vbox=gtk_vbox_new(FALSE, 0); gtk_container_add(GTK_CONTAINER(frame), vbox); - gtk_container_border_width(GTK_CONTAINER(vbox), 3); + gtk_container_set_border_width(GTK_CONTAINER(vbox), 3); gtk_box_set_child_packing(GTK_BOX(box), vbox, FALSE, FALSE, 0, GTK_PACK_END); gtk_widget_show(vbox); @@ -1833,7 +1833,7 @@ create_calc_types_menu_items(io_stat_graph_t *gio, GtkWidget *menu) menu_item=gtk_menu_item_new_with_label(calc_type_names[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); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item); } return; } @@ -1868,7 +1868,8 @@ static void create_advanced_field(io_stat_graph_t *gio, GtkWidget *box) { - gio->calc_field=gtk_entry_new_with_max_length(50); + gio->calc_field=gtk_entry_new(); + gtk_entry_set_max_length(GTK_ENTRY(gio->calc_field),50); gtk_box_pack_start(GTK_BOX(box), gio->calc_field, TRUE, TRUE, 0); gtk_widget_show(gio->calc_field); g_signal_connect(gio->calc_field, "activate", G_CALLBACK(filter_callback), gio); @@ -1933,7 +1934,7 @@ create_filter_box(io_stat_graph_t *gio, GtkWidget *box, int num) gtk_widget_modify_fg(label, GTK_STATE_PRELIGHT, &gio->color); gtk_widget_modify_fg(label, GTK_STATE_SELECTED, &gio->color); gtk_widget_modify_fg(label, GTK_STATE_INSENSITIVE, &gio->color); -/* gtk_signal_connect(GTK_OBJECT(gio->display_button), "toggled", GTK_SIGNAL_FUNC(filter_callback), gio);*/ +/* g_signal_connect(gio->display_button, "toggled", filter_callback, gio);*/ /* filter prefs dialog */ @@ -1951,8 +1952,8 @@ create_filter_box(io_stat_graph_t *gio, GtkWidget *box, int num) gtk_box_pack_start(GTK_BOX(hbox), gio->filter_bt, FALSE, TRUE, 0); gtk_widget_show(gio->filter_bt); - gio->filter_field=gtk_entry_new_with_max_length(256); - + gio->filter_field=gtk_entry_new(); + gtk_entry_set_max_length(GTK_ENTRY(gio->filter_field),256); /* filter prefs dialog */ g_object_set_data(G_OBJECT(gio->filter_bt), E_FILT_TE_PTR_KEY, gio->filter_field); /* filter prefs dialog */ @@ -1980,7 +1981,7 @@ create_filter_box(io_stat_graph_t *gio, GtkWidget *box, int num) g_object_set_data(G_OBJECT(menu_item), "plot_style", GINT_TO_POINTER(i)); 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); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item); } gtk_menu_set_active(GTK_MENU(menu), DEFAULT_PLOT_STYLE); @@ -2005,7 +2006,7 @@ create_filter_area(io_stat_t *io, GtkWidget *box) vbox=gtk_vbox_new(FALSE, 1); gtk_container_add(GTK_CONTAINER(frame), vbox); - gtk_container_border_width(GTK_CONTAINER(vbox), 3); + gtk_container_set_border_width(GTK_CONTAINER(vbox), 3); gtk_box_set_child_packing(GTK_BOX(box), vbox, FALSE, FALSE, 0, GTK_PACK_START); gtk_widget_show(vbox); @@ -2077,7 +2078,7 @@ init_io_stat_window(io_stat_t *io) hbox=gtk_hbox_new(FALSE, 3); gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 5); - gtk_container_border_width(GTK_CONTAINER(hbox), 3); + gtk_container_set_border_width(GTK_CONTAINER(hbox), 3); gtk_box_set_child_packing(GTK_BOX(vbox), hbox, FALSE, FALSE, 0, GTK_PACK_START); gtk_widget_show(hbox); diff --git a/gtk/main.c b/gtk/main.c index ba421227be..9aceb49877 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -3127,7 +3127,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs) /* Vertical container for menu bar, toolbar(s), paned windows and progress/info box */ main_vbox = gtk_vbox_new(FALSE, 1); - gtk_container_border_width(GTK_CONTAINER(main_vbox), 1); + gtk_container_set_border_width(GTK_CONTAINER(main_vbox), 1); gtk_container_add(GTK_CONTAINER(top_level), main_vbox); gtk_widget_show(main_vbox); diff --git a/gtk/main_menu.c b/gtk/main_menu.c index e8b0d69e15..f6c8778b56 100644 --- a/gtk/main_menu.c +++ b/gtk/main_menu.c @@ -1798,7 +1798,7 @@ add_menu_recent_capture_file_absolute(gchar *cf_name) { submenu_recent_files = gtk_item_factory_get_widget(main_menu_factory, MENU_RECENT_FILES_PATH); /* convert container to a GList */ - menu_item_list = gtk_container_children(GTK_CONTAINER(submenu_recent_files)); + menu_item_list = gtk_container_get_children(GTK_CONTAINER(submenu_recent_files)); /* iterate through list items of menu_item_list, * removing special items, a maybe duplicate entry and every item above count_max */ @@ -1830,7 +1830,7 @@ add_menu_recent_capture_file_absolute(gchar *cf_name) { /* add new item at latest position */ menu_item = gtk_menu_item_new_with_label(normalized_cf_name); g_object_set_data(G_OBJECT(menu_item), MENU_RECENT_FILES_KEY, normalized_cf_name); - gtk_menu_prepend (GTK_MENU(submenu_recent_files), menu_item); + gtk_menu_shell_prepend (GTK_MENU_SHELL(submenu_recent_files), menu_item); g_signal_connect_swapped(GTK_OBJECT(menu_item), "activate", G_CALLBACK(menu_open_recent_file_cmd_cb), (GtkObject *) menu_item); gtk_widget_show (menu_item); @@ -1888,7 +1888,7 @@ menu_recent_file_write_all(FILE *rf) { /* we have to iterate backwards through the children's list, * so we get the latest item last in the file. * (don't use gtk_container_foreach() here, it will return the wrong iteration order) */ - children = gtk_container_children(GTK_CONTAINER(submenu_recent_files)); + children = gtk_container_get_children(GTK_CONTAINER(submenu_recent_files)); child = g_list_last(children); while(child != NULL) { /* get capture filename from the menu item label */ diff --git a/gtk/main_proto_draw.c b/gtk/main_proto_draw.c index c45dceb71d..9a52e059cd 100644 --- a/gtk/main_proto_draw.c +++ b/gtk/main_proto_draw.c @@ -149,7 +149,7 @@ set_notebook_page(GtkWidget *nb_ptr, tvbuff_t *tvb) bv_tvb = g_object_get_data(G_OBJECT(bv), E_BYTE_VIEW_TVBUFF_KEY); if (bv_tvb == tvb) { /* Found it. */ - gtk_notebook_set_page(GTK_NOTEBOOK(nb_ptr), num); + gtk_notebook_set_current_page(GTK_NOTEBOOK(nb_ptr), num); break; } } @@ -612,7 +612,7 @@ add_byte_tab(GtkWidget *byte_nb, const char *name, tvbuff_t *tvb, gtk_notebook_set_show_tabs(GTK_NOTEBOOK(byte_nb), TRUE); /* set this page (this will print the packet data) */ - gtk_notebook_set_page(GTK_NOTEBOOK(byte_nb), + gtk_notebook_set_current_page(GTK_NOTEBOOK(byte_nb), gtk_notebook_page_num(GTK_NOTEBOOK(byte_nb), byte_nb)); return byte_view; @@ -650,7 +650,7 @@ add_byte_views(epan_dissect_t *edt, GtkWidget *tree_view, /* * Initially select the first byte view. */ - gtk_notebook_set_page(GTK_NOTEBOOK(byte_nb_ptr), 0); + gtk_notebook_set_current_page(GTK_NOTEBOOK(byte_nb_ptr), 0); } diff --git a/gtk/main_statusbar.c b/gtk/main_statusbar.c index 1779e3c6d0..5474f5a29c 100644 --- a/gtk/main_statusbar.c +++ b/gtk/main_statusbar.c @@ -194,7 +194,7 @@ statusbar_new(void) /* Sstatus hbox */ status_hbox = gtk_hbox_new(FALSE, 1); - gtk_container_border_width(GTK_CONTAINER(status_hbox), 0); + gtk_container_set_border_width(GTK_CONTAINER(status_hbox), 0); /* info (main) statusbar */ info_bar_new(); diff --git a/gtk/main_welcome.c b/gtk/main_welcome.c index 511ef12c86..bacf9753ca 100644 --- a/gtk/main_welcome.c +++ b/gtk/main_welcome.c @@ -320,7 +320,7 @@ welcome_topic_new(const char *header, GtkWidget **to_fill) gtk_box_pack_start(GTK_BOX(topic_vb), topic_header, FALSE, FALSE, 0); layout_vb = gtk_vbox_new(FALSE, 5); - gtk_container_border_width(GTK_CONTAINER(layout_vb), 10); + gtk_container_set_border_width(GTK_CONTAINER(layout_vb), 10); gtk_box_pack_start(GTK_BOX(topic_vb), layout_vb, FALSE, FALSE, 0); /* colorize vbox (we need an event box for this!) */ @@ -695,7 +695,7 @@ welcome_new(void) /* content */ welcome_hb = gtk_hbox_new(FALSE, 10); - gtk_container_border_width(GTK_CONTAINER(welcome_hb), 10); + gtk_container_set_border_width(GTK_CONTAINER(welcome_hb), 10); gtk_box_pack_start(GTK_BOX(welcome_vb), welcome_hb, TRUE, TRUE, 0); diff --git a/gtk/mcast_stream.c b/gtk/mcast_stream.c index e9e159ab23..17f219a4c6 100644 --- a/gtk/mcast_stream.c +++ b/gtk/mcast_stream.c @@ -144,7 +144,7 @@ static void mcaststream_reset_cb(void *arg) static void mcaststream_draw(void *arg _U_) { /* XXX: see mcaststream_on_update in mcast_streams_dlg.c for comments - gtk_signal_emit_by_name(top_level, "signal_mcaststream_update"); + g_signal_emit_by_name(top_level, "signal_mcaststream_update"); */ mcaststream_dlg_update(the_tapinfo_struct.strinfo_list); return; diff --git a/gtk/mcast_stream_dlg.c b/gtk/mcast_stream_dlg.c index 3b241a044f..9f07b209ca 100644 --- a/gtk/mcast_stream_dlg.c +++ b/gtk/mcast_stream_dlg.c @@ -414,7 +414,7 @@ mcast_on_params (GtkButton *button _U_, /* Container for each row of widgets */ main_vb = gtk_vbox_new(FALSE, 3); - gtk_container_border_width(GTK_CONTAINER(main_vb), 2); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 2); gtk_container_add(GTK_CONTAINER(mcast_params_dlg), main_vb); gtk_widget_show(main_vb); diff --git a/gtk/mtp3_summary.c b/gtk/mtp3_summary.c index 65574e423b..13519555b7 100644 --- a/gtk/mtp3_summary.c +++ b/gtk/mtp3_summary.c @@ -262,7 +262,7 @@ mtp3_sum_gtk_sum_cb(GtkWidget *w _U_, gpointer d _U_) /* Container for each row of widgets */ main_vb = gtk_vbox_new(FALSE, 3); - gtk_container_border_width(GTK_CONTAINER(main_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); gtk_container_add(GTK_CONTAINER(sum_open_w), main_vb); gtk_widget_show(main_vb); diff --git a/gtk/packet_win.c b/gtk/packet_win.c index 447a08aae4..7fedc8dcce 100644 --- a/gtk/packet_win.c +++ b/gtk/packet_win.c @@ -130,13 +130,13 @@ void new_window_cb(GtkWidget *w _U_) /* Container for paned windows */ main_vbox = gtk_vbox_new(FALSE, 1); - gtk_container_border_width(GTK_CONTAINER(main_vbox), 1); + gtk_container_set_border_width(GTK_CONTAINER(main_vbox), 1); gtk_container_add(GTK_CONTAINER(main_w), main_vbox); gtk_widget_show(main_vbox); /* Panes for the tree and byte view */ pane = gtk_vpaned_new(); - gtk_paned_gutter_size(GTK_PANED(pane), (GTK_PANED(pane))->handle_size); + gtk_paned_set_gutter_size(GTK_PANED(pane), (GTK_PANED(pane))->handle_size); gtk_container_add(GTK_CONTAINER(main_vbox), pane); gtk_widget_show(pane); diff --git a/gtk/prefs_capture.c b/gtk/prefs_capture.c index 3a032fabe7..222cad93b7 100644 --- a/gtk/prefs_capture.c +++ b/gtk/prefs_capture.c @@ -99,7 +99,7 @@ capture_prefs_show(void) /* Main vertical box */ main_vb = gtk_vbox_new(FALSE, 7); - gtk_container_border_width(GTK_CONTAINER(main_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); /* Main table */ main_tb = gtk_table_new(CAPTURE_TABLE_ROWS, 2, FALSE); @@ -277,7 +277,7 @@ ifopts_edit_cb(GtkWidget *w, gpointer data _U_) gtk_window_set_default_size(GTK_WINDOW(ifopts_edit_dlg), DEF_WIDTH, 340); main_vb = gtk_vbox_new(FALSE, 1); - gtk_container_border_width(GTK_CONTAINER(main_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); gtk_container_add(GTK_CONTAINER(ifopts_edit_dlg), main_vb); gtk_widget_show(main_vb); @@ -288,7 +288,7 @@ ifopts_edit_cb(GtkWidget *w, gpointer data _U_) /* create a scrolled window to pack the current options CList widget into */ cur_scr_win = scrolled_window_new(NULL, NULL); - gtk_container_border_width(GTK_CONTAINER(cur_scr_win), 3); + gtk_container_set_border_width(GTK_CONTAINER(cur_scr_win), 3); gtk_container_add(GTK_CONTAINER(cur_opts_fr), cur_scr_win); gtk_widget_show(cur_scr_win); @@ -318,7 +318,7 @@ ifopts_edit_cb(GtkWidget *w, gpointer data _U_) gtk_widget_show(ed_opts_fr); main_hb = gtk_hbox_new(TRUE, 5); - gtk_container_border_width(GTK_CONTAINER(main_hb), 3); + gtk_container_set_border_width(GTK_CONTAINER(main_hb), 3); gtk_container_add(GTK_CONTAINER(ed_opts_fr), main_hb); gtk_widget_show(main_hb); diff --git a/gtk/prefs_column.c b/gtk/prefs_column.c index 8e318afdaa..86d76a75ee 100644 --- a/gtk/prefs_column.c +++ b/gtk/prefs_column.c @@ -82,7 +82,7 @@ column_prefs_show() { /* Container for each row of widgets */ main_vb = gtk_vbox_new(FALSE, 5); - gtk_container_border_width(GTK_CONTAINER(main_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); gtk_widget_show(main_vb); g_object_set_data(G_OBJECT(GTK_OBJECT(main_vb)), E_COL_CM_KEY, (gpointer)FALSE); @@ -211,7 +211,7 @@ column_prefs_show() { /* Colunm name entry and format selection */ tb = gtk_table_new(2, 3, FALSE); - gtk_container_border_width(GTK_CONTAINER(tb), 5); + gtk_container_set_border_width(GTK_CONTAINER(tb), 5); gtk_container_add(GTK_CONTAINER(props_fr), tb); gtk_table_set_row_spacings(GTK_TABLE(tb), 10); gtk_table_set_col_spacings(GTK_TABLE(tb), 15); diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c index 4993b1d6d8..e9d7aaaba7 100644 --- a/gtk/prefs_dlg.c +++ b/gtk/prefs_dlg.c @@ -339,7 +339,7 @@ module_prefs_show(module_t *module, gpointer user_data) /* Main vertical box */ main_vb = gtk_vbox_new(FALSE, 5); - gtk_container_border_width(GTK_CONTAINER(main_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); gtk_container_add(GTK_CONTAINER(frame), main_vb); /* Main table */ @@ -450,7 +450,7 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_) /* Container for each row of widgets */ cts.main_vb = gtk_vbox_new(FALSE, 5); - gtk_container_border_width(GTK_CONTAINER(cts.main_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(cts.main_vb), 5); gtk_container_add(GTK_CONTAINER(prefs_w), cts.main_vb); gtk_widget_show(cts.main_vb); @@ -529,7 +529,7 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_) prefs_tree_page_add(label_str, cts.page, store, &gui_iter, FALSE); cts.page++; - gtk_container_border_width( GTK_CONTAINER(gui_font_pg), 5 ); + gtk_container_set_border_width( GTK_CONTAINER(gui_font_pg), 5 ); /* IMPORTANT: the following gtk_font_selection_set_xy() functions will only work, if the widget and it's corresponding window is already shown @@ -702,11 +702,11 @@ create_preference_radio_buttons(GtkWidget *main_tb, int table_position, button = gtk_radio_button_new_with_label(rb_group, enum_valp->description); gtk_widget_show(button); - rb_group = gtk_radio_button_group(GTK_RADIO_BUTTON(button)); + rb_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(button)); gtk_box_pack_start(GTK_BOX(radio_button_hbox), button, FALSE, FALSE, 10); if (enum_valp->value == current_val) { - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button), + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE); } } @@ -760,7 +760,7 @@ fetch_preference_radio_buttons_val(GtkWidget *button, * Go through the list of of radio buttons in the button's group, * and find the first one that's active. */ - rb_group = gtk_radio_button_group(GTK_RADIO_BUTTON(button)); + rb_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(button)); button = NULL; for (rb_entry = rb_group; rb_entry != NULL; rb_entry = g_slist_next(rb_entry)) { @@ -797,7 +797,7 @@ create_preference_option_menu(GtkWidget *main_tb, int table_position, for (enum_valp = enumvals, index = 0; enum_valp->name != NULL; enum_valp++, index++) { menu_item = gtk_menu_item_new_with_label(enum_valp->description); - gtk_menu_append(GTK_MENU(menu), menu_item); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item); if (enum_valp->value == current_val) menu_index = index; gtk_widget_show(menu_item); @@ -1746,6 +1746,6 @@ prefs_tree_select_cb(GtkTreeSelection *sel, gpointer dummy _U_) { gtk_tree_model_get(model, &iter, 1, &page, -1); if (page >= 0) - gtk_notebook_set_page(g_object_get_data(G_OBJECT(prefs_w), E_PREFSW_NOTEBOOK_KEY), page); + gtk_notebook_set_current_page(g_object_get_data(G_OBJECT(prefs_w), E_PREFSW_NOTEBOOK_KEY), page); } } diff --git a/gtk/prefs_gui.c b/gtk/prefs_gui.c index d6311072c6..df21398f1c 100644 --- a/gtk/prefs_gui.c +++ b/gtk/prefs_gui.c @@ -174,7 +174,7 @@ gui_prefs_show(void) /* Main vertical box */ main_vb = gtk_vbox_new(FALSE, 7); - gtk_container_border_width( GTK_CONTAINER(main_vb), 5 ); + gtk_container_set_border_width( GTK_CONTAINER(main_vb), 5 ); /* Main table */ main_tb = gtk_table_new(GUI_TABLE_ROWS, 2, FALSE); diff --git a/gtk/prefs_layout.c b/gtk/prefs_layout.c index 4bd2561b2c..c97a15552a 100644 --- a/gtk/prefs_layout.c +++ b/gtk/prefs_layout.c @@ -89,22 +89,22 @@ static GtkWidget *layout_content_radio_vbox(GtkWidget *main_vb, GtkTooltips *too gtk_container_add(GTK_CONTAINER(radio_vb), radio_lb); radio_none_rb = gtk_radio_button_new_with_mnemonic_from_widget(NULL, "None"); - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(radio_none_rb), content == layout_pane_content_none); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_none_rb), content == layout_pane_content_none); gtk_tooltips_set_tip (tooltips, radio_none_rb, "Put nothing in this pane.", NULL); gtk_container_add(GTK_CONTAINER(radio_vb), radio_none_rb); radio_plist_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(radio_none_rb), "Packet List"); - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(radio_plist_rb), content == layout_pane_content_plist); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_plist_rb), content == layout_pane_content_plist); gtk_tooltips_set_tip (tooltips, radio_plist_rb, "Put the packet list in this pane.", NULL); gtk_container_add(GTK_CONTAINER(radio_vb), radio_plist_rb); radio_pdetails_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(radio_none_rb), "Packet Details"); - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(radio_pdetails_rb), content == layout_pane_content_pdetails); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_pdetails_rb), content == layout_pane_content_pdetails); gtk_tooltips_set_tip (tooltips, radio_pdetails_rb, "Put the packet details tree in this pane.", NULL); gtk_container_add(GTK_CONTAINER(radio_vb), radio_pdetails_rb); radio_pbytes_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(radio_none_rb), "Packet Bytes"); - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(radio_pbytes_rb), content == layout_pane_content_pbytes); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_pbytes_rb), content == layout_pane_content_pbytes); gtk_tooltips_set_tip (tooltips, radio_pbytes_rb, "Put the packet bytes hexdump in this pane.", NULL); gtk_container_add(GTK_CONTAINER(radio_vb), radio_pbytes_rb); @@ -161,16 +161,16 @@ static void layout_pane_set_content(GtkWidget * radio_vb, layout_pane_content_e switch(pane_content) { case(layout_pane_content_none): - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(g_object_get_data(G_OBJECT(radio_vb), LAYOUT_NONE_RB_KEY)), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g_object_get_data(G_OBJECT(radio_vb), LAYOUT_NONE_RB_KEY)), TRUE); break; case(layout_pane_content_plist): - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(g_object_get_data(G_OBJECT(radio_vb), LAYOUT_PLIST_RB_KEY)), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g_object_get_data(G_OBJECT(radio_vb), LAYOUT_PLIST_RB_KEY)), TRUE); break; case(layout_pane_content_pdetails): - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(g_object_get_data(G_OBJECT(radio_vb), LAYOUT_PDETAILS_RB_KEY)), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g_object_get_data(G_OBJECT(radio_vb), LAYOUT_PDETAILS_RB_KEY)), TRUE); break; case(layout_pane_content_pbytes): - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(g_object_get_data(G_OBJECT(radio_vb), LAYOUT_PBYTES_RB_KEY)), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g_object_get_data(G_OBJECT(radio_vb), LAYOUT_PBYTES_RB_KEY)), TRUE); break; default: g_assert_not_reached(); diff --git a/gtk/prefs_nameres.c b/gtk/prefs_nameres.c index 638acc230c..5fcd14268c 100644 --- a/gtk/prefs_nameres.c +++ b/gtk/prefs_nameres.c @@ -95,7 +95,7 @@ nameres_prefs_show(void) /* Main vertical box */ main_vb = gtk_vbox_new(FALSE, 7); - gtk_container_border_width(GTK_CONTAINER(main_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); /* Main table */ main_tb = gtk_table_new(RESOLV_TABLE_ROWS, 3, FALSE); diff --git a/gtk/prefs_print.c b/gtk/prefs_print.c index 4f042ca87b..f5eb6ed12d 100644 --- a/gtk/prefs_print.c +++ b/gtk/prefs_print.c @@ -77,7 +77,7 @@ GtkWidget * printer_prefs_show(void) /* Enclosing containers for each row of widgets */ main_vb = gtk_vbox_new(FALSE, 5); - gtk_container_border_width(GTK_CONTAINER(main_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); main_tb = gtk_table_new(4, 2, FALSE); gtk_box_pack_start(GTK_BOX(main_vb), main_tb, FALSE, FALSE, 0); diff --git a/gtk/prefs_protocols.c b/gtk/prefs_protocols.c index 21e818361d..348e7b6e2a 100644 --- a/gtk/prefs_protocols.c +++ b/gtk/prefs_protocols.c @@ -46,7 +46,7 @@ protocols_prefs_show(void) /* Main vertical box */ main_vb = gtk_vbox_new(FALSE, 7); - gtk_container_border_width(GTK_CONTAINER(main_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); /* Main table */ main_tb = gtk_table_new(PROTOCOLS_TABLE_ROWS, 1, FALSE); diff --git a/gtk/prefs_stream.c b/gtk/prefs_stream.c index 0940109cd6..0309e3613e 100644 --- a/gtk/prefs_stream.c +++ b/gtk/prefs_stream.c @@ -88,7 +88,7 @@ stream_prefs_show() /* Enclosing containers for each row of widgets */ main_vb = gtk_vbox_new(FALSE, 5); - gtk_container_border_width(GTK_CONTAINER(main_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); main_tb = gtk_table_new(3, 3, FALSE); gtk_box_pack_start(GTK_BOX(main_vb), main_tb, FALSE, FALSE, 0); diff --git a/gtk/prefs_taps.c b/gtk/prefs_taps.c index a62a04dc74..2a3e6f751c 100644 --- a/gtk/prefs_taps.c +++ b/gtk/prefs_taps.c @@ -58,7 +58,7 @@ stats_prefs_show(void) /* Main vertical box */ main_vb = gtk_vbox_new(FALSE, 7); - gtk_container_border_width(GTK_CONTAINER(main_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); /* Main table */ main_tb = gtk_table_new(RTP_PLAYER_TABLE_ROWS, 2, FALSE); diff --git a/gtk/print_dlg.c b/gtk/print_dlg.c index f289d005df..dddc7a4776 100644 --- a/gtk/print_dlg.c +++ b/gtk/print_dlg.c @@ -511,7 +511,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args) /* Vertical enclosing container for each row of widgets */ main_vb = gtk_vbox_new(FALSE, 5); - gtk_container_border_width(GTK_CONTAINER(main_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); gtk_container_add(GTK_CONTAINER(main_win), main_vb); gtk_widget_show(main_vb); @@ -522,14 +522,14 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args) gtk_box_pack_start(GTK_BOX(main_vb), printer_fr, FALSE, FALSE, 0); gtk_widget_show(printer_fr); printer_vb = gtk_vbox_new(FALSE, 5); - gtk_container_border_width(GTK_CONTAINER(printer_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(printer_vb), 5); gtk_container_add(GTK_CONTAINER(printer_fr), printer_vb); gtk_widget_show(printer_vb); /* "Plain text" / "Postscript" / "PDML", ... radio buttons */ text_rb = gtk_radio_button_new_with_mnemonic_from_widget(NULL, "Plain _text"); if (args->format == PR_FMT_TEXT) - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(text_rb), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(text_rb), TRUE); gtk_tooltips_set_tip (tooltips, text_rb, "Print output in ascii \"plain text\" format. If you're unsure, use this format.", NULL); gtk_box_pack_start(GTK_BOX(printer_vb), text_rb, FALSE, FALSE, 0); if(action == output_action_print) @@ -537,7 +537,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args) ps_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(text_rb), "_PostScript"); if (args->format == PR_FMT_PS) - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(ps_rb), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ps_rb), TRUE); gtk_tooltips_set_tip (tooltips, ps_rb, "Print output in \"postscript\" format, for postscript capable printers or print servers.", NULL); gtk_box_pack_start(GTK_BOX(printer_vb), ps_rb, FALSE, FALSE, 0); if(action == output_action_print) @@ -545,7 +545,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args) pdml_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(text_rb), "PDM_L (XML: Packet Details Markup Language)"); if (action == output_action_export_pdml) - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(pdml_rb), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pdml_rb), TRUE); gtk_tooltips_set_tip (tooltips, pdml_rb, "Print output in \"PDML\" (Packet Details Markup Language), " "an XML based packet data interchange format. " @@ -555,7 +555,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args) psml_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(text_rb), "PSML (XML: Packet Summary Markup Language)"); if (action == output_action_export_psml) - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(psml_rb), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(psml_rb), TRUE); gtk_tooltips_set_tip (tooltips, psml_rb, "Print output in \"PSML\" (Packet Summary Markup Language), " "an XML based packet summary interchange format. " @@ -565,7 +565,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args) csv_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(text_rb), "_CSV"); if (action == output_action_export_csv) - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(csv_rb), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(csv_rb), TRUE); gtk_tooltips_set_tip (tooltips, csv_rb, "Print output in \"Comma Separated Values\" (CSV) format, " "a text format compatible with OpenOffice and Excel. " @@ -575,7 +575,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args) carrays_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(text_rb), "C Arrays"); if (action == output_action_export_carrays) - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(carrays_rb), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(carrays_rb), TRUE); gtk_tooltips_set_tip (tooltips, carrays_rb, "Print output in C Arrays format, " "a text file suitable for use in C/C++ programs. " @@ -598,7 +598,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args) /* Output to file button */ dest_cb = gtk_check_button_new_with_mnemonic("Output to _file:"); if (args->to_file) - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(dest_cb), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dest_cb), TRUE); gtk_tooltips_set_tip (tooltips, dest_cb, "Output to file instead of printer", NULL); gtk_table_attach_defaults(GTK_TABLE(printer_tb), dest_cb, 0, 1, 0, 1); if(action == output_action_print) @@ -679,13 +679,13 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args) action == output_action_export_ps) gtk_widget_show(format_fr); format_vb = gtk_vbox_new(FALSE, 5); - gtk_container_border_width(GTK_CONTAINER(format_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(format_vb), 5); gtk_container_add(GTK_CONTAINER(format_fr), format_vb); gtk_widget_show(format_vb); /* "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); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(summary_cb), args->print_summary); 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); @@ -694,7 +694,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); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(details_cb), args->print_dissections != print_dissections_none); 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); @@ -702,42 +702,42 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args) /*** packet details ***/ details_hb = gtk_hbox_new(FALSE, 6); - gtk_container_border_width(GTK_CONTAINER(details_hb), 0); + gtk_container_set_border_width(GTK_CONTAINER(details_hb), 0); gtk_container_add(GTK_CONTAINER(format_vb), details_hb); gtk_widget_show(details_hb); details_vb = gtk_vbox_new(FALSE, 6); - gtk_container_border_width(GTK_CONTAINER(details_vb), 0); + gtk_container_set_border_width(GTK_CONTAINER(details_vb), 0); gtk_container_add(GTK_CONTAINER(details_hb), details_vb); gtk_widget_show(details_vb); details_vb = gtk_vbox_new(FALSE, 6); - gtk_container_border_width(GTK_CONTAINER(details_vb), 0); + gtk_container_set_border_width(GTK_CONTAINER(details_vb), 0); gtk_container_add(GTK_CONTAINER(details_hb), details_vb); gtk_widget_show(details_vb); /* "All collapsed"/"As displayed"/"All Expanded" radio buttons */ collapse_all_rb = gtk_radio_button_new_with_mnemonic_from_widget(NULL, "All co_llapsed"); - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(collapse_all_rb), args->print_dissections == print_dissections_collapsed); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(collapse_all_rb), args->print_dissections == print_dissections_collapsed); gtk_tooltips_set_tip (tooltips, collapse_all_rb, "Output of the packet details tree \"collapsed\"", NULL); gtk_container_add(GTK_CONTAINER(details_vb), collapse_all_rb); gtk_widget_show(collapse_all_rb); as_displayed_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(collapse_all_rb), "As displa_yed"); - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(as_displayed_rb), args->print_dissections == print_dissections_as_displayed); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(as_displayed_rb), args->print_dissections == print_dissections_as_displayed); gtk_tooltips_set_tip (tooltips, as_displayed_rb, "Output of the packet details tree \"as displayed\"", NULL); gtk_container_add(GTK_CONTAINER(details_vb), as_displayed_rb); gtk_widget_show(as_displayed_rb); expand_all_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(collapse_all_rb), "All e_xpanded"); - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(expand_all_rb), args->print_dissections == print_dissections_expanded); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(expand_all_rb), args->print_dissections == print_dissections_expanded); gtk_tooltips_set_tip (tooltips, expand_all_rb, "Output of the packet details tree \"expanded\"", NULL); gtk_container_add(GTK_CONTAINER(details_vb), expand_all_rb); gtk_widget_show(expand_all_rb); /* "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); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(hex_cb), args->print_hex); 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); @@ -750,7 +750,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args) /* "Each packet on a new page" check button. */ formfeed_cb = gtk_check_button_new_with_mnemonic("Each packet on a new page"); - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(formfeed_cb), args->print_formfeed); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(formfeed_cb), args->print_formfeed); gtk_tooltips_set_tip (tooltips, formfeed_cb, "When checked, a new page will be used for each packet. " "This is done by adding a formfeed (or similar) between the packet outputs.", NULL); gtk_container_add(GTK_CONTAINER(format_vb), formfeed_cb); diff --git a/gtk/profile_dlg.c b/gtk/profile_dlg.c index 8248182df2..96f5f8d912 100644 --- a/gtk/profile_dlg.c +++ b/gtk/profile_dlg.c @@ -673,13 +673,13 @@ profile_dialog_new(void) gtk_window_set_default_size(GTK_WINDOW(main_w), 400, 400); main_vb = gtk_vbox_new(FALSE, 0); - gtk_container_border_width(GTK_CONTAINER(main_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); gtk_container_add(GTK_CONTAINER(main_w), main_vb); gtk_widget_show(main_vb); /* Container for each row of widgets */ profile_vb = gtk_vbox_new(FALSE, 0); - gtk_container_border_width(GTK_CONTAINER(profile_vb), 0); + gtk_container_set_border_width(GTK_CONTAINER(profile_vb), 0); gtk_container_add(GTK_CONTAINER(main_vb), profile_vb); gtk_widget_show(profile_vb); @@ -693,7 +693,7 @@ profile_dialog_new(void) gtk_widget_show(edit_fr); list_bb = gtk_vbox_new(TRUE, 0); - gtk_container_border_width(GTK_CONTAINER(list_bb), 5); + gtk_container_set_border_width(GTK_CONTAINER(list_bb), 5); gtk_container_add(GTK_CONTAINER(edit_fr), list_bb); gtk_widget_show(list_bb); @@ -761,7 +761,7 @@ profile_dialog_new(void) gtk_widget_show(props_fr); props_vb = gtk_vbox_new(FALSE, 3); - gtk_container_border_width(GTK_CONTAINER(props_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(props_vb), 5); gtk_container_add(GTK_CONTAINER(props_fr), props_vb); gtk_widget_show(props_vb); diff --git a/gtk/progress_dlg.c b/gtk/progress_dlg.c index 73e8e97f4b..0325f8b1f9 100644 --- a/gtk/progress_dlg.c +++ b/gtk/progress_dlg.c @@ -110,7 +110,7 @@ create_progress_dlg(const gchar *task_title, const gchar *item_title, * Container for dialog widgets. */ main_vb = gtk_vbox_new(FALSE, 1); - gtk_container_border_width(GTK_CONTAINER(main_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); gtk_container_add(GTK_CONTAINER(dlg_w), main_vb); /* diff --git a/gtk/proto_dlg.c b/gtk/proto_dlg.c index c9de4fbaa7..fff3efc4bd 100644 --- a/gtk/proto_dlg.c +++ b/gtk/proto_dlg.c @@ -102,7 +102,7 @@ proto_cb(GtkWidget *w _U_, gpointer data _U_) /* Container for each row of widgets */ main_vb = gtk_vbox_new(FALSE, 6); - gtk_container_border_width(GTK_CONTAINER(main_vb), 6); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 6); gtk_container_add(GTK_CONTAINER(proto_w), main_vb); gtk_widget_show(main_vb); @@ -116,7 +116,7 @@ proto_cb(GtkWidget *w _U_, gpointer data _U_) proto_vb = gtk_vbox_new(FALSE, 0); gtk_container_add(GTK_CONTAINER(proto_frame), proto_vb); - gtk_container_border_width(GTK_CONTAINER(proto_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(proto_vb), 5); gtk_widget_show(proto_vb); proto_sw = scrolled_window_new(NULL, NULL); diff --git a/gtk/proto_hier_stats_dlg.c b/gtk/proto_hier_stats_dlg.c index 96f2a758fa..ecaf7cafc4 100644 --- a/gtk/proto_hier_stats_dlg.c +++ b/gtk/proto_hier_stats_dlg.c @@ -379,7 +379,7 @@ proto_hier_stats_cb(GtkWidget *w _U_, gpointer d _U_) dlg = window_new(GTK_WINDOW_TOPLEVEL, "Wireshark: Protocol Hierarchy Statistics"); vbox = gtk_vbox_new(FALSE, 5); - gtk_container_border_width(GTK_CONTAINER(vbox), 5); + gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); gtk_container_add(GTK_CONTAINER(dlg), vbox); current_filter=gtk_entry_get_text(GTK_ENTRY(main_display_filter_widget)); diff --git a/gtk/range_utils.c b/gtk/range_utils.c index b6f1766a49..ccd83ecac8 100644 --- a/gtk/range_utils.c +++ b/gtk/range_utils.c @@ -407,7 +407,7 @@ GtkWidget *range_new(packet_range_t *range) /* range table */ range_tb = gtk_table_new(7, 3, FALSE); - gtk_container_border_width(GTK_CONTAINER(range_tb), 5); + gtk_container_set_border_width(GTK_CONTAINER(range_tb), 5); /* captured button */ captured_bt = gtk_toggle_button_new_with_mnemonic("_Captured"); diff --git a/gtk/rpc_stat.c b/gtk/rpc_stat.c index 7e5f38aa76..e324ef3082 100644 --- a/gtk/rpc_stat.c +++ b/gtk/rpc_stat.c @@ -376,7 +376,7 @@ rpcstat_program_select(GtkWidget *item _U_, gpointer key) (gpointer)(long) i); gtk_widget_show(menu_item); - gtk_menu_append(GTK_MENU(vers_menu), menu_item); + gtk_menu_shell_append(GTK_MENU_SHELL(vers_menu), menu_item); } gtk_option_menu_set_menu(GTK_OPTION_MENU(vers_opt), vers_menu); } @@ -392,7 +392,7 @@ rpcstat_list_programs(gpointer *key, gpointer *value, gpointer *user_data _U_) 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); + gtk_menu_shell_append(GTK_MENU_SHELL(prog_menu), menu_item); if(!rpc_program){ rpc_program=k->prog; @@ -434,7 +434,7 @@ gtk_rpcstat_cb(GtkWidget *w _U_, gpointer d _U_) gtk_window_set_default_size(GTK_WINDOW(dlg), 300, -1); dlg_box=gtk_vbox_new(FALSE, 10); - gtk_container_border_width(GTK_CONTAINER(dlg_box), 10); + gtk_container_set_border_width(GTK_CONTAINER(dlg_box), 10); gtk_container_add(GTK_CONTAINER(dlg), dlg_box); gtk_widget_show(dlg_box); @@ -477,7 +477,7 @@ gtk_rpcstat_cb(GtkWidget *w _U_, gpointer d _U_) (gpointer)(long) i); gtk_widget_show(menu_item); - gtk_menu_append(GTK_MENU(vers_menu), menu_item); + gtk_menu_shell_append(GTK_MENU_SHELL(vers_menu), menu_item); } gtk_option_menu_set_menu(GTK_OPTION_MENU(vers_opt), vers_menu); gtk_box_pack_start(GTK_BOX(prog_box), vers_opt, TRUE, TRUE, 0); diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c index 72eb6fbfe3..65108d810f 100644 --- a/gtk/rtp_analysis.c +++ b/gtk/rtp_analysis.c @@ -730,7 +730,7 @@ static void on_destroy(GtkWidget *win _U_, user_data_t *user_data _U_) #endif /* disable the "switch_page" signal in the dlg, otherwise will be called when the windows is destroy and cause an exception using GTK1*/ - gtk_signal_disconnect(GTK_OBJECT(user_data->dlg.notebook), user_data->dlg.notebook_signal_id); + g_signal_handler_disconnect(user_data->dlg.notebook, user_data->dlg.notebook_signal_id); g_free(user_data->dlg.col_arrows_fwd); g_free(user_data->dlg.col_arrows_rev); @@ -785,7 +785,7 @@ static void graph_selection_callback(value_pair_t vp, user_data_t *user_data) GUINT_TO_POINTER(vp.fnumber)); } if (row!=-1) { - gtk_notebook_set_page(GTK_NOTEBOOK(user_data->dlg.notebook), + gtk_notebook_set_current_page(GTK_NOTEBOOK(user_data->dlg.notebook), (clist == GTK_CLIST(user_data->dlg.clist_fwd)) ? 0 : 1); gtk_clist_select_row(clist, row, 0); gtk_clist_moveto(clist, row, 0, 0.5, 0); @@ -1514,7 +1514,7 @@ static void create_filter_area(user_data_t* user_data, GtkWidget *box) vbox=gtk_vbox_new(FALSE, 1); gtk_container_add(GTK_CONTAINER(frame), vbox); - gtk_container_border_width(GTK_CONTAINER(vbox), 3); + gtk_container_set_border_width(GTK_CONTAINER(vbox), 3); gtk_box_set_child_packing(GTK_BOX(box), vbox, FALSE, FALSE, 0, GTK_PACK_START); gtk_widget_show(vbox); @@ -1586,7 +1586,7 @@ static void create_yscale_max_menu_items(user_data_t* user_data, GtkWidget *menu GUINT_TO_POINTER(yscale_max[i])); 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); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item); } return; } @@ -1606,7 +1606,7 @@ static void create_pixels_per_tick_menu_items(user_data_t* user_data, GtkWidget GUINT_TO_POINTER(pixels_per_tick[i])); 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); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item); } gtk_menu_set_active(GTK_MENU(menu), DEFAULT_PIXELS_PER_TICK); return; @@ -1636,7 +1636,7 @@ static void create_tick_interval_menu_items(user_data_t* user_data, GtkWidget *m GUINT_TO_POINTER(tick_interval_values[i])); 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); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item); } gtk_menu_set_active(GTK_MENU(menu), DEFAULT_TICK_VALUE); return; @@ -1684,7 +1684,7 @@ static void create_ctrl_area(user_data_t* user_data, GtkWidget *box) vbox=gtk_vbox_new(FALSE, 0); gtk_container_add(GTK_CONTAINER(frame), vbox); - gtk_container_border_width(GTK_CONTAINER(vbox), 3); + gtk_container_set_border_width(GTK_CONTAINER(vbox), 3); gtk_box_set_child_packing(GTK_BOX(box), vbox, FALSE, FALSE, 0, GTK_PACK_END); gtk_widget_show(vbox); @@ -1697,7 +1697,7 @@ static void create_ctrl_area(user_data_t* user_data, GtkWidget *box) vbox=gtk_vbox_new(FALSE, 0); gtk_container_add(GTK_CONTAINER(frame), vbox); - gtk_container_border_width(GTK_CONTAINER(vbox), 3); + gtk_container_set_border_width(GTK_CONTAINER(vbox), 3); gtk_box_set_child_packing(GTK_BOX(box), vbox, FALSE, FALSE, 0, GTK_PACK_END); gtk_widget_show(vbox); @@ -1724,7 +1724,7 @@ static void dialog_graph_init_window(user_data_t* user_data) hbox=gtk_hbox_new(FALSE, 3); gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 5); - gtk_container_border_width(GTK_CONTAINER(hbox), 3); + gtk_container_set_border_width(GTK_CONTAINER(hbox), 3); gtk_box_set_child_packing(GTK_BOX(vbox), hbox, FALSE, FALSE, 0, GTK_PACK_START); gtk_widget_show(hbox); @@ -2007,7 +2007,7 @@ static void save_csv_as_cb(GtkWidget *bt _U_, user_data_t *user_data _U_) /* Container for each row of widgets */ vertb = gtk_vbox_new(FALSE, 0); - gtk_container_border_width(GTK_CONTAINER(vertb), 5); + gtk_container_set_border_width(GTK_CONTAINER(vertb), 5); gtk_box_pack_start(GTK_BOX(GTK_FILE_SELECTION(user_data->dlg.save_csv_as_w)->action_area), vertb, FALSE, FALSE, 0); gtk_widget_show (vertb); @@ -2033,21 +2033,21 @@ static void save_csv_as_cb(GtkWidget *bt _U_, user_data_t *user_data _U_) gtk_misc_set_alignment (GTK_MISC (channels_label), 0, 0.5); forward_rb = gtk_radio_button_new_with_label (channels_group, "forward "); - channels_group = gtk_radio_button_group (GTK_RADIO_BUTTON (forward_rb)); + channels_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (forward_rb)); gtk_widget_show (forward_rb); gtk_table_attach (GTK_TABLE (table1), forward_rb, 1, 2, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); reversed_rb = gtk_radio_button_new_with_label (channels_group, "reversed"); - channels_group = gtk_radio_button_group (GTK_RADIO_BUTTON (reversed_rb)); + channels_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (reversed_rb)); gtk_widget_show (reversed_rb); gtk_table_attach (GTK_TABLE (table1), reversed_rb, 2, 3, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); both_rb = gtk_radio_button_new_with_label (channels_group, "both"); - channels_group = gtk_radio_button_group (GTK_RADIO_BUTTON (both_rb)); + channels_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (both_rb)); gtk_widget_show (both_rb); gtk_table_attach (GTK_TABLE (table1), both_rb, 3, 4, 1, 2, (GtkAttachOptions) (GTK_FILL), @@ -2579,7 +2579,7 @@ static void on_save_bt_clicked(GtkWidget *bt _U_, user_data_t *user_data _U_) /* Container for each row of widgets */ vertb = gtk_vbox_new(FALSE, 0); - gtk_container_border_width(GTK_CONTAINER(vertb), 5); + gtk_container_set_border_width(GTK_CONTAINER(vertb), 5); gtk_box_pack_start(GTK_BOX(GTK_FILE_SELECTION(user_data->dlg.save_voice_as_w)->action_area), vertb, FALSE, FALSE, 0); gtk_widget_show (vertb); @@ -2605,7 +2605,7 @@ static void on_save_bt_clicked(GtkWidget *bt _U_, user_data_t *user_data _U_) gtk_misc_set_alignment (GTK_MISC (label_format), 0, 0.5); raw_rb = gtk_radio_button_new_with_label (format_group, ".raw"); - format_group = gtk_radio_button_group (GTK_RADIO_BUTTON (raw_rb)); + format_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (raw_rb)); gtk_widget_show (raw_rb); gtk_table_attach (GTK_TABLE (table1), raw_rb, 1, 2, 0, 1, (GtkAttachOptions) (GTK_FILL), @@ -2613,7 +2613,7 @@ static void on_save_bt_clicked(GtkWidget *bt _U_, user_data_t *user_data _U_) au_rb = gtk_radio_button_new_with_label (format_group, ".au"); - format_group = gtk_radio_button_group (GTK_RADIO_BUTTON (au_rb)); + format_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (au_rb)); gtk_widget_show (au_rb); gtk_table_attach (GTK_TABLE (table1), au_rb, 3, 4, 0, 1, (GtkAttachOptions) (GTK_FILL), @@ -2621,20 +2621,20 @@ static void on_save_bt_clicked(GtkWidget *bt _U_, user_data_t *user_data _U_) /* we support .au - ulaw*/ /* wav_rb = gtk_radio_button_new_with_label (format_group, ".wav"); - format_group = gtk_radio_button_group (GTK_RADIO_BUTTON (wav_rb)); + format_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (wav_rb)); gtk_widget_show (wav_rb); gtk_table_attach (GTK_TABLE (table1), wav_rb, 1, 2, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); sw_rb = gtk_radio_button_new_with_label (format_group, "8 kHz, 16 bit "); - format_group = gtk_radio_button_group (GTK_RADIO_BUTTON (sw_rb)); + format_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (sw_rb)); gtk_widget_show (sw_rb); gtk_table_attach (GTK_TABLE (table1), sw_rb, 2, 3, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); au_rb = gtk_radio_button_new_with_label (format_group, ".au"); - format_group = gtk_radio_button_group (GTK_RADIO_BUTTON (au_rb)); + format_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (au_rb)); gtk_widget_show (au_rb); gtk_table_attach (GTK_TABLE (table1), au_rb, 3, 4, 0, 1, (GtkAttachOptions) (GTK_FILL), @@ -2650,21 +2650,21 @@ static void on_save_bt_clicked(GtkWidget *bt _U_, user_data_t *user_data _U_) gtk_misc_set_alignment (GTK_MISC (channels_label), 0, 0.5); forward_rb = gtk_radio_button_new_with_label (channels_group, "forward "); - channels_group = gtk_radio_button_group (GTK_RADIO_BUTTON (forward_rb)); + channels_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (forward_rb)); gtk_widget_show (forward_rb); gtk_table_attach (GTK_TABLE (table1), forward_rb, 1, 2, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); reversed_rb = gtk_radio_button_new_with_label (channels_group, "reversed"); - channels_group = gtk_radio_button_group (GTK_RADIO_BUTTON (reversed_rb)); + channels_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (reversed_rb)); gtk_widget_show (reversed_rb); gtk_table_attach (GTK_TABLE (table1), reversed_rb, 2, 3, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); both_rb = gtk_radio_button_new_with_label (channels_group, "both"); - channels_group = gtk_radio_button_group (GTK_RADIO_BUTTON (both_rb)); + channels_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (both_rb)); gtk_widget_show (both_rb); gtk_table_attach (GTK_TABLE (table1), both_rb, 3, 4, 1, 2, (GtkAttachOptions) (GTK_FILL), @@ -3001,7 +3001,7 @@ static void create_rtp_dialog(user_data_t* user_data) /* Container for each row of widgets */ main_vb = gtk_vbox_new(FALSE, 2); - gtk_container_border_width(GTK_CONTAINER(main_vb), 2); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 2); gtk_container_add(GTK_CONTAINER(window), main_vb); gtk_widget_show(main_vb); diff --git a/gtk/rtp_player.c b/gtk/rtp_player.c index b00bd318bc..0f0888e9f1 100644 --- a/gtk/rtp_player.c +++ b/gtk/rtp_player.c @@ -1961,7 +1961,7 @@ rtp_player_dlg_create(void) /* Filter/status hbox */ stat_hbox = gtk_hbox_new(FALSE, 1); - gtk_container_border_width(GTK_CONTAINER(stat_hbox), 0); + gtk_container_set_border_width(GTK_CONTAINER(stat_hbox), 0); /* statusbar */ info_bar = gtk_statusbar_new(); diff --git a/gtk/rtp_stream.c b/gtk/rtp_stream.c index db51db16c3..2b4c52cf13 100644 --- a/gtk/rtp_stream.c +++ b/gtk/rtp_stream.c @@ -61,7 +61,7 @@ static void rtpstream_draw(void *arg _U_) { /* XXX: see rtpstream_on_update in rtp_streams_dlg.c for comments - gtk_signal_emit_by_name(top_level, "signal_rtpstream_update"); + g_signal_emit_by_name(top_level, "signal_rtpstream_update"); */ rtpstream_dlg_update(the_tapinfo_struct.strinfo_list); return; diff --git a/gtk/rtp_stream_dlg.c b/gtk/rtp_stream_dlg.c index 55d4a5aa17..7d39cda436 100644 --- a/gtk/rtp_stream_dlg.c +++ b/gtk/rtp_stream_dlg.c @@ -325,7 +325,7 @@ rtpstream_on_save (GtkButton *button _U_, /* Container for each row of widgets */ vertb = gtk_vbox_new(FALSE, 0); - gtk_container_border_width(GTK_CONTAINER(vertb), 5); + gtk_container_set_border_width(GTK_CONTAINER(vertb), 5); gtk_box_pack_start(GTK_BOX(GTK_FILE_SELECTION(rtpstream_save_dlg)->action_area), vertb, FALSE, FALSE, 0); gtk_widget_show (vertb); diff --git a/gtk/scsi_stat.c b/gtk/scsi_stat.c index 1c6d8339fc..6ebfe4618a 100644 --- a/gtk/scsi_stat.c +++ b/gtk/scsi_stat.c @@ -335,7 +335,7 @@ gtk_scsistat_cb(GtkWidget *w _U_, gpointer d _U_) gtk_window_set_default_size(GTK_WINDOW(dlg), 300, -1); dlg_box=gtk_vbox_new(FALSE, 10); - gtk_container_border_width(GTK_CONTAINER(dlg_box), 10); + gtk_container_set_border_width(GTK_CONTAINER(dlg_box), 10); gtk_container_add(GTK_CONTAINER(dlg), dlg_box); gtk_widget_show(dlg_box); @@ -356,20 +356,20 @@ gtk_scsistat_cb(GtkWidget *w _U_, gpointer d _U_) menu_item=gtk_menu_item_new_with_label("SBC (disk)"); 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); + gtk_menu_shell_append(GTK_MENU_SHELL(prog_menu), menu_item); /* SSC */ menu_item=gtk_menu_item_new_with_label("SSC (tape)"); 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); + gtk_menu_shell_append(GTK_MENU_SHELL(prog_menu), menu_item); /* MMC */ menu_item=gtk_menu_item_new_with_label("MMC (cd/dvd)"); 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); + gtk_menu_shell_append(GTK_MENU_SHELL(prog_menu), menu_item); gtk_option_menu_set_menu(GTK_OPTION_MENU(prog_opt), prog_menu); diff --git a/gtk/sctp_assoc_analyse.c b/gtk/sctp_assoc_analyse.c index 9be373d2c8..5c16bf0ee1 100644 --- a/gtk/sctp_assoc_analyse.c +++ b/gtk/sctp_assoc_analyse.c @@ -478,7 +478,7 @@ static void create_analyse_window(struct sctp_analyse* u_data) /* Container for each row of widgets */ main_vb = gtk_vbox_new(FALSE, 2); - gtk_container_border_width(GTK_CONTAINER(main_vb), 2); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 2); gtk_container_add(GTK_CONTAINER(window), main_vb); gtk_widget_show(main_vb); @@ -568,7 +568,7 @@ static void create_analyse_window(struct sctp_analyse* u_data) gtk_container_add(GTK_CONTAINER(page2), u_data->analyse_nb->page2->addr_frame); addr_hb = gtk_hbox_new(FALSE, 3); - gtk_container_border_width(GTK_CONTAINER(addr_hb), 5); + gtk_container_set_border_width(GTK_CONTAINER(addr_hb), 5); gtk_container_add(GTK_CONTAINER(u_data->analyse_nb->page2->addr_frame), addr_hb); u_data->analyse_nb->page2->scrolled_window = scrolled_window_new(NULL, NULL); @@ -589,7 +589,7 @@ static void create_analyse_window(struct sctp_analyse* u_data) gtk_container_add(GTK_CONTAINER(page2), stat_fr); hbox = gtk_hbox_new(FALSE,3); - gtk_container_border_width(GTK_CONTAINER(hbox), 5); + gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); gtk_container_add(GTK_CONTAINER(stat_fr), hbox); vbox_l = gtk_vbox_new(FALSE, 3); @@ -679,7 +679,7 @@ static void create_analyse_window(struct sctp_analyse* u_data) gtk_container_add(GTK_CONTAINER(page3), u_data->analyse_nb->page3->addr_frame); addr_hb = gtk_hbox_new(FALSE, 3); - gtk_container_border_width(GTK_CONTAINER(addr_hb), 5); + gtk_container_set_border_width(GTK_CONTAINER(addr_hb), 5); gtk_container_add(GTK_CONTAINER(u_data->analyse_nb->page3->addr_frame), addr_hb); u_data->analyse_nb->page3->scrolled_window = scrolled_window_new(NULL, NULL); @@ -701,7 +701,7 @@ static void create_analyse_window(struct sctp_analyse* u_data) gtk_container_add(GTK_CONTAINER(page3), stat_fr); hbox = gtk_hbox_new(FALSE,3); - gtk_container_border_width(GTK_CONTAINER(hbox), 5); + gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); gtk_container_add(GTK_CONTAINER(stat_fr), hbox); vbox_l = gtk_vbox_new(FALSE, 3); diff --git a/gtk/sctp_byte_graph_dlg.c b/gtk/sctp_byte_graph_dlg.c index 41daa5d60b..426f4d7fcf 100644 --- a/gtk/sctp_byte_graph_dlg.c +++ b/gtk/sctp_byte_graph_dlg.c @@ -1067,7 +1067,7 @@ static void init_sctp_graph_window(struct sctp_udata *u_data) gtk_box_pack_start(GTK_BOX(hbox), sack_bt, FALSE, FALSE, 0); gtk_widget_show(sack_bt); - gtk_signal_connect(GTK_OBJECT(sack_bt), "clicked", (GtkSignalFunc)on_sack_bt, u_data); + g_signal_connect(sack_bt, "clicked", G_CALLBACK(on_sack_bt), u_data); tsn_bt = gtk_button_new_with_label ("Data bytes sent"); gtk_box_pack_start(GTK_BOX(hbox), tsn_bt, FALSE, FALSE, 0); @@ -1099,8 +1099,8 @@ static void init_sctp_graph_window(struct sctp_udata *u_data) gtk_widget_show(bt_close); 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); + g_signal_connect(u_data->io->draw_area,"button_press_event",G_CALLBACK(on_button_press), u_data); + g_signal_connect(u_data->io->draw_area,"button_release_event",G_CALLBACK(on_button_release), u_data); gtk_widget_set_events(u_data->io->draw_area, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_EXPOSURE_MASK); /* dlg_set_cancel(u_data->io->window, bt_close); */ diff --git a/gtk/sctp_chunk_stat_dlg.c b/gtk/sctp_chunk_stat_dlg.c index f2cd3ee79f..ea46268431 100644 --- a/gtk/sctp_chunk_stat_dlg.c +++ b/gtk/sctp_chunk_stat_dlg.c @@ -230,7 +230,7 @@ gtk_sctpstat_dlg(struct sctp_udata *u_data, unsigned int direction) /* Container for each row of widgets */ vbox1 = gtk_vbox_new(FALSE, 2); - gtk_container_border_width(GTK_CONTAINER(vbox1), 8); + gtk_container_set_border_width(GTK_CONTAINER(vbox1), 8); gtk_container_add(GTK_CONTAINER(u_data->io->window), vbox1); gtk_widget_show(vbox1); @@ -358,7 +358,7 @@ static void sctp_chunk_dlg(struct sctp_udata *u_data) /* Container for each row of widgets */ main_vb = gtk_vbox_new(FALSE, 12); - gtk_container_border_width(GTK_CONTAINER(main_vb), 12); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 12); gtk_container_add(GTK_CONTAINER(u_data->io->window), main_vb); /* table */ diff --git a/gtk/sctp_error_dlg.c b/gtk/sctp_error_dlg.c index 30e8dd2beb..af426ea0e5 100644 --- a/gtk/sctp_error_dlg.c +++ b/gtk/sctp_error_dlg.c @@ -158,7 +158,7 @@ gtk_sctperror_dlg(void) /* Container for each row of widgets */ vbox1 = gtk_vbox_new(FALSE, 2); - gtk_container_border_width(GTK_CONTAINER(vbox1), 8); + gtk_container_set_border_width(GTK_CONTAINER(vbox1), 8); gtk_container_add(GTK_CONTAINER(sctp_error_dlg_w), vbox1); gtk_widget_show(vbox1); diff --git a/gtk/sctp_graph_dlg.c b/gtk/sctp_graph_dlg.c index f16bac1abb..2195f869d6 100644 --- a/gtk/sctp_graph_dlg.c +++ b/gtk/sctp_graph_dlg.c @@ -1142,7 +1142,7 @@ static void init_sctp_graph_window(struct sctp_udata *u_data) gtk_box_pack_start(GTK_BOX(hbox), sack_bt, FALSE, FALSE, 0); gtk_widget_show(sack_bt); - gtk_signal_connect(GTK_OBJECT(sack_bt), "clicked", (GtkSignalFunc)on_sack_bt, u_data); + g_signal_connect(sack_bt, "clicked", G_CALLBACK(on_sack_bt), u_data); tsn_bt = gtk_button_new_with_label ("Show TSNs"); gtk_box_pack_start(GTK_BOX(hbox), tsn_bt, FALSE, FALSE, 0); @@ -1174,8 +1174,8 @@ static void init_sctp_graph_window(struct sctp_udata *u_data) gtk_widget_show(bt_close); 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); + g_signal_connect(u_data->io->draw_area,"button_press_event",G_CALLBACK(on_button_press), u_data); + g_signal_connect(u_data->io->draw_area,"button_release_event",G_CALLBACK(on_button_release), u_data); gtk_widget_set_events(u_data->io->draw_area, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_EXPOSURE_MASK); gtk_widget_show(u_data->io->window); diff --git a/gtk/sctp_stat_dlg.c b/gtk/sctp_stat_dlg.c index aa6f2c02ec..4cb3a83880 100644 --- a/gtk/sctp_stat_dlg.c +++ b/gtk/sctp_stat_dlg.c @@ -487,7 +487,7 @@ gtk_sctpstat_dlg(void) /* Container for each row of widgets */ vbox1 = gtk_vbox_new(FALSE, 2); - gtk_container_border_width(GTK_CONTAINER(vbox1), 8); + gtk_container_set_border_width(GTK_CONTAINER(vbox1), 8); gtk_container_add(GTK_CONTAINER(sctp_stat_dlg_w), vbox1); gtk_widget_show(vbox1); diff --git a/gtk/simple_dialog.c b/gtk/simple_dialog.c index 300ed6bc4e..66a36bda68 100644 --- a/gtk/simple_dialog.c +++ b/gtk/simple_dialog.c @@ -138,7 +138,7 @@ display_simple_dialog(gint type, gint btn_mask, char *message) } gtk_window_set_modal(GTK_WINDOW(win), TRUE); - gtk_container_border_width(GTK_CONTAINER(win), 6); + gtk_container_set_border_width(GTK_CONTAINER(win), 6); /* Container for our rows */ main_vb = gtk_vbox_new(FALSE, 12); @@ -147,7 +147,7 @@ display_simple_dialog(gint type, gint btn_mask, char *message) /* Top row: Icon and message text */ top_hb = gtk_hbox_new(FALSE, 12); - gtk_container_border_width(GTK_CONTAINER(main_vb), 6); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 6); gtk_container_add(GTK_CONTAINER(main_vb), top_hb); gtk_widget_show(top_hb); diff --git a/gtk/sip_stat.c b/gtk/sip_stat.c index cbaa1e6312..1f0f9e5c9b 100644 --- a/gtk/sip_stat.c +++ b/gtk/sip_stat.c @@ -551,7 +551,7 @@ gtk_sipstat_init(const char *optarg, void *userdata _U_) /* Create container for all widgets */ main_vb = gtk_vbox_new(FALSE, 12); - gtk_container_border_width(GTK_CONTAINER(main_vb), 12); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 12); gtk_container_add(GTK_CONTAINER(sp->win), main_vb); /* Initialise & show number of packets */ @@ -616,7 +616,7 @@ gtk_sipstat_init(const char *optarg, void *userdata _U_) /* Request table and frame */ request_fr = gtk_frame_new("List of request methods"); gtk_container_add(GTK_CONTAINER(main_vb), request_fr); - gtk_container_border_width(GTK_CONTAINER(request_fr), 0); + gtk_container_set_border_width(GTK_CONTAINER(request_fr), 0); sp->request_box = gtk_vbox_new(FALSE, 10); gtk_container_add(GTK_CONTAINER(request_fr), sp->request_box); diff --git a/gtk/stats_tree_stat.c b/gtk/stats_tree_stat.c index 1f7ad8ec90..ffa1319467 100644 --- a/gtk/stats_tree_stat.c +++ b/gtk/stats_tree_stat.c @@ -239,7 +239,7 @@ static void init_gtk_tree(const char* optarg, void *userdata _U_) { g_free(title); main_vb = gtk_vbox_new(FALSE, 3); - gtk_container_border_width(GTK_CONTAINER(main_vb), 12); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 12); gtk_container_add(GTK_CONTAINER(st->pr->win), main_vb); scr_win = scrolled_window_new(NULL, NULL); diff --git a/gtk/summary_dlg.c b/gtk/summary_dlg.c index f6a2db7f29..6eb1b64ff2 100644 --- a/gtk/summary_dlg.c +++ b/gtk/summary_dlg.c @@ -135,7 +135,7 @@ summary_open_cb(GtkWidget *w _U_, gpointer d _U_) /* Container for each row of widgets */ main_vb = gtk_vbox_new(FALSE, 12); - gtk_container_border_width(GTK_CONTAINER(main_vb), 12); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 12); gtk_container_add(GTK_CONTAINER(sum_open_w), main_vb); /* table */ diff --git a/gtk/supported_protos_dlg.c b/gtk/supported_protos_dlg.c index 17c0d754b1..08395b7539 100644 --- a/gtk/supported_protos_dlg.c +++ b/gtk/supported_protos_dlg.c @@ -91,11 +91,11 @@ void supported_cb(GtkWidget *w _U_, gpointer data _U_) supported_w = window_new(GTK_WINDOW_TOPLEVEL, "Wireshark: Supported Protocols"); gtk_window_set_default_size(GTK_WINDOW(supported_w), DEF_WIDTH * 2/3, DEF_HEIGHT * 2/3); - gtk_container_border_width(GTK_CONTAINER(supported_w), 2); + gtk_container_set_border_width(GTK_CONTAINER(supported_w), 2); /* Container for each row of widgets */ main_vb = gtk_vbox_new(FALSE, 1); - gtk_container_border_width(GTK_CONTAINER(main_vb), 1); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 1); gtk_container_add(GTK_CONTAINER(supported_w), main_vb); gtk_widget_show(main_vb); @@ -108,7 +108,7 @@ void supported_cb(GtkWidget *w _U_, gpointer data _U_) /* protocol list */ proto_vb = gtk_vbox_new(FALSE, 0); - gtk_container_border_width(GTK_CONTAINER(proto_vb), 1); + gtk_container_set_border_width(GTK_CONTAINER(proto_vb), 1); txt_scrollw = scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(txt_scrollw), @@ -126,7 +126,7 @@ void supported_cb(GtkWidget *w _U_, gpointer data _U_) /* display filter fields */ dfilter_vb = gtk_vbox_new(FALSE, 0); - gtk_container_border_width(GTK_CONTAINER(dfilter_vb), 1); + gtk_container_set_border_width(GTK_CONTAINER(dfilter_vb), 1); txt_scrollw = scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(txt_scrollw), diff --git a/gtk/tap_dfilter_dlg.c b/gtk/tap_dfilter_dlg.c index c8478ebc5b..053061ae60 100644 --- a/gtk/tap_dfilter_dlg.c +++ b/gtk/tap_dfilter_dlg.c @@ -195,7 +195,7 @@ tap_dfilter_dlg_cb(GtkWidget *w _U_, gpointer data) g_free(title); dlg_box=gtk_vbox_new(FALSE, 10); - gtk_container_border_width(GTK_CONTAINER(dlg_box), 10); + gtk_container_set_border_width(GTK_CONTAINER(dlg_box), 10); gtk_container_add(GTK_CONTAINER(current_dlg->dlg), dlg_box); gtk_widget_show(dlg_box); diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c index 8a0e1ae1a2..a6bd38100b 100644 --- a/gtk/tcp_graph.c +++ b/gtk/tcp_graph.c @@ -541,7 +541,7 @@ static void create_text_widget (struct graph *g) streamwindow = dlg_window_new ("Wireshark: Packet chain"); gtk_widget_set_name (streamwindow, "Packet chain"); gtk_widget_set_size_request(streamwindow, TXT_WIDTH, TXT_HEIGHT); - gtk_container_border_width (GTK_CONTAINER(streamwindow), 2); + gtk_container_set_border_width (GTK_CONTAINER(streamwindow), 2); box = gtk_vbox_new (FALSE, 0); gtk_container_add (GTK_CONTAINER (streamwindow), box); @@ -882,7 +882,7 @@ static void control_panel_add_origin_page (struct graph *g, GtkWidget *n) time_orig_cap = gtk_radio_button_new_with_label (NULL, "beginning of capture"); time_orig_conn = gtk_radio_button_new_with_label ( - gtk_radio_button_group (GTK_RADIO_BUTTON (time_orig_cap)), + gtk_radio_button_get_group (GTK_RADIO_BUTTON (time_orig_cap)), "beginning of this TCP connection"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (time_orig_conn), TRUE); time_orig_box = gtk_vbox_new (TRUE, 0); @@ -895,7 +895,7 @@ static void control_panel_add_origin_page (struct graph *g, GtkWidget *n) /* sequence number origin group */ seq_orig_isn = gtk_radio_button_new_with_label (NULL, "initial sequence number"); - seq_orig_zero = gtk_radio_button_new_with_label (gtk_radio_button_group ( + seq_orig_zero = gtk_radio_button_new_with_label (gtk_radio_button_get_group ( GTK_RADIO_BUTTON (seq_orig_isn)), "0 (=absolute)"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (seq_orig_isn), TRUE); seq_orig_box = gtk_vbox_new (TRUE, 0); @@ -968,7 +968,7 @@ static void callback_create_help(GtkWidget *widget _U_, gpointer data _U_) gtk_window_set_default_size(GTK_WINDOW(toplevel), 500, 400); vbox = gtk_vbox_new (FALSE, 3); - gtk_container_border_width(GTK_CONTAINER(vbox), 12); + gtk_container_set_border_width(GTK_CONTAINER(vbox), 12); gtk_container_add (GTK_CONTAINER (toplevel), vbox); scroll = scrolled_window_new (NULL, NULL); @@ -1018,7 +1018,7 @@ static GtkWidget *control_panel_create_zoom_group (struct graph *g) zoom_in = gtk_radio_button_new_with_label (NULL, "in"); zoom_out = gtk_radio_button_new_with_label ( - gtk_radio_button_group (GTK_RADIO_BUTTON (zoom_in)), "out"); + gtk_radio_button_get_group (GTK_RADIO_BUTTON (zoom_in)), "out"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (zoom_in), TRUE); zoom_inout_box = gtk_hbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (zoom_inout_box), zoom_in, FALSE, FALSE, 10); @@ -1127,7 +1127,7 @@ static void callback_zoom_step (GtkWidget *spin, gpointer data) double old_this; direction = (long)g_object_get_data(G_OBJECT(spin), "direction"); - value = gtk_spin_button_get_value_as_float (GTK_SPIN_BUTTON (spin)); + value = gtk_spin_button_get_value (GTK_SPIN_BUTTON (spin)); if (direction) { zoom_this = &g->zoom.step_y; @@ -1328,7 +1328,7 @@ static void callback_mag_zoom (GtkWidget *spin, gpointer data) return; } direction = (long)g_object_get_data(G_OBJECT(spin), "direction"); - value = gtk_spin_button_get_value_as_float (GTK_SPIN_BUTTON (spin)); + value = gtk_spin_button_get_value (GTK_SPIN_BUTTON (spin)); if (direction) { zoom_this = &g->magnify.zoom.y; @@ -1385,10 +1385,10 @@ static GtkWidget *control_panel_create_zoomlock_group (struct graph *g) zoom_lock_none = gtk_radio_button_new_with_label (NULL, "none"); zoom_lock_h = gtk_radio_button_new_with_label ( - gtk_radio_button_group (GTK_RADIO_BUTTON (zoom_lock_none)), + gtk_radio_button_get_group (GTK_RADIO_BUTTON (zoom_lock_none)), "horizontal"); zoom_lock_v = gtk_radio_button_new_with_label ( - gtk_radio_button_group (GTK_RADIO_BUTTON (zoom_lock_none)), + gtk_radio_button_get_group (GTK_RADIO_BUTTON (zoom_lock_none)), "vertical"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (zoom_lock_none), TRUE); zoom_lock_box = gtk_hbox_new (FALSE, 0); @@ -1432,7 +1432,7 @@ static GtkWidget *control_panel_create_cross_group (struct graph *g) label = gtk_label_new ("Crosshairs:"); off = gtk_radio_button_new_with_label (NULL, "off"); on = gtk_radio_button_new_with_label ( - gtk_radio_button_group (GTK_RADIO_BUTTON (off)), "on"); + gtk_radio_button_get_group (GTK_RADIO_BUTTON (off)), "on"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (off), TRUE); box = gtk_hbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 10); @@ -1475,13 +1475,13 @@ static GtkWidget *control_panel_create_graph_type_group (struct graph *g) graph_tput = gtk_radio_button_new_with_label (NULL, "Throughput"); graph_tseqttrace = gtk_radio_button_new_with_label ( - gtk_radio_button_group (GTK_RADIO_BUTTON (graph_tput)), + gtk_radio_button_get_group (GTK_RADIO_BUTTON (graph_tput)), "Time/Sequence (tcptrace-style)"); graph_tseqstevens = gtk_radio_button_new_with_label ( - gtk_radio_button_group (GTK_RADIO_BUTTON (graph_tput)), + gtk_radio_button_get_group (GTK_RADIO_BUTTON (graph_tput)), "Time/Sequence (Stevens'-style)"); graph_rtt = gtk_radio_button_new_with_label ( - gtk_radio_button_group (GTK_RADIO_BUTTON (graph_tput)), + gtk_radio_button_get_group (GTK_RADIO_BUTTON (graph_tput)), "Round-trip Time"); switch (g->type) { case GRAPH_TSEQ_STEVENS: diff --git a/gtk/text_page_utils.c b/gtk/text_page_utils.c index 3afd44478d..2cbc309b9b 100644 --- a/gtk/text_page_utils.c +++ b/gtk/text_page_utils.c @@ -57,7 +57,7 @@ GtkWidget * text_page_new(const char *absolute_path) GtkWidget *page_vb, *txt_scrollw, *txt; page_vb = gtk_vbox_new(FALSE, 0); - gtk_container_border_width(GTK_CONTAINER(page_vb), 1); + gtk_container_set_border_width(GTK_CONTAINER(page_vb), 1); txt_scrollw = scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(txt_scrollw), GTK_SHADOW_IN); diff --git a/gtk/uat_gui.c b/gtk/uat_gui.c index 68eeef64a4..8355bdee11 100644 --- a/gtk/uat_gui.c +++ b/gtk/uat_gui.c @@ -422,7 +422,7 @@ static void uat_edit_dialog(uat_t* uat, gint row) { main_vb = gtk_vbox_new(FALSE,5); gtk_container_add(GTK_CONTAINER(win), main_vb); - gtk_container_border_width(GTK_CONTAINER(main_vb), 6); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 6); main_tb = gtk_table_new(uat->ncols+1, 2, FALSE); gtk_box_pack_start(GTK_BOX(main_vb), main_tb, FALSE, FALSE, 0); @@ -470,7 +470,7 @@ static void uat_edit_dialog(uat_t* uat, gint row) { md->text = str; md->valptr = valptr; - gtk_menu_append(GTK_MENU(menu), menu_item); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item); if ( g_str_equal(str, text) ) { menu_index = index; @@ -565,7 +565,7 @@ static void uat_del_dlg(uat_t* uat, int idx) { main_vb = gtk_vbox_new(FALSE,5); gtk_container_add(GTK_CONTAINER(win), main_vb); - gtk_container_border_width(GTK_CONTAINER(main_vb), 6); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 6); main_tb = gtk_table_new(uat->ncols+1, 2, FALSE); gtk_box_pack_start(GTK_BOX(main_vb), main_tb, FALSE, FALSE, 0); @@ -784,7 +784,7 @@ static gboolean unsaved_dialog(GtkWindow *w _U_, GdkEvent* e _U_, gpointer u) { gtk_window_set_position(GTK_WINDOW(win), GTK_WIN_POS_CENTER_ON_PARENT); vbox = gtk_vbox_new(FALSE, 12); - gtk_container_border_width(GTK_CONTAINER(vbox), 6); + gtk_container_set_border_width(GTK_CONTAINER(vbox), 6); gtk_container_add(GTK_CONTAINER(win), vbox); message = ep_strdup_printf("Changes to '%s' are not being saved!\n" @@ -834,18 +834,18 @@ static GtkWidget* uat_window(void* u) { gtk_window_resize(GTK_WINDOW(rep->window), 720, 512); gtk_window_set_position(GTK_WINDOW(rep->window), GTK_WIN_POS_CENTER_ON_PARENT); - gtk_container_border_width(GTK_CONTAINER(rep->window), 6); + gtk_container_set_border_width(GTK_CONTAINER(rep->window), 6); rep->vbox = gtk_vbox_new(FALSE, 12); - gtk_container_border_width(GTK_CONTAINER(rep->vbox), 6); + gtk_container_set_border_width(GTK_CONTAINER(rep->vbox), 6); gtk_container_add(GTK_CONTAINER(rep->window), rep->vbox); hbox = gtk_hbox_new(FALSE,12); - gtk_container_border_width(GTK_CONTAINER(hbox), 6); + gtk_container_set_border_width(GTK_CONTAINER(hbox), 6); gtk_container_add(GTK_CONTAINER(rep->vbox), hbox); vbox = gtk_vbox_new(FALSE, 12); - gtk_container_border_width(GTK_CONTAINER(vbox), 6); + gtk_container_set_border_width(GTK_CONTAINER(vbox), 6); gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); rep->scrolledwindow = scrolled_window_new(NULL, NULL); diff --git a/gtk/wlan_stat_dlg.c b/gtk/wlan_stat_dlg.c index 4f4db9c499..67f5ca7a88 100644 --- a/gtk/wlan_stat_dlg.c +++ b/gtk/wlan_stat_dlg.c @@ -1132,7 +1132,7 @@ wlanstat_dlg_create (void) gtk_paned_pack1(GTK_PANED(wlanstat_pane), wlanstat_name_lb, FALSE, TRUE); selected_vb = gtk_vbox_new(FALSE, 0); gtk_container_add(GTK_CONTAINER(wlanstat_name_lb), selected_vb); - gtk_container_border_width(GTK_CONTAINER(selected_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(selected_vb), 5); scrolled_window = scrolled_window_new (NULL, NULL); gtk_box_pack_start(GTK_BOX(selected_vb), scrolled_window, TRUE, TRUE, 0); @@ -1195,7 +1195,7 @@ wlanstat_dlg_create (void) gtk_paned_pack2(GTK_PANED(wlanstat_pane), frame, FALSE, TRUE); selected_vb = gtk_vbox_new(FALSE, 0); gtk_container_add(GTK_CONTAINER(frame), selected_vb); - gtk_container_border_width(GTK_CONTAINER(selected_vb), 5); + gtk_container_set_border_width(GTK_CONTAINER(selected_vb), 5); scrolled_window = scrolled_window_new (NULL, NULL); gtk_box_pack_start(GTK_BOX(selected_vb), scrolled_window, TRUE, TRUE, 0); @@ -1270,7 +1270,7 @@ wlanstat_dlg_create (void) resolv_cb = gtk_check_button_new_with_mnemonic("Name resolution"); gtk_container_add(GTK_CONTAINER(hbox), resolv_cb); - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(resolv_cb), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(resolv_cb), TRUE); 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); @@ -1278,13 +1278,13 @@ wlanstat_dlg_create (void) 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_toggle_button_set_active(GTK_TOGGLE_BUTTON(filter_cb), FALSE); gtk_tooltips_set_tip(tooltips, filter_cb, "Limit the list to entries matching the current display filter.", NULL); g_signal_connect(filter_cb, "toggled", G_CALLBACK(wlan_filter_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_toggle_button_set_active(GTK_TOGGLE_BUTTON(existing_cb), FALSE); gtk_tooltips_set_tip(tooltips, existing_cb, "This option disables probe requests for " "unknown networks.", NULL); g_signal_connect(existing_cb, "toggled", G_CALLBACK(wlan_existing_toggle_dest), hs); diff --git a/gtk/wsp_stat.c b/gtk/wsp_stat.c index 9ffd134362..ea246a2e94 100644 --- a/gtk/wsp_stat.c +++ b/gtk/wsp_stat.c @@ -360,7 +360,7 @@ gtk_wspstat_init(const char *optarg, void *userdata _U_) /* container for the two frames */ main_vb = gtk_vbox_new(FALSE, 3); - gtk_container_border_width(GTK_CONTAINER(main_vb), 12); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 12); gtk_container_add(GTK_CONTAINER(sp->win), main_vb); /* PDU Types frame */ |