More GLIB_CHECK_VERSION and GTK_CHECK_VERSION cleanup.

svn path=/trunk/; revision=37971

11 files changed, 26 insertions, 224 deletions

diff --git a/gtk/file_import_dlg.c b/gtk/file_import_dlg.c
index dc05168d79..1f59e9b3d1 100644
--- a/gtk/file_import_dlg.c
+++ b/gtk/file_import_dlg.c
@@ -847,11 +847,6 @@ file_import_dlg_new(void)
                *framelen_hb, *framelen_lbl, *framelen_te,
                *bbox, *help_bt, *close_bt, *ok_bt;
 
-#if GTK_CHECK_VERSION(2,12,0)
-#else
-    GtkTooltips *tooltips = gtk_tooltips_new();
-#endif
-
     /* Setup the dialog */
 
     main_w = dlg_window_new("Wireshark: Import from Text");
@@ -885,21 +880,13 @@ file_import_dlg_new(void)
     gtk_table_attach(GTK_TABLE(input_tb), filename_lbl, 0, 1, 0, 1, 0, 0, 0, 0);
 
     filename_te = gtk_entry_new();
-#if GTK_CHECK_VERSION(2,12,0)
     gtk_widget_set_tooltip_text(filename_te, "Set name of text file to import");
-#else
-    gtk_tooltips_set_tip(tooltips, filename_te, "Set name of text file to import", NULL);
-#endif
     gtk_table_attach_defaults(GTK_TABLE(input_tb), filename_te, 1, 2, 0, 1);
 
     g_object_set_data(G_OBJECT(input_frm), INPUT_FILENAME_TE_KEY, filename_te);
 
     browse_bt = gtk_button_new_from_stock(WIRESHARK_STOCK_BROWSE);
-#if GTK_CHECK_VERSION(2,12,0)
     gtk_widget_set_tooltip_text(browse_bt, "Browse for text file to import");
-#else
-    gtk_tooltips_set_tip(tooltips, browse_bt, "Browse for text file to import", NULL);
-#endif
     gtk_table_attach(GTK_TABLE(input_tb), browse_bt, 2, 3, 0, 1, 0, 0, 0, 0);
 
     g_signal_connect(browse_bt, "clicked", G_CALLBACK(browse_file_cb), filename_te);
@@ -921,31 +908,19 @@ file_import_dlg_new(void)
 
     /* First entry in the group */
     offset_hex_rb = gtk_radio_button_new_with_label(NULL, "Hexadecimal");
-#if GTK_CHECK_VERSION(2,12,0)
     gtk_widget_set_tooltip_text(offset_hex_rb, "Offsets in the text file are in hexadecimal notation");
-#else
-    gtk_tooltips_set_tip(tooltips, offset_hex_rb, "Offsets in the text file are in hexadecimal notation", NULL);
-#endif
     gtk_box_pack_start(GTK_BOX(offset_rb_vb), offset_hex_rb, FALSE, FALSE, 0);
 
     g_object_set_data(G_OBJECT(input_frm), INPUT_OFFSET_HEX_RB_KEY, offset_hex_rb);
 
     offset_oct_rb = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(offset_hex_rb), "Octal");
-#if GTK_CHECK_VERSION(2,12,0)
     gtk_widget_set_tooltip_text(offset_oct_rb, "Offsets in the text file are in octal notation");
-#else
-    gtk_tooltips_set_tip(tooltips, offset_oct_rb, "Offsets in the text file are in octal notation", NULL);
-#endif
     gtk_box_pack_start(GTK_BOX(offset_rb_vb), offset_oct_rb, FALSE, FALSE, 0);
 
     g_object_set_data(G_OBJECT(input_frm), INPUT_OFFSET_OCT_RB_KEY, offset_oct_rb);
 
     offset_dec_rb = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(offset_hex_rb), "Decimal");
-#if GTK_CHECK_VERSION(2,12,0)
     gtk_widget_set_tooltip_text(offset_dec_rb, "Offsets in the text file are in decimal notation");
-#else
-    gtk_tooltips_set_tip(tooltips, offset_dec_rb, "Offsets in the text file are in decimal notation", NULL);
-#endif
     gtk_box_pack_start(GTK_BOX(offset_rb_vb), offset_dec_rb, FALSE, FALSE, 0);
 
     g_object_set_data(G_OBJECT(input_frm), INPUT_OFFSET_DEC_RB_KEY, offset_dec_rb);
@@ -956,11 +931,7 @@ file_import_dlg_new(void)
     gtk_box_pack_start(GTK_BOX(input_vb), timefmt_hb, FALSE, FALSE, 0);
 
     timefmt_cb = gtk_check_button_new_with_label("Date/Time");
-#if GTK_CHECK_VERSION(2,12,0)
     gtk_widget_set_tooltip_text(timefmt_cb, "Whether or not the text file contains timestamp information");
-#else
-    gtk_tooltips_set_tip(tooltips, timefmt_cb, "Whether or not the text file contains timestamp information", NULL);
-#endif
     gtk_box_pack_start(GTK_BOX(timefmt_hb), timefmt_cb, FALSE, FALSE, 0);
 
     g_object_set_data(G_OBJECT(input_frm), INPUT_DATETIME_CB_KEY, timefmt_cb);
@@ -971,11 +942,7 @@ file_import_dlg_new(void)
     g_object_set_data(G_OBJECT(timefmt_cb), INPUT_TIMEFMT_LBL_KEY, timefmt_lbl);
 
     timefmt_te = gtk_entry_new();
-#if GTK_CHECK_VERSION(2,12,0)
     gtk_widget_set_tooltip_text(timefmt_te, "The format in which to parse timestamps in the text file (eg. %H:%M:%S.). Format specifiers are based on strptime(3)");
-#else
-    gtk_tooltips_set_tip(tooltips, timefmt_te, "The format in which to parse timestamps in the text file (eg. %H:%M:%S.). Format specifiers are based on strptime(3)", NULL);
-#endif
     gtk_box_pack_start(GTK_BOX(timefmt_hb), timefmt_te, FALSE, FALSE, 0);
 
     g_object_set_data(G_OBJECT(timefmt_cb), INPUT_TIMEFMT_TE_KEY, timefmt_te);
@@ -1003,11 +970,7 @@ file_import_dlg_new(void)
     gtk_box_pack_start(GTK_BOX(encap_hb), encap_lbl, FALSE, FALSE, 0);
 
     encap_co = fill_encap_combo();
-#if GTK_CHECK_VERSION(2,12,0)
     gtk_widget_set_tooltip_text(encap_co, "Encapsulation type for the frames in the import capture file");
-#else
-    gtk_tooltips_set_tip(tooltips, encap_co, "Encapsulation type for the frames in the import capture file", NULL);
-#endif
     gtk_box_pack_start(GTK_BOX(encap_hb), encap_co, FALSE, FALSE, 0);
 
     g_object_set_data(G_OBJECT(import_frm), IMPORT_ENCAP_CO_KEY, encap_co);
@@ -1015,11 +978,7 @@ file_import_dlg_new(void)
     /* Dummy header */
     header_frm = gtk_frame_new(NULL);
     header_cb = gtk_check_button_new_with_label("Dummy header");
-#if GTK_CHECK_VERSION(2,12,0)
     gtk_widget_set_tooltip_text(header_cb, "Whether or not to prefix a dummy header to the frames");
-#else
-    gtk_tooltips_set_tip(tooltips, header_cb, "Whether or not to prefix a dummy header to the frames", NULL);
-#endif
     gtk_frame_set_label_widget(GTK_FRAME(header_frm), header_cb);
     gtk_container_set_border_width(GTK_CONTAINER(header_frm), 3);
     gtk_box_pack_start(GTK_BOX(import_vb), header_frm, FALSE, FALSE, 0);
@@ -1040,11 +999,7 @@ file_import_dlg_new(void)
 
     /* First entry in the group */
     header_eth_rb = gtk_radio_button_new_with_label(NULL, "Ethernet");
-#if GTK_CHECK_VERSION(2,12,0)
     gtk_widget_set_tooltip_text(header_eth_rb, "Prefix an Ethernet header to the frames");
-#else
-    gtk_tooltips_set_tip(tooltips, header_eth_rb, "Prefix an Ethernet header to the frames", NULL);
-#endif
     g_signal_connect(header_eth_rb, "toggled", G_CALLBACK(header_eth_rb_toggle), header_frm);
     gtk_box_pack_start(GTK_BOX(header_rblbl_1_hb), header_eth_rb, FALSE, FALSE, 0);
 
@@ -1055,11 +1010,7 @@ file_import_dlg_new(void)
     gtk_misc_set_alignment(GTK_MISC(header_rblbl_1_lbl), 1.0f, 0.5f);
 
     etype_te = gtk_entry_new();
-#if GTK_CHECK_VERSION(2,12,0)
     gtk_widget_set_tooltip_text(etype_te, "The type to set in the Ethernet header");
-#else
-    gtk_tooltips_set_tip(tooltips, etype_te, "The type to set in the Ethernet header", NULL);
-#endif
     gtk_box_pack_end(GTK_BOX(header_rblbl_1_hb), etype_te, FALSE, FALSE, 0);
 
     g_object_set_data(G_OBJECT(header_frm), IMPORT_HEADER_ETYPE_LBL_KEY, header_rblbl_1_lbl);
@@ -1070,11 +1021,7 @@ file_import_dlg_new(void)
     gtk_box_pack_start(GTK_BOX(header_rblbl_vb), header_rblbl_2_hb, FALSE, FALSE, 2);
 
     header_ipv4_rb = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(header_eth_rb), "IPv4");
-#if GTK_CHECK_VERSION(2,12,0)
     gtk_widget_set_tooltip_text(header_ipv4_rb, "Prefix an Ethernet and IPv4 header to the frames");
-#else
-    gtk_tooltips_set_tip(tooltips, header_ipv4_rb, "Prefix an Ethernet and IPv4 header to the frames", NULL);
-#endif
     g_signal_connect(header_ipv4_rb, "toggled", G_CALLBACK(header_ipv4_rb_toggle), header_frm);
     gtk_box_pack_start(GTK_BOX(header_rblbl_2_hb), header_ipv4_rb, FALSE, FALSE, 0);
 
@@ -1085,11 +1032,7 @@ file_import_dlg_new(void)
     gtk_misc_set_alignment(GTK_MISC(header_rblbl_2_lbl), 1.0f, 0.5f);
 
     protocol_te = gtk_entry_new();
-#if GTK_CHECK_VERSION(2,12,0)
     gtk_widget_set_tooltip_text(protocol_te, "The protocol id to set in the IPv4 header");
-#else
-    gtk_tooltips_set_tip(tooltips, protocol_te, "The protocol id to set in the IPv4 header", NULL);
-#endif
     gtk_box_pack_end(GTK_BOX(header_rblbl_2_hb), protocol_te, FALSE, FALSE, 0);
 
     g_object_set_data(G_OBJECT(header_frm), IMPORT_HEADER_PROT_LBL_KEY, header_rblbl_2_lbl);
@@ -1100,11 +1043,7 @@ file_import_dlg_new(void)
     gtk_box_pack_start(GTK_BOX(header_rblbl_vb), header_rblbl_3_hb, FALSE, FALSE, 2);
 
     header_udp_rb = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(header_eth_rb), "UDP");
-#if GTK_CHECK_VERSION(2,12,0)
     gtk_widget_set_tooltip_text(header_udp_rb, "Prefix an Ethernet, IPv4 and UDP header to the frames");
-#else
-    gtk_tooltips_set_tip(tooltips, header_udp_rb, "Prefix an Ethernet, IPv4 and UDP header to the frames", NULL);
-#endif
     g_signal_connect(header_udp_rb, "toggled", G_CALLBACK(header_udp_rb_toggle), header_frm);
     gtk_box_pack_start(GTK_BOX(header_rblbl_3_hb), header_udp_rb, FALSE, FALSE, 0);
 
@@ -1115,11 +1054,7 @@ file_import_dlg_new(void)
     gtk_misc_set_alignment(GTK_MISC(header_rblbl_3_lbl), 1.0f, 0.5f);
 
     src_port_te = gtk_entry_new();
-#if GTK_CHECK_VERSION(2,12,0)
     gtk_widget_set_tooltip_text(src_port_te, "The source port to set in the UDP, TCP or SCTP header");
-#else
-    gtk_tooltips_set_tip(tooltips, src_port_te, "The source port to set in the UDP, TCP or SCTP header", NULL);
-#endif
     gtk_box_pack_end(GTK_BOX(header_rblbl_3_hb), src_port_te, FALSE, FALSE, 0);
 
     g_object_set_data(G_OBJECT(header_frm), IMPORT_HEADER_SRC_PORT_LBL_KEY, header_rblbl_3_lbl);
@@ -1130,11 +1065,7 @@ file_import_dlg_new(void)
     gtk_box_pack_start(GTK_BOX(header_rblbl_vb), header_rblbl_4_hb, FALSE, FALSE, 2);
 
     header_tcp_rb = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(header_eth_rb), "TCP");
-#if GTK_CHECK_VERSION(2,12,0)
     gtk_widget_set_tooltip_text(header_tcp_rb, "Prefix an Ethernet, IPv4 and TCP header to the frames");
-#else
-    gtk_tooltips_set_tip(tooltips, header_tcp_rb, "Prefix an Ethernet, IPv4 and TCP header to the frames", NULL);
-#endif
     g_signal_connect(header_tcp_rb, "toggled", G_CALLBACK(header_tcp_rb_toggle), header_frm);
     gtk_box_pack_start(GTK_BOX(header_rblbl_4_hb), header_tcp_rb, FALSE, FALSE, 0);
 
@@ -1145,11 +1076,7 @@ file_import_dlg_new(void)
     gtk_misc_set_alignment(GTK_MISC(header_rblbl_4_lbl), 1.0f, 0.5f);
 
     dst_port_te = gtk_entry_new();
-#if GTK_CHECK_VERSION(2,12,0)
     gtk_widget_set_tooltip_text(dst_port_te, "The destination port to set in the UDP, TCP or SCTP header");
-#else
-    gtk_tooltips_set_tip(tooltips, dst_port_te, "The destination port to set in the UDP, TCP or SCTP header", NULL);
-#endif
     gtk_box_pack_end(GTK_BOX(header_rblbl_4_hb), dst_port_te, FALSE, FALSE, 0);
 
     g_object_set_data(G_OBJECT(header_frm), IMPORT_HEADER_DST_PORT_LBL_KEY, header_rblbl_4_lbl);
@@ -1160,11 +1087,7 @@ file_import_dlg_new(void)
     gtk_box_pack_start(GTK_BOX(header_rblbl_vb), header_rblbl_5_hb, FALSE, FALSE, 2);
 
     header_sctp_rb = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(header_eth_rb), "SCTP");
-#if GTK_CHECK_VERSION(2,12,0)
     gtk_widget_set_tooltip_text(header_sctp_rb, "Prefix an Ethernet, IPv4 and SCTP header to the frames");
-#else
-    gtk_tooltips_set_tip(tooltips, header_sctp_rb, "Prefix an Ethernet, IPv4 and SCTP header to the frames", NULL);
-#endif
     g_signal_connect(header_sctp_rb, "toggled", G_CALLBACK(header_sctp_rb_toggle), header_frm);
     gtk_box_pack_start(GTK_BOX(header_rblbl_5_hb), header_sctp_rb, FALSE, FALSE, 0);
 
@@ -1175,11 +1098,7 @@ file_import_dlg_new(void)
     gtk_misc_set_alignment(GTK_MISC(header_rblbl_5_lbl), 1.0f, 0.5f);
 
     tag_te = gtk_entry_new();
-#if GTK_CHECK_VERSION(2,12,0)
     gtk_widget_set_tooltip_text(tag_te, "The verification tag to set in the SCTP header");
-#else
-    gtk_tooltips_set_tip(tooltips, tag_te, "The verification tag to set in the SCTP header", NULL);
-#endif
     gtk_box_pack_end(GTK_BOX(header_rblbl_5_hb), tag_te, FALSE, FALSE, 0);
 
     g_object_set_data(G_OBJECT(header_frm), IMPORT_HEADER_TAG_LBL_KEY, header_rblbl_5_lbl);
@@ -1190,11 +1109,7 @@ file_import_dlg_new(void)
     gtk_box_pack_start(GTK_BOX(header_rblbl_vb), header_rblbl_6_hb, FALSE, FALSE, 2);
 
     header_sctp_data_rb = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(header_eth_rb), "SCTP (DATA)");
-#if GTK_CHECK_VERSION(2,12,0)
     gtk_widget_set_tooltip_text(header_sctp_data_rb, "Prefix an Ethernet, IPv4 and SCTP DATA header to the frames");
-#else
-    gtk_tooltips_set_tip(tooltips, header_sctp_data_rb, "Prefix an Ethernet, IPv4 and SCTP DATA header to the frames", NULL);
-#endif
     g_signal_connect(header_sctp_data_rb, "toggled", G_CALLBACK(header_sctp_data_rb_toggle), header_frm);
     gtk_box_pack_start(GTK_BOX(header_rblbl_6_hb), header_sctp_data_rb, FALSE, FALSE, 0);
 
@@ -1205,11 +1120,7 @@ file_import_dlg_new(void)
     gtk_misc_set_alignment(GTK_MISC(header_rblbl_6_lbl), 1.0f, 0.5f);
 
     ppi_te = gtk_entry_new();
-#if GTK_CHECK_VERSION(2,12,0)
     gtk_widget_set_tooltip_text(ppi_te, "The payload protocol identifier to set in the SCTP DATA header");
-#else
-    gtk_tooltips_set_tip(tooltips, ppi_te, "The payload protocol identifier to set in the SCTP DATA header", NULL);
-#endif
     gtk_box_pack_end(GTK_BOX(header_rblbl_6_hb), ppi_te, FALSE, FALSE, 0);
 
     g_object_set_data(G_OBJECT(header_frm), IMPORT_HEADER_PPI_LBL_KEY, header_rblbl_6_lbl);
@@ -1233,11 +1144,7 @@ file_import_dlg_new(void)
     gtk_box_pack_start(GTK_BOX(framelen_hb), framelen_lbl, FALSE, FALSE, 0);
 
     framelen_te = gtk_entry_new();
-#if GTK_CHECK_VERSION(2,12,0)
     gtk_widget_set_tooltip_text(framelen_te, "The maximum size of the frames to write to the import capture file (max 64000)");
-#else
-    gtk_tooltips_set_tip(tooltips, framelen_te, "The maximum size of the frames to write to the import capture file (max 64000)", NULL);
-#endif
     gtk_box_pack_start(GTK_BOX(framelen_hb), framelen_te, FALSE, FALSE, 0);
 
     g_object_set_data(G_OBJECT(import_frm), IMPORT_FRAME_LENGTH_TE_KEY, framelen_te);
@@ -1249,28 +1156,16 @@ file_import_dlg_new(void)
 
     help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
     g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_IMPORT_DIALOG);
-#if GTK_CHECK_VERSION(2,12,0)
     gtk_widget_set_tooltip_text(help_bt, "Show topic specific help");
-#else
-    gtk_tooltips_set_tip(tooltips, help_bt, "Show topic specific help", NULL);
-#endif
 
     close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
     window_set_cancel_button(main_w, close_bt, window_cancel_button_cb);
-#if GTK_CHECK_VERSION(2,12,0)
     gtk_widget_set_tooltip_text(close_bt, "Close this dialog");
-#else
-    gtk_tooltips_set_tip(tooltips, close_bt, "Close this dialog", NULL);
-#endif
 
     ok_bt =  g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK);
     g_signal_connect(ok_bt, "clicked", G_CALLBACK(file_import_ok_cb), main_w);
     gtk_widget_grab_default(ok_bt);
-#if GTK_CHECK_VERSION(2,12,0)
     gtk_widget_set_tooltip_text(ok_bt, "Import the selected file into a temporary capture file");
-#else
-    gtk_tooltips_set_tip(tooltips, ok_bt, "Import the selected file into a temporary capture file", NULL);
-#endif
 
     /* Setup widget handling */
 
@@ -1305,4 +1200,3 @@ file_import_cmd_cb(GtkWidget *widget _U_)
 
     return;
 }
-
diff --git a/gtk/filter_autocomplete.c b/gtk/filter_autocomplete.c
index 147832d3ce..d0e6e87988 100644
--- a/gtk/filter_autocomplete.c
+++ b/gtk/filter_autocomplete.c
@@ -697,12 +697,8 @@ build_autocompletion_list(GtkWidget *filter_te, GtkWidget *treeview, GtkWidget *
 static void
 filter_autocomplete_disable_sorting(GtkTreeModel *model)
 {
-#if GTK_CHECK_VERSION(2,6,0)
-  gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(model), 
+  gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(model),
                                        GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID, GTK_SORT_ASCENDING);
-#else
-  gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(model), -2, GTK_SORT_ASCENDING);
-#endif
 }
 
 static void
@@ -738,9 +734,7 @@ filter_autocomplete_new(GtkWidget *filter_te, const gchar *protocol_name,
 
   /* Create tree view */
   treeview = gtk_tree_view_new();
-#if GTK_CHECK_VERSION(2,6,0)
   gtk_tree_view_set_hover_selection(GTK_TREE_VIEW(treeview), TRUE);
-#endif
   init_autocompletion_list(treeview);
   g_object_set_data(G_OBJECT(popup_win), E_FILT_AUTOCOMP_TREE_KEY, treeview);
 
diff --git a/gtk/filter_dlg.c b/gtk/filter_dlg.c
index ae6d5880b7..9000837735 100644
--- a/gtk/filter_dlg.c
+++ b/gtk/filter_dlg.c
@@ -1262,9 +1262,7 @@ color_filter_te(GtkWidget *w, guint16 red, guint16 green, guint16 blue)
 
     gtk_widget_modify_text(w, GTK_STATE_NORMAL, &black);
     gtk_widget_modify_base(w, GTK_STATE_NORMAL, &bg);
-#if GTK_CHECK_VERSION(2,12,0)
     gtk_widget_modify_cursor(w, &black, &black);
-#endif
 }
 
 void
@@ -1273,9 +1271,7 @@ colorize_filter_te_as_empty(GtkWidget *w)
     /* use defaults */
     gtk_widget_modify_text(w, GTK_STATE_NORMAL, NULL);
     gtk_widget_modify_base(w, GTK_STATE_NORMAL, NULL);
-#if GTK_CHECK_VERSION(2,12,0)
     gtk_widget_modify_cursor(w, NULL, NULL);
-#endif
 }
 
 void
@@ -1383,4 +1379,3 @@ filter_te_syntax_check_cb(GtkWidget *w, gpointer user_data _U_)
  * ex: set shiftwidth=4 tabstop=8 expandtab
  * :indentSize=4:tabSize=8:noTabs=true:
  */
-
diff --git a/gtk/firewall_dlg.c b/gtk/firewall_dlg.c
index 2e1c2a85e2..a3c7db3771 100644
--- a/gtk/firewall_dlg.c
+++ b/gtk/firewall_dlg.c
@@ -690,9 +690,7 @@ firewall_save_as_cmd_cb(GtkWidget *w _U_, gpointer data)
     new_win = file_selection_new("Wireshark: Save Firewall ACL Rule",
                                  FILE_SELECTION_SAVE);
     rule_info->firewall_save_as_w = new_win;
-#if GTK_CHECK_VERSION(2,8,0)
     gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(new_win), TRUE);
-#endif
 
     /* Tuck away the rule_info object into the window */
     g_object_set_data(G_OBJECT(new_win), WS_RULE_INFO_KEY, rule_info);
@@ -791,4 +789,3 @@ firewall_save_as_destroy_cb(GtkWidget * win _U_, gpointer data)
     /* Note that we no longer have a dialog box. */
     rule_info->firewall_save_as_w = NULL;
 }
-
diff --git a/gtk/follow_stream.c b/gtk/follow_stream.c
index 15a454184e..5f5da96f2b 100644
--- a/gtk/follow_stream.c
+++ b/gtk/follow_stream.c
@@ -539,9 +539,7 @@ follow_save_as_cmd_cb(GtkWidget *w _U_, gpointer data)
 	new_win = file_selection_new("Wireshark: Save Follow Stream As",
 				     FILE_SELECTION_SAVE);
 	follow_info->follow_save_as_w = new_win;
-#if GTK_CHECK_VERSION(2,8,0)
 	gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(new_win), TRUE);
-#endif
 
 	/* Tuck away the follow_info object into the window */
 	g_object_set_data(G_OBJECT(new_win), E_FOLLOW_INFO_KEY, follow_info);
diff --git a/gtk/gsm_a_stat.c b/gtk/gsm_a_stat.c
index a1c333ee84..82b57d1765 100644
--- a/gtk/gsm_a_stat.c
+++ b/gtk/gsm_a_stat.c
@@ -118,10 +118,8 @@ GtkWidget* create_list(void)
     list_view = GTK_TREE_VIEW(list);
     sortable = GTK_TREE_SORTABLE(list_store);
 
-#if GTK_CHECK_VERSION(2,6,0)
     /* Speed up the list display */
     gtk_tree_view_set_fixed_height_mode(list_view, TRUE);
-#endif
 
     /* Setup the sortable columns */
     gtk_tree_sortable_set_sort_column_id(sortable, IEI_COLUMN, GTK_SORT_ASCENDING);
@@ -292,12 +290,7 @@ gsm_a_stat_draw_aux(
              * :
              * should generally be preferred when inserting rows in a sorted list store.
              */
-#if GTK_CHECK_VERSION(2,6,0)
             gtk_list_store_insert_with_values( list_store , &iter, G_MAXINT,
-#else
-            gtk_list_store_append  (list_store, &iter);
-            gtk_list_store_set  (list_store, &iter,
-#endif
                     IEI_COLUMN, msg_strings[i].value,
                     MSG_NAME_COLUMN, (char *)msg_strings[i].strptr,
                     COUNT_COLUMN, message_count[msg_strings[i].value],
@@ -503,7 +496,7 @@ gsm_a_stat_gtk_dtap_cb(
 }
 
 #ifdef MAIN_MENU_USE_UIMANAGER
-void 
+void
 gsm_a_stat_gtk_dtap_mm_cb(GtkAction *action, gpointer user_data )
 {
     gsm_a_stat_gtk_dtap_cb(action, user_data, &dlg_dtap_mm,
diff --git a/gtk/gsm_map_stat.c b/gtk/gsm_map_stat.c
index 56dc826e8f..2b474b9d41 100644
--- a/gtk/gsm_map_stat.c
+++ b/gtk/gsm_map_stat.c
@@ -103,10 +103,8 @@ GtkWidget* create_list(void)
     list_view = GTK_TREE_VIEW(list);
     sortable = GTK_TREE_SORTABLE(list_store);
 
-#if GTK_CHECK_VERSION(2,6,0)
     /* Speed up the list display */
     gtk_tree_view_set_fixed_height_mode(list_view, TRUE);
-#endif
 
     /* Setup the sortable columns */
     gtk_tree_sortable_set_sort_column_id(sortable, ID_COLUMN, GTK_SORT_ASCENDING);
@@ -359,12 +357,7 @@ gsm_map_stat_draw(
              * :
              * should generally be preferred when inserting rows in a sorted list store.
              */
-#if GTK_CHECK_VERSION(2,6,0)
             gtk_list_store_insert_with_values( list_store , &iter, G_MAXINT,
-#else
-            gtk_list_store_append  (list_store, &iter);
-            gtk_list_store_set  (list_store, &iter,
-#endif
                    ID_COLUMN,               gsm_map_opr_code_strings[i].value,
                    OP_CODE_COLUMN,          (char*)gsm_map_opr_code_strings[i].strptr,
                    INVOKES_COLUMN,          stat_p->opr_code[i],
diff --git a/gtk/gui_utils.c b/gtk/gui_utils.c
index 1f1ab8009a..234d8b6ba8 100644
--- a/gtk/gui_utils.c
+++ b/gtk/gui_utils.c
@@ -369,12 +369,12 @@ window_set_geometry(GtkWidget *widget, window_geometry_t *geom)
 		 * If the requested (x,y) position isn't within the monitor's
 		 * viewable area, change it to the viewable area's (0,0). */
 
-		default_screen = gdk_screen_get_default();		
+		default_screen = gdk_screen_get_default();
 		monitor_num = gdk_screen_get_monitor_at_point(default_screen,
 							      geom->x, geom->y);
 		gdk_screen_get_monitor_geometry(default_screen, monitor_num,
 						&viewable_area);
-		
+
 		if(geom->x < viewable_area.x || geom->x > viewable_area.width)
 			geom->x = viewable_area.x;
 
@@ -847,7 +847,7 @@ void
 reactivate_window(GtkWidget *win)
 {
     GdkWindow *win_window;
-	
+
 #if GTK_CHECK_VERSION(2,14,0)
     win_window = gtk_widget_get_window(win);
 #else
@@ -1363,9 +1363,7 @@ switch_to_fixed_col(GtkTreeView *view)
     }
     g_list_free(list);
 
-#if GTK_CHECK_VERSION(2,6,0)
     gtk_tree_view_set_fixed_height_mode(view, TRUE);
-#endif
 }
 
 gint
diff --git a/gtk/hostlist_table.c b/gtk/hostlist_table.c
index a56afb1c50..caa592e37b 100644
--- a/gtk/hostlist_table.c
+++ b/gtk/hostlist_table.c
@@ -532,7 +532,7 @@ static const char *ui_desc_hostlist_table_popup =
 "  </popup>\n"
 "</ui>\n";
 
-/* 
+/*
  * GtkActionEntry
  * typedef struct {
  *   const gchar     *name;
@@ -542,15 +542,15 @@ static const char *ui_desc_hostlist_table_popup =
  *   const gchar     *tooltip;
  *   GCallback  callback;
  * } GtkActionEntry;
- * const gchar *name;			The name of the action.  
- * const gchar *stock_id;		The stock id for the action, or the name of an icon from the icon theme.  
- * const gchar *label;			The label for the action. This field should typically be marked for translation, 
- *								see gtk_action_group_set_translation_domain(). 
- *								If label is NULL, the label of the stock item with id stock_id is used.  
- * const gchar *accelerator;	The accelerator for the action, in the format understood by gtk_accelerator_parse().  
- * const gchar *tooltip;		The tooltip for the action. This field should typically be marked for translation, 
- *                              see gtk_action_group_set_translation_domain().  
- * GCallback callback;			The function to call when the action is activated.  
+ * const gchar *name;			The name of the action.
+ * const gchar *stock_id;		The stock id for the action, or the name of an icon from the icon theme.
+ * const gchar *label;			The label for the action. This field should typically be marked for translation,
+ *								see gtk_action_group_set_translation_domain().
+ *								If label is NULL, the label of the stock item with id stock_id is used.
+ * const gchar *accelerator;	The accelerator for the action, in the format understood by gtk_accelerator_parse().
+ * const gchar *tooltip;		The tooltip for the action. This field should typically be marked for translation,
+ *                              see gtk_action_group_set_translation_domain().
+ * GCallback callback;			The function to call when the action is activated.
  *
  */
 static const GtkActionEntry service_resp_t__popup_entries[] = {
@@ -589,24 +589,24 @@ hostlist_create_popup_menu(hostlist_table *hl)
 	GtkActionGroup *action_group;
 	GError *error = NULL;
 
-	action_group = gtk_action_group_new ("HostlistTablePopupActionGroup"); 
+	action_group = gtk_action_group_new ("HostlistTablePopupActionGroup");
 	gtk_action_group_add_actions (action_group,								/* the action group */
 								(gpointer)service_resp_t__popup_entries,	/* an array of action descriptions */
 								G_N_ELEMENTS(service_resp_t__popup_entries),/* the number of entries */
 								hl);										/* data to pass to the action callbacks */
 
 	ui_manager = gtk_ui_manager_new ();
-	gtk_ui_manager_insert_action_group (ui_manager, 
-		action_group, 
+	gtk_ui_manager_insert_action_group (ui_manager,
+		action_group,
 		0); /* the position at which the group will be inserted */
-	gtk_ui_manager_add_ui_from_string (ui_manager,ui_desc_hostlist_table_popup, -1, &error); 
-	if (error != NULL) 
-    { 
-        fprintf (stderr, "Warning: building hostlist table filter popup failed: %s\n", 
-                error->message); 
-        g_error_free (error); 
-        error = NULL; 
-    } 
+	gtk_ui_manager_add_ui_from_string (ui_manager,ui_desc_hostlist_table_popup, -1, &error);
+	if (error != NULL)
+    {
+        fprintf (stderr, "Warning: building hostlist table filter popup failed: %s\n",
+                error->message);
+        g_error_free (error);
+        error = NULL;
+    }
 	hl->menu = gtk_ui_manager_get_widget(ui_manager, "/HostlistTableFilterPopup");
 	g_signal_connect(hl->table, "button_press_event", G_CALLBACK(hostlist_show_popup_menu_cb), hl);
 }
@@ -746,12 +746,7 @@ draw_hostlist_table_data(hostlist_table *hl)
 
             get_hostlist_table_address(hl, host, entries);
             host->iter_valid = TRUE;
-#if GTK_CHECK_VERSION(2,6,0)
             gtk_list_store_insert_with_values( store , &host->iter, G_MAXINT,
-#else
-            gtk_list_store_append(store, &host->iter);
-            gtk_list_store_set (store, &host->iter,
-#endif
                   ADR_COLUMN,      entries[0],
                   PORT_COLUMN,     entries[1],
                   PACKETS_COLUMN,  host->tx_frames+host->rx_frames,
diff --git a/gtk/iax2_analysis.c b/gtk/iax2_analysis.c
index f6883bdf0b..a035de01f5 100644
--- a/gtk/iax2_analysis.c
+++ b/gtk/iax2_analysis.c
@@ -2052,9 +2052,7 @@ static void save_csv_as_cb(GtkWidget *bt _U_, gpointer data)
 					    GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
 					    GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 					    NULL);
-#if GTK_CHECK_VERSION(2,8,0)
 	gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(user_data->dlg.save_csv_as_w), TRUE);
-#endif
 	gtk_window_set_transient_for(GTK_WINDOW(user_data->dlg.save_csv_as_w),GTK_WINDOW(user_data->dlg.window));
 
 	/* Build our "extra widget" to be added to the file chooser widget */
@@ -2695,9 +2693,7 @@ static void save_voice_as_cb(GtkWidget *bt _U_, gpointer data)
 					    GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
 					    GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 					    NULL);
-#if GTK_CHECK_VERSION(2,8,0)
 	gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(user_data->dlg.save_voice_as_w), TRUE);
-#endif
 	gtk_window_set_transient_for(GTK_WINDOW(user_data->dlg.save_voice_as_w),GTK_WINDOW(user_data->dlg.window));
 
 	/* Container for each row of widgets */
@@ -2886,7 +2882,6 @@ static void add_to_list(GtkWidget *list, user_data_t * user_data, guint32 number
 	 * :
 	 * should generally be preferred when inserting rows in a sorted list store.
 	 */
-#if GTK_CHECK_VERSION(2,6,0)
 	gtk_list_store_insert_with_values( list_store , &user_data->dlg.iter, G_MAXINT,
 			     PACKET_COLUMN, number,
 			     DELTA_COLUMN, delta,
@@ -2899,20 +2894,6 @@ static void add_to_list(GtkWidget *list, user_data_t * user_data, guint32 number
 			     BACKGROUND_COLOR_COL, (char *)color_str,
 			     -1);
 
-#else
-	gtk_list_store_append  (list_store, &user_data->dlg.iter);
-	gtk_list_store_set  (list_store, &user_data->dlg.iter,
-			     PACKET_COLUMN, number,
-			     DELTA_COLUMN, delta,
-			     JITTER_COLUMN, jitter,
-			     IPBW_COLUMN, bandwidth,
-			     STATUS_COLUMN, (char *)status,
-			     DATE_COLUMN,  (char *)timeStr,
-			     LENGTH_COLUMN,	pkt_len,
-			     FOREGROUND_COLOR_COL, NULL,
-			     BACKGROUND_COLOR_COL, (char *)color_str,
-			     -1);
-#endif
 	if(flags & STAT_FLAG_FIRST){
 		/* Set first row as active */
 		gtk_tree_selection_select_iter(gtk_tree_view_get_selection(GTK_TREE_VIEW(list)), &user_data->dlg.iter);
@@ -2986,10 +2967,8 @@ GtkWidget* create_list(user_data_t* user_data)
 	list_view = GTK_TREE_VIEW(list);
 	sortable = GTK_TREE_SORTABLE(list_store);
 
-#if GTK_CHECK_VERSION(2,6,0)
 	/* Speed up the list display */
 	gtk_tree_view_set_fixed_height_mode(list_view, TRUE);
-#endif
 
 	/* Setup the sortable columns */
 	gtk_tree_sortable_set_sort_column_id(sortable, PACKET_COLUMN, GTK_SORT_ASCENDING);
diff --git a/gtk/io_stat.c b/gtk/io_stat.c
index 1e7fa7ce66..e96cd0e06f 100644
--- a/gtk/io_stat.c
+++ b/gtk/io_stat.c
@@ -1373,9 +1373,7 @@ draw_area_configure_event(GtkWidget *widget, GdkEventConfigure *event _U_, gpoin
 {
 	io_stat_t *io = user_data;
 	int i;
-#if GTK_CHECK_VERSION(2,6,0)
 	GtkWidget *save_bt;
-#endif
 
 	if(io->pixmap){
 		gdk_pixmap_unref(io->pixmap);
@@ -1389,11 +1387,9 @@ draw_area_configure_event(GtkWidget *widget, GdkEventConfigure *event _U_, gpoin
 	io->pixmap_width=widget->allocation.width;
 	io->pixmap_height=widget->allocation.height;
 
-#if GTK_CHECK_VERSION(2,6,0)
 	save_bt = g_object_get_data(G_OBJECT(io->window), "save_bt");
 	g_object_set_data(G_OBJECT(save_bt), "pixmap", io->pixmap);
 	gtk_widget_set_sensitive(save_bt, TRUE);
-#endif
 
 	gdk_draw_rectangle(io->pixmap,
 			widget->style->white_gc,
@@ -2147,14 +2143,8 @@ init_io_stat_window(io_stat_t *io)
 	GtkWidget *hbox;
 	GtkWidget *bbox;
 	GtkWidget *close_bt, *help_bt;
-#if GTK_CHECK_VERSION(2,12,0)
-#else
-	GtkTooltips *tooltips = gtk_tooltips_new();
-#endif
 	GtkWidget *copy_bt;
-#if GTK_CHECK_VERSION(2,6,0)
 	GtkWidget *save_bt;
-#endif
 
 	/* create the main window, transient_for top_level */
 	io->window = dlg_window_new("I/O Graphs");
@@ -2177,51 +2167,27 @@ init_io_stat_window(io_stat_t *io)
 
 	io_stat_set_title(io);
 
-#if GTK_CHECK_VERSION(2,6,0)
 	bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_SAVE,
 				  GTK_STOCK_COPY, GTK_STOCK_HELP, NULL);
-#else
-	bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_COPY,
-				  GTK_STOCK_HELP, NULL);
-#endif
 	gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
 	gtk_widget_show(bbox);
 
 	close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
 	window_set_cancel_button(io->window, close_bt, window_cancel_button_cb);
-#if GTK_CHECK_VERSION(2,12,0)
 	gtk_widget_set_tooltip_text(close_bt,  "Enter the hostname or host IP address to be used as a source for remote capture.");
-#else
-	gtk_tooltips_set_tip(tooltips, close_bt, "Close this dialog", NULL);
-#endif
-#if GTK_CHECK_VERSION(2,6,0)
 	save_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_SAVE);
 	gtk_widget_set_sensitive(save_bt, FALSE);
-#if GTK_CHECK_VERSION(2,12,0)
 	gtk_widget_set_tooltip_text(save_bt, "Save the displayed graph to a file");
-#else
-	gtk_tooltips_set_tip(tooltips, save_bt, "Save the displayed graph to a file", NULL);
-#endif
 	g_signal_connect(save_bt, "clicked", G_CALLBACK(pixmap_save_cb), NULL);
 	g_object_set_data(G_OBJECT(io->window), "save_bt", save_bt);
-#endif
 
 	copy_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_COPY);
-#if GTK_CHECK_VERSION(2,12,0)
 	gtk_widget_set_tooltip_text(copy_bt, "Copy values from selected graphs to the clipboard in CSV (Comma Separated Values) format");
-#else
-	gtk_tooltips_set_tip(tooltips, copy_bt,
-			     "Copy values from selected graphs to the clipboard in CSV (Comma Separated Values) format", NULL);
-#endif
 	g_signal_connect(copy_bt, "clicked", G_CALLBACK(copy_as_csv_cb), io);
 
 	help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
 	g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_STATS_IO_GRAPH_DIALOG);
-#if GTK_CHECK_VERSION(2,12,0)
 	gtk_widget_set_tooltip_text (help_bt, "Show topic specific help");
-#else
-	gtk_tooltips_set_tip (tooltips, help_bt, "Show topic specific help", NULL);
-#endif
 	g_signal_connect(io->window, "delete-event", G_CALLBACK(window_delete_event_cb), NULL);
 
 	gtk_widget_show(io->window);