Remaining GLIB_CHECK_VERSION and GTK_CHECK_VERSION in the gtk directory.

svn path=/trunk/; revision=37973

16 files changed, 29 insertions, 653 deletions

diff --git a/gtk/about_dlg.c b/gtk/about_dlg.c
index 8cb4a98e9c..012f3dad0a 100644
--- a/gtk/about_dlg.c
+++ b/gtk/about_dlg.c
@@ -566,4 +566,3 @@ about_wireshark_destroy_cb(GtkWidget *win _U_, gpointer user_data _U_)
   /* Note that we no longer have an "About Wireshark" dialog box. */
   about_wireshark_w = NULL;
 }
-
diff --git a/gtk/airpcap_gui_utils.c b/gtk/airpcap_gui_utils.c
index 8e46312ac7..40b56c6913 100644
--- a/gtk/airpcap_gui_utils.c
+++ b/gtk/airpcap_gui_utils.c
@@ -530,12 +530,12 @@ airpcap_get_selected_channel_offset(GtkWidget *channel_offset_cb) {
     int offset;
     gchar *off_str;
     int retval = 0;
-    
+
 
     if (channel_offset_cb == NULL || !GTK_WIDGET_SENSITIVE(channel_offset_cb)) {
         return 0;
     }
-    
+
     off_str = gtk_combo_box_get_active_text(GTK_COMBO_BOX(channel_offset_cb));
     if (off_str && (g_ascii_strcasecmp("", off_str)))
     {
@@ -633,13 +633,13 @@ airpcap_update_channel_offset_combo(airpcap_if_info_t* if_info, guint chan_freq,
 
     if (set) {
         change_airpcap_settings = TRUE;
-    
+
         if_info->channelInfo.ExtChannel = new_offset;
         if (!airpcap_update_frequency_and_offset(if_info)){
             simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"Adapter failed to be set with the following settings: Frequency - %d   Extension Channel - %d", if_info->channelInfo.Frequency, if_info->channelInfo.ExtChannel);
         }
     }
-    
+
     if (idx_count < 1) {
         gtk_widget_set_sensitive(channel_offset_cb, FALSE);
     }
@@ -674,13 +674,13 @@ airpcap_update_channel_combo(GtkWidget* channel_cb, airpcap_if_info_t* if_info)
         while (gtk_tree_model_iter_n_children(gtk_combo_box_get_model(GTK_COMBO_BOX(channel_cb)), NULL) > 0) {
             gtk_combo_box_remove_text(GTK_COMBO_BOX(channel_cb), 0);
         }
-        
+
         if (if_info != NULL && if_info->pSupportedChannels != NULL && if_info->numSupportedChannels > 0){
             guint i;
             for (i = 0; i<(if_info->numSupportedChannels); i++){
                 gtk_combo_box_append_text(GTK_COMBO_BOX(channel_cb), ieee80211_mhz_to_str(airpcap_if_selected->pSupportedChannels[i].Frequency));
             }
-        }    
+        }
 
         airpcap_channel_combo_set_by_frequency(channel_cb, if_info->channelInfo.Frequency);
         change_airpcap_settings = TRUE;
diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c
index d7718e8fc6..43ee6a7019 100644
--- a/gtk/capture_dlg.c
+++ b/gtk/capture_dlg.c
@@ -258,11 +258,6 @@ capture_filter_check_syntax_cb(GtkWidget *w _U_, gpointer user_data _U_)
   struct bpf_program fcode;
   GtkWidget *filter_cm, *filter_te;
   const gchar *filter_text;
-#if GTK_CHECK_VERSION(2,6,0)
-#else
-  GtkTreeIter   iter;
-  GtkTreeModel *model;
-#endif
 
   if (!prefs.capture_syntax_check_filter)
     return;
@@ -272,13 +267,7 @@ capture_filter_check_syntax_cb(GtkWidget *w _U_, gpointer user_data _U_)
 #if GTK_CHECK_VERSION(2,24,0)
   filter_text = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT(filter_cm));
 #else
-#if GTK_CHECK_VERSION(2,6,0)
   filter_text = gtk_combo_box_get_active_text (GTK_COMBO_BOX(filter_cm));
-#else
-  gtk_combo_box_get_active_iter(GTK_COMBO_BOX(filter_cm), &iter);
-  model = gtk_combo_box_get_model(GTK_COMBO_BOX(filter_cm));
-  gtk_tree_model_get(model, &iter, 0, &filter_text, -1);
-#endif
 #endif /*GTK_CHECK_VERSION(2,24,0)*/
   if (strlen(filter_text) == 0) {
     colorize_filter_te_as_empty(filter_te);
@@ -341,16 +330,7 @@ set_if_capabilities(gboolean monitor_mode_changed)
 #if GTK_CHECK_VERSION(2,24,0)
   entry_text = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT(if_cb));
 #else
-#if GTK_CHECK_VERSION(2,6,0)
   entry_text = gtk_combo_box_get_active_text (GTK_COMBO_BOX(if_cb));
-#else
-  GtkTreeModel *model;
-  GtkTreeIter iter;
-
-  gtk_combo_box_get_active_iter(GTK_COMBO_BOX(if_cb), &iter);
-  model = gtk_combo_box_get_model(GTK_COMBO_BOX(if_cb));
-  gtk_tree_model_get(model, &iter, 0, &entry_text, -1);
-#endif
 #endif /* GTK_CHECK_VERSION(2,24,0) */
 
   if(!entry_text)
@@ -556,9 +536,7 @@ set_if_capabilities(gboolean monitor_mode_changed)
     g_string_append(ip_str, "unknown");
   }
   gtk_label_set_text(GTK_LABEL(if_ip_lb), ip_str->str);
-#if GTK_CHECK_VERSION(2,6,0)
   gtk_label_set_ellipsize(GTK_LABEL(if_ip_lb), PANGO_ELLIPSIZE_MIDDLE);
-#endif
   g_string_free(ip_str, TRUE);
 }
 
@@ -786,20 +764,14 @@ static struct iftype_info iftype[] = {
   { CAPTURE_IFREMOTE, "Remote..." }
 };
 
-#if GTK_CHECK_VERSION(2,6,0)
 #define REMOTE_HOST_START ((sizeof(iftype) / sizeof(iftype[0])) + 1)
 #define REMOTE_HOST_SEPARATOR "---"
-#else
-#define REMOTE_HOST_START ((sizeof(iftype) / sizeof(iftype[0])))
-#endif
 
 static void
 iftype_combo_box_add_remote_separators (GtkWidget *iftype_cbx)
 {
-#if GTK_CHECK_VERSION(2,6,0)
   gtk_combo_box_append_text(GTK_COMBO_BOX(iftype_cbx), REMOTE_HOST_SEPARATOR);
   gtk_combo_box_append_text(GTK_COMBO_BOX(iftype_cbx), REMOTE_HOST_SEPARATOR);
-#endif
   gtk_combo_box_append_text(GTK_COMBO_BOX(iftype_cbx), "Clear list");
 }
 
@@ -905,7 +877,6 @@ iftype_combo_box_new(void)
   return iftype_cbx;
 }
 
-#if GTK_CHECK_VERSION(2,6,0)
 static gboolean
 iftype_combo_is_separator (GtkTreeModel *model, GtkTreeIter *iter, gpointer data _U_)
 {
@@ -921,7 +892,6 @@ iftype_combo_is_separator (GtkTreeModel *model, GtkTreeIter *iter, gpointer data
   return result;
 
 }
-#endif
 
 static void
 error_list_remote_interface_cb (gpointer dialog _U_, gint btn _U_, gpointer data)
@@ -1129,9 +1099,6 @@ capture_remote_cb(GtkWidget *w, gboolean focus_username)
               *user_lb, *user_te, *passwd_lb, *passwd_te,
               *bbox, *ok_bt, *cancel_bt;
   gchar       *title;
-#if !GTK_CHECK_VERSION(2,12,0)
-  GtkTooltips *tooltips = gtk_tooltips_new();
-#endif
   GSList      *auth_group;
   interface_options interface_opts;
 
@@ -1163,13 +1130,7 @@ capture_remote_cb(GtkWidget *w, gboolean focus_username)
   gtk_table_attach_defaults(GTK_TABLE(host_tb), host_lb, 0, 1, 0, 1);
 
   host_te = gtk_entry_new();
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(host_te,  "Enter the hostname or host IP address to be used as a source for remote capture.");
-#else
-  gtk_tooltips_set_tip(tooltips, host_te,
-                       "Enter the hostname or host IP address to be used as a source "
-                       "for remote capture.", NULL);
-#endif
   gtk_table_attach_defaults(GTK_TABLE(host_tb), host_te, 1, 2, 0, 1);
   interface_opts = g_array_index(global_capture_opts.ifaces, interface_options, 0);
   if (interface_opts.remote_host != NULL)
@@ -1180,14 +1141,8 @@ capture_remote_cb(GtkWidget *w, gboolean focus_username)
   gtk_table_attach_defaults(GTK_TABLE(host_tb), port_lb, 0, 1, 1, 2);
 
   port_te = gtk_entry_new();
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(port_te, "Enter the TCP port number used by RPCAP server at remote host "
                               "(leave it empty for default port number).");
-#else
-  gtk_tooltips_set_tip(tooltips, port_te,
-                       "Enter the TCP port number used by RPCAP server at remote host "
-                       "(leave it empty for default port number).", NULL);
-#endif
   gtk_table_attach_defaults(GTK_TABLE(host_tb), port_te, 1, 2, 1, 2);
   if (interface_opts.remote_port != NULL)
     gtk_entry_set_text(GTK_ENTRY(port_te), interface_opts.remote_port);
@@ -1239,23 +1194,12 @@ capture_remote_cb(GtkWidget *w, gboolean focus_username)
 
   ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK);
   g_signal_connect(ok_bt, "clicked", G_CALLBACK(capture_remote_ok_cb), remote_w);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(ok_bt,
                        "Accept remote host parameters and lookup "
                        "remote interfaces.");
-#else
-  gtk_tooltips_set_tip(tooltips, ok_bt,
-                       "Accept remote host parameters and lookup "
-                       "remote interfaces.", NULL);
-#endif
 
   cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(cancel_bt, "Cancel and exit dialog.");
-#else
-  gtk_tooltips_set_tip(tooltips, cancel_bt,
-                       "Cancel and exit dialog.", NULL);
-#endif
   window_set_cancel_button(remote_w, cancel_bt, capture_remote_cancel_cb);
 
   if (focus_username) {
@@ -1379,9 +1323,6 @@ options_remote_cb(GtkWidget *w _U_, gpointer d _U_)
 {
   GtkWidget *opt_remote_w, *main_vb;
   GtkWidget   *caller, *bbox, *ok_bt, *cancel_bt;
-#if !GTK_CHECK_VERSION(2,12,0)
-  GtkTooltips *tooltips;
-#endif
   GtkWidget     *capture_fr, *capture_vb;
   GtkWidget     *nocap_rpcap_cb, *datatx_udp_cb;
 #ifdef HAVE_PCAP_SETSAMPLING
@@ -1404,9 +1345,6 @@ options_remote_cb(GtkWidget *w _U_, gpointer d _U_)
   g_object_set_data(G_OBJECT(opt_remote_w), E_OPT_REMOTE_CALLER_PTR_KEY, caller);
   g_object_set_data(G_OBJECT(caller), E_OPT_REMOTE_DIALOG_PTR_KEY, opt_remote_w);
 
-#if !GTK_CHECK_VERSION(2,12,0)
-  tooltips = gtk_tooltips_new();
-#endif
   main_vb = gtk_vbox_new(FALSE, 0);
   gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5);
   gtk_container_add(GTK_CONTAINER(opt_remote_w), main_vb);
@@ -1499,19 +1437,9 @@ options_remote_cb(GtkWidget *w _U_, gpointer d _U_)
 
   ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK);
   g_signal_connect(ok_bt, "clicked", G_CALLBACK(options_remote_ok_cb), opt_remote_w);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(ok_bt, "Accept parameters and close dialog");
-#else
-  gtk_tooltips_set_tip(tooltips, ok_bt,
-                       "Accept parameters and close dialog.", NULL);
-#endif
   cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(cancel_bt, "Cancel and exit dialog.");
-#else 
-  gtk_tooltips_set_tip(tooltips, cancel_bt,
-                         "Cancel and exit dialog.", NULL);
-#endif
   window_set_cancel_button(opt_remote_w, cancel_bt, window_cancel_button_cb);
 
   gtk_widget_grab_default(ok_bt);
@@ -1623,11 +1551,6 @@ capture_filter_compile_cb(GtkWidget *w _U_, gpointer user_data _U_)
 
   GtkWidget *filter_cm;
   const gchar *filter_text;
-#if GTK_CHECK_VERSION(2,6,0)
-#else
-  GtkTreeIter   iter;
-  GtkTreeModel *model;
-#endif
 
   pd = pcap_open_dead(g_array_index(global_capture_opts.ifaces, interface_options, 0).linktype, DUMMY_SNAPLENGTH);
 
@@ -1635,13 +1558,7 @@ capture_filter_compile_cb(GtkWidget *w _U_, gpointer user_data _U_)
 #if GTK_CHECK_VERSION(2,24,0)
   filter_text = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT(filter_cm));
 #else
-#if GTK_CHECK_VERSION(2,6,0)
   filter_text = gtk_combo_box_get_active_text (GTK_COMBO_BOX(filter_cm));
-#else
-  gtk_combo_box_get_active_iter(GTK_COMBO_BOX(filter_cm), &iter);
-  model = gtk_combo_box_get_model(GTK_COMBO_BOX(filter_cm));
-  gtk_tree_model_get(model, &iter, 0, &filter_text, -1);
-#endif
 #endif /* GTK_CHECK_VERSION(2,24,0) */
   /* pcap_compile will not alter the filter string, so the (char *) cast is "safe" */
 #ifdef PCAP_NETMASK_UNKNOWN
@@ -1759,9 +1676,6 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
   GtkWidget     *iftype_cbx;
   GtkWidget     *remote_bt;
 #endif
-#if !GTK_CHECK_VERSION(2,12,0)
-  GtkTooltips   *tooltips = gtk_tooltips_new();
-#endif
   GtkAdjustment *snap_adj, *ringbuffer_nbf_adj,
                 *stop_packets_adj, *stop_filesize_adj, *stop_duration_adj, *stop_files_adj,
                 *ring_filesize_adj, *file_duration_adj;
@@ -1926,17 +1840,10 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
   }
 
   iftype_cbx = iftype_combo_box_new();
-#if GTK_CHECK_VERSION(2,6,0)
   gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (iftype_cbx),
                                         iftype_combo_is_separator, NULL, NULL);
-#endif
   g_object_set_data(G_OBJECT(cap_open_w), E_CAP_IFTYPE_CBX_KEY, iftype_cbx);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(iftype_cbx, "Choose to capture from local or remote interfaces.");
-#else
-  gtk_tooltips_set_tip(tooltips, iftype_cbx,
-                       "Choose to capture from local or remote interfaces.", NULL);
-#endif
   gtk_box_pack_start(GTK_BOX(if_hb), iftype_cbx, FALSE, FALSE, 0);
 #endif
 
@@ -2012,14 +1919,8 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
   if (interface_opts.src_type == CAPTURE_IFLOCAL)
 #endif
   free_interface_list(if_list);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(if_cb,
 "Choose which interface (network adapter) will be used to capture packets from. Be sure to select the correct one, as it's a common mistake to select the wrong interface.");
-#else
-  gtk_tooltips_set_tip(tooltips, if_cb,
-    "Choose which interface (network adapter) will be used to capture packets from. "
-    "Be sure to select the correct one, as it's a common mistake to select the wrong interface.", NULL);
-#endif
   gtk_box_pack_start(GTK_BOX(if_hb), if_cb, TRUE, TRUE, 3);
 
   if_ip_hb = gtk_hbox_new(FALSE, 3);
@@ -2028,20 +1929,11 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
   if_ip_eb = gtk_event_box_new();
   gtk_event_box_set_visible_window (GTK_EVENT_BOX(if_ip_eb), FALSE);
   gtk_box_pack_start(GTK_BOX(if_ip_hb), if_ip_eb, TRUE, TRUE, 3);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(if_ip_eb, "Lists the IP address(es) "
                        "assigned to the selected interface.  If there are "
                        "more addresses than will fit in the window, the "
                        "first few and the last few will be shown with \"...\" "
                        "between them.");
-#else
-  gtk_tooltips_set_tip(tooltips, if_ip_eb, "Lists the IP address(es) "
-                       "assigned to the selected interface.  If there are "
-                       "more addresses than will fit in the window, the "
-                       "first few and the last few will be shown with \"...\" "
-                       "between them.",
-                       NULL);
-#endif
 
   if_ip_lb = gtk_label_new("");
   gtk_misc_set_alignment(GTK_MISC(if_ip_lb), 0, 0); /* Left justified */
@@ -2094,12 +1986,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
    *
    * We leave it as "multiple link-layer types" for now.
    */
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(linktype_combo_box, "The selected interface supports multiple link-layer types; select the desired one.");
-#else
-  gtk_tooltips_set_tip(tooltips, linktype_combo_box,
-    "The selected interface supports multiple link-layer types; select the desired one.", NULL);
-#endif
   gtk_box_pack_start (GTK_BOX(linktype_hb), linktype_combo_box, FALSE, FALSE, 0);
   g_object_set_data(G_OBJECT(cap_open_w), E_CAP_LT_CBX_KEY, linktype_combo_box);
   g_signal_connect(GTK_COMBO_BOX(if_cb), "changed",
@@ -2110,17 +1997,10 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
       "Capture packets in _promiscuous mode");
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(promisc_cb),
                                interface_opts.promisc_mode);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(promisc_cb,
     "Usually a network adapter will only capture the traffic sent to its own network address. "
     "If you want to capture all traffic that the network adapter can \"see\", mark this option. "
     "See the FAQ for some more details of capturing packets from a switched network.");
-#else
-  gtk_tooltips_set_tip(tooltips, promisc_cb,
-    "Usually a network adapter will only capture the traffic sent to its own network address. "
-    "If you want to capture all traffic that the network adapter can \"see\", mark this option. "
-    "See the FAQ for some more details of capturing packets from a switched network.", NULL);
-#endif
   gtk_container_add(GTK_CONTAINER(left_vb), promisc_cb);
 
 #ifdef HAVE_PCAP_CREATE
@@ -2132,21 +2012,12 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
   g_signal_connect(monitor_cb, "toggled",
                    G_CALLBACK(capture_prep_monitor_changed_cb), NULL);
 
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(monitor_cb,
     "Usually a Wi-Fi adapter will, even in promiscuous mode, only capture the traffic on the BSS to which it's associated. "
     "If you want to capture all traffic that the Wi-Fi adapter can \"receive\", mark this option. "
     "In order to see IEEE 802.11 headers or to see radio information for captured packets,"
     "it might be necessary to turn this option on.\n\n"
     "Note that, in monitor mode, the adapter might disassociate from the network to which it's associated.");
-#else
-  gtk_tooltips_set_tip(tooltips, monitor_cb,
-    "Usually a Wi-Fi adapter will, even in promiscuous mode, only capture the traffic on the BSS to which it's associated. "
-    "If you want to capture all traffic that the Wi-Fi adapter can \"receive\", mark this option. "
-    "In order to see IEEE 802.11 headers or to see radio information for captured packets,"
-    "it might be necessary to turn this option on.\n\n"
-    "Note that, in monitor mode, the adapter might disassociate from the network to which it's associated.", NULL);
-#endif
   gtk_container_add(GTK_CONTAINER(left_vb), monitor_cb);
 
   /*
@@ -2170,12 +2041,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
   /* Pcap-NG row */
   pcap_ng_cb = gtk_check_button_new_with_mnemonic("Capture packets in pcap-ng format");
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pcap_ng_cb), global_capture_opts.use_pcapng);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(pcap_ng_cb, "Capture packets in the next-generation capture file format.");
-#else
-  gtk_tooltips_set_tip(tooltips, pcap_ng_cb, "Capture packets in the next-generation capture file format.",
-                       NULL);
-#endif
   gtk_container_add(GTK_CONTAINER(left_vb), pcap_ng_cb);
 
   /* Capture length row */
@@ -2186,15 +2052,9 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(snap_cb),
                                interface_opts.has_snaplen);
   g_signal_connect(snap_cb, "toggled", G_CALLBACK(capture_prep_adjust_sensitivity), cap_open_w);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(snap_cb,
     "Limit the maximum number of bytes to be captured from each packet. This size includes the "
     "link-layer header and all subsequent headers. ");
-#else
-  gtk_tooltips_set_tip(tooltips, snap_cb,
-    "Limit the maximum number of bytes to be captured from each packet. This size includes the "
-    "link-layer header and all subsequent headers. ", NULL);
-#endif
   gtk_box_pack_start(GTK_BOX(snap_hb), snap_cb, FALSE, FALSE, 0);
 
   snap_adj = (GtkAdjustment *) gtk_adjustment_new((gfloat) interface_opts.snaplen,
@@ -2215,17 +2075,10 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
   filter_bt = gtk_button_new_from_stock(WIRESHARK_STOCK_CAPTURE_FILTER_ENTRY);
   g_signal_connect(filter_bt, "clicked", G_CALLBACK(capture_filter_construct_cb), NULL);
   g_signal_connect(filter_bt, "destroy", G_CALLBACK(filter_button_destroy_cb), NULL);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(filter_bt,
     "Select a capture filter to reduce the amount of packets to be captured. "
     "See \"Capture Filters\" in the online help for further information how to use it."
     );
-#else
-  gtk_tooltips_set_tip(tooltips, filter_bt,
-    "Select a capture filter to reduce the amount of packets to be captured. "
-    "See \"Capture Filters\" in the online help for further information how to use it.",
-    NULL);
-#endif
   gtk_box_pack_start(GTK_BOX(filter_hb), filter_bt, FALSE, FALSE, 3);
 
   /* Create the capture filter combo box*/
@@ -2256,19 +2109,11 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
 #else
     gtk_combo_box_prepend_text(GTK_COMBO_BOX(filter_cm), g_array_index(global_capture_opts.ifaces, interface_options, 0).cfilter);
 #endif
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(filter_cm,
     "Enter a capture filter to reduce the amount of packets to be captured. "
     "See \"Capture Filters\" in the online help for further information how to use it. "
     "Syntax checking can be disabled in Preferences -> Capture -> Syntax check capture filter."
     );
-#else
-  gtk_tooltips_set_tip(tooltips, filter_cm,
-    "Enter a capture filter to reduce the amount of packets to be captured. "
-    "See \"Capture Filters\" in the online help for further information how to use it."
-    "Syntax checking can be disabled in Preferences -> Capture -> Syntax check capture filter.",
-    NULL);
-#endif
   gtk_box_pack_start(GTK_BOX(filter_hb), filter_cm, TRUE, TRUE, 3);
 
   /* let an eventually capture filters dialog know the text entry to fill in */
@@ -2277,14 +2122,8 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
 #if defined(HAVE_PCAP_OPEN_DEAD) && defined(HAVE_BPF_IMAGE)
   compile_bt = gtk_button_new_with_label("Compile BPF");
   g_signal_connect(compile_bt, "clicked", G_CALLBACK(capture_filter_compile_cb), NULL);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(compile_bt,
    "Compile the capture filter expression and show the BPF (Berkeley Packet Filter) code.");
-#else /* GTK_CHECK_VERSION(2,12,0) */
-  gtk_tooltips_set_tip(tooltips, compile_bt,
-    "Compile the capture filter expression and show the BPF (Berkeley Packet Filter) code.",
-    NULL);
-#endif /* GTK_CHECK_VERSION(2,12,0) */
   gtk_box_pack_start(GTK_BOX(filter_hb), compile_bt, FALSE, FALSE, 3);
 #endif
 
@@ -2309,11 +2148,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
 
 #ifdef HAVE_PCAP_REMOTE
   remote_bt = gtk_button_new_with_label("Remote Settings");
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(remote_bt, "Various settings for remote capture.");
-#else
-  gtk_tooltips_set_tip(tooltips, remote_bt, "Various settings for remote capture.", NULL);
-#endif
 
   /* Both the callback and the data are global */
   g_signal_connect(remote_bt,"clicked", G_CALLBACK(options_remote_cb),NULL);
@@ -2340,13 +2175,8 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
   gtk_spin_button_set_value(GTK_SPIN_BUTTON (buffer_size_sb), (gfloat) interface_opts.buffer_size);
   gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (buffer_size_sb), TRUE);
   gtk_widget_set_size_request(buffer_size_sb, 80, -1);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(buffer_size_sb,
    "The memory buffer size used while capturing. If you notice packet drops, you can try to increase this size.");
-#else
-  gtk_tooltips_set_tip(tooltips, buffer_size_sb,
-    "The memory buffer size used while capturing. If you notice packet drops, you can try to increase this size.", NULL);
-#endif
   gtk_box_pack_start (GTK_BOX(buffer_size_hb), buffer_size_sb, FALSE, FALSE, 0);
 
   buffer_size_lb = gtk_label_new("megabyte(s)");
@@ -2382,31 +2212,17 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
   gtk_box_pack_start(GTK_BOX(file_hb), file_lb, FALSE, FALSE, 3);
 
   file_te = gtk_entry_new();
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(file_te,
     "Enter the file name to which captured data will be written. "
     "If you don't enter something here, a temporary file will be used."
      );
-#else
-  gtk_tooltips_set_tip(tooltips, file_te,
-    "Enter the file name to which captured data will be written. "
-    "If you don't enter something here, a temporary file will be used.",
-    NULL);
-#endif
   gtk_box_pack_start(GTK_BOX(file_hb), file_te, TRUE, TRUE, 3);
 
   file_bt = gtk_button_new_from_stock(WIRESHARK_STOCK_BROWSE);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(file_bt,
     "Select a file to which captured data will be written, "
     "instead of entering the file name directly. "
     );
-#else
-  gtk_tooltips_set_tip(tooltips, file_bt,
-    "Select a file to which captured data will be written, "
-    "instead of entering the file name directly. ",
-    NULL);
-#endif
   gtk_box_pack_start(GTK_BOX(file_hb), file_bt, FALSE, FALSE, 0);
 
   g_signal_connect(file_bt, "clicked", G_CALLBACK(capture_prep_file_cb), file_te);
@@ -2424,15 +2240,9 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
                                global_capture_opts.multi_files_on);
   g_signal_connect(multi_files_on_cb, "toggled", G_CALLBACK(capture_prep_adjust_sensitivity),
                  cap_open_w);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(multi_files_on_cb,
     "Instead of using a single capture file, multiple files will be created. "
     "The generated file names will contain an incrementing number and the start time of the capture.");
-#else
-  gtk_tooltips_set_tip(tooltips, multi_files_on_cb,
-    "Instead of using a single capture file, multiple files will be created. "
-    "The generated file names will contain an incrementing number and the start time of the capture.", NULL);
-#endif
   gtk_table_attach_defaults(GTK_TABLE(multi_tb), multi_files_on_cb, 0, 1, row, row+1);
   row++;
 
@@ -2441,16 +2251,9 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
   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);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(ring_filesize_cb,
     "If the selected file size is exceeded, capturing switches to the next file.\n"
     "PLEASE NOTE: at least one of the \"Next file every\" options MUST be selected.");
-#else
-  gtk_tooltips_set_tip(tooltips, ring_filesize_cb,
-    "If the selected file size is exceeded, capturing switches to the next file.\n"
-    "PLEASE NOTE: at least one of the \"Next file every\" options MUST be selected.",
-    NULL);
-#endif
   gtk_table_attach_defaults(GTK_TABLE(multi_tb), ring_filesize_cb, 0, 1, row, row+1);
 
   ring_filesize_adj = (GtkAdjustment *) gtk_adjustment_new(0.0,
@@ -2474,16 +2277,9 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
                                global_capture_opts.has_file_duration);
   g_signal_connect(file_duration_cb, "toggled",
                    G_CALLBACK(capture_prep_adjust_sensitivity), cap_open_w);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(file_duration_cb,
     "If the selected duration is exceeded, capturing switches to the next file.\n"
     "PLEASE NOTE: at least one of the \"Next file every\" options MUST be selected.");
-#else
-  gtk_tooltips_set_tip(tooltips, file_duration_cb,
-    "If the selected duration is exceeded, capturing switches to the next file.\n"
-    "PLEASE NOTE: at least one of the \"Next file every\" options MUST be selected.",
-    NULL);
-#endif
   gtk_table_attach_defaults(GTK_TABLE(multi_tb), file_duration_cb, 0, 1, row, row+1);
 
   file_duration_adj = (GtkAdjustment *)gtk_adjustment_new(0.0,
@@ -2505,17 +2301,10 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
   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);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(ringbuffer_nbf_cb,
     "After capturing has switched to the next file and the given number of files has exceeded, "
     "the oldest file will be removed."
     );
-#else
-  gtk_tooltips_set_tip(tooltips, ringbuffer_nbf_cb,
-    "After capturing has switched to the next file and the given number of files has exceeded, "
-    "the oldest file will be removed.",
-    NULL);
-#endif
   gtk_table_attach_defaults(GTK_TABLE(multi_tb), ringbuffer_nbf_cb, 0, 1, row, row+1);
 
   ringbuffer_nbf_adj = (GtkAdjustment *) gtk_adjustment_new((gfloat) global_capture_opts.ring_num_files,
@@ -2536,12 +2325,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
   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);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(stop_files_cb, "Stop capturing after the given number of \"file switches\" have been done.");
-#else
-  gtk_tooltips_set_tip(tooltips, stop_files_cb,
-    "Stop capturing after the given number of \"file switches\" have been done.", NULL);
-#endif
   gtk_table_attach_defaults(GTK_TABLE(multi_tb), stop_files_cb, 0, 1, row, row+1);
 
   stop_files_adj = (GtkAdjustment *) gtk_adjustment_new((gfloat)global_capture_opts.autostop_files,
@@ -2576,12 +2360,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
   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);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(stop_packets_cb, "Stop capturing after the given number of packets have been captured.");
-#else
-  gtk_tooltips_set_tip(tooltips, stop_packets_cb,
-    "Stop capturing after the given number of packets have been captured.", NULL);
-#endif
   gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_packets_cb, 0, 1, row, row+1);
 
   stop_packets_adj = (GtkAdjustment *) gtk_adjustment_new((gfloat)global_capture_opts.autostop_packets,
@@ -2601,12 +2380,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
   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);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(stop_filesize_cb, "Stop capturing after the given amount of capture data has been captured.");
-#else
-  gtk_tooltips_set_tip(tooltips, stop_filesize_cb,
-    "Stop capturing after the given amount of capture data has been captured.", NULL);
-#endif
   gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_filesize_cb, 0, 1, row, row+1);
 
   stop_filesize_adj = (GtkAdjustment *) gtk_adjustment_new(0.0,
@@ -2629,12 +2403,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
   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);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(stop_duration_cb, "Stop capturing after the given time is exceeded.");
-#else
-  gtk_tooltips_set_tip(tooltips, stop_duration_cb,
-    "Stop capturing after the given time is exceeded.", NULL);
-#endif
   gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_duration_cb, 0, 1, row, row+1);
 
   stop_duration_adj = (GtkAdjustment *) gtk_adjustment_new(0.0,
@@ -2665,40 +2434,23 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
   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);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(sync_cb,
     "Using this option will show the captured packets immediately on the main screen. "
     "Please note: this will slow down capturing, so increased packet drops might appear.");
-#else
-  gtk_tooltips_set_tip(tooltips, sync_cb,
-    "Using this option will show the captured packets immediately on the main screen. "
-    "Please note: this will slow down capturing, so increased packet drops might appear.", NULL);
-#endif
   gtk_container_add(GTK_CONTAINER(display_vb), sync_cb);
 
   /* "Auto-scroll live update" row */
   auto_scroll_cb = gtk_check_button_new_with_mnemonic("_Automatic scrolling in live capture");
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(auto_scroll_cb), auto_scroll_live);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(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.");
-#else
-  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);
-#endif
   gtk_container_add(GTK_CONTAINER(display_vb), auto_scroll_cb);
 
   /* "Hide capture info" row */
   hide_info_cb = gtk_check_button_new_with_mnemonic("_Hide capture info dialog");
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(hide_info_cb), !global_capture_opts.show_info);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(hide_info_cb, "Hide the capture info dialog while capturing.");
-#else
-  gtk_tooltips_set_tip(tooltips, hide_info_cb,
-    "Hide the capture info dialog while capturing.", NULL);
-#endif
   gtk_container_add(GTK_CONTAINER(display_vb), hide_info_cb);
 
   /* Name Resolution frame */
@@ -2713,37 +2465,22 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
                 "Enable _MAC name resolution");
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_resolv_cb),
                 gbl_resolv_flags & RESOLV_MAC);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(m_resolv_cb, "Perform MAC layer name resolution while capturing.");
-#else
-  gtk_tooltips_set_tip(tooltips, m_resolv_cb,
-    "Perform MAC layer name resolution while capturing.", NULL);
-#endif
   gtk_container_add(GTK_CONTAINER(resolv_vb), m_resolv_cb);
 
   n_resolv_cb = gtk_check_button_new_with_mnemonic(
                 "Enable _network name resolution");
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(n_resolv_cb),
                 gbl_resolv_flags & RESOLV_NETWORK);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(n_resolv_cb, "Perform network layer name resolution while capturing.");
-#else
-  gtk_tooltips_set_tip(tooltips, n_resolv_cb,
-    "Perform network layer name resolution while capturing.", NULL);
-#endif
   gtk_container_add(GTK_CONTAINER(resolv_vb), n_resolv_cb);
 
   t_resolv_cb = gtk_check_button_new_with_mnemonic(
                 "Enable _transport name resolution");
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(t_resolv_cb),
                 gbl_resolv_flags & RESOLV_TRANSPORT);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(t_resolv_cb,
     "Perform transport layer name resolution while capturing.");
-#else
-  gtk_tooltips_set_tip(tooltips, t_resolv_cb,
-    "Perform transport layer name resolution while capturing.", NULL);
-#endif
   gtk_container_add(GTK_CONTAINER(resolv_vb), t_resolv_cb);
 
   /* Button row: "Start", "Cancel" and "Help" buttons */
@@ -2752,32 +2489,17 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
 
   ok_bt = g_object_get_data(G_OBJECT(bbox), WIRESHARK_STOCK_CAPTURE_START);
   g_signal_connect(ok_bt, "clicked", G_CALLBACK(capture_start_cb), NULL);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(ok_bt,
     "Start the capture process.");
-#else
-  gtk_tooltips_set_tip(tooltips, ok_bt,
-    "Start the capture process.", NULL);
-#endif
 
   cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(cancel_bt,
     "Cancel and exit dialog.");
-#else
-  gtk_tooltips_set_tip(tooltips, cancel_bt,
-    "Cancel and exit dialog.", NULL);
-#endif
   window_set_cancel_button(cap_open_w, cancel_bt, capture_cancel_cb);
 
   help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(help_bt,
     "Show help about capturing.");
-#else
-  gtk_tooltips_set_tip(tooltips, help_bt,
-    "Show help about capturing.", NULL);
-#endif
   g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_CAPTURE_OPTIONS_DIALOG);
 
   global_capture_opts.ifaces = g_array_remove_index(global_capture_opts.ifaces, 0);
@@ -3053,7 +2775,7 @@ capture_cancel_cb(GtkWidget *win, gpointer data)
 {
 #ifdef HAVE_PCAP_REMOTE
   interface_options interface_opts;
-  
+
   interface_opts = g_array_index(global_capture_opts.ifaces, interface_options, 0);
   global_capture_opts.ifaces = g_array_remove_index(global_capture_opts.ifaces, 0);
   if (g_hash_table_size (remote_host_list) == 0) {
@@ -3082,7 +2804,7 @@ select_link_type_cb(GtkWidget *linktype_combo_box, gpointer data _U_)
   gpointer  ptr;
   int       dlt;
   interface_options interface_opts;
-  
+
   interface_opts = g_array_index(global_capture_opts.ifaces, interface_options, 0);
   global_capture_opts.ifaces = g_array_remove_index(global_capture_opts.ifaces, 0);
 
@@ -3130,11 +2852,7 @@ select_if_type_cb(GtkComboBox *iftype_cbx, gpointer data _U_)
     capture_remote_cb(GTK_WIDGET(iftype_cbx), FALSE);
   } else if (new_iftype != old_iftype) {
     if (new_iftype > CAPTURE_IFREMOTE) {
-#if GTK_CHECK_VERSION(2,6,0)
       if (new_iftype == num_remote + 4)
-#else
-      if (new_iftype == num_remote + 2)
-#endif
       {
         /* The user selected the "Clear list" entry */
         new_iftype = CAPTURE_IFLOCAL;
@@ -3146,16 +2864,7 @@ select_if_type_cb(GtkComboBox *iftype_cbx, gpointer data _U_)
       } else {
         struct remote_host *rh;
         gchar *string;
-#if GTK_CHECK_VERSION(2,6,0)
         string = gtk_combo_box_get_active_text (GTK_COMBO_BOX(iftype_cbx));
-#else
-        GtkTreeModel *model;
-        GtkTreeIter iter;
-
-        model = gtk_combo_box_get_model(GTK_COMBO_BOX(iftype_cbx));
-        gtk_combo_box_get_active_iter(GTK_COMBO_BOX(iftype_cbx), &iter);
-        gtk_tree_model_get(model, &iter, 0, &string, -1);
-#endif
         rh = g_hash_table_lookup (remote_host_list, string);
         g_free (string);
 
@@ -3228,12 +2937,7 @@ capture_dlg_prep(gpointer parent_w) {
   gchar *cf_name;
   gchar *dirname;
   gint32 tmp;
-#if GTK_CHECK_VERSION(2,6,0)
-#else
-  GtkTreeIter   iter;
-  GtkTreeModel *model;
-#endif
-interface_options interface_opts;
+  interface_options interface_opts;
 
 if (global_capture_opts.ifaces->len > 0) {
   interface_opts = g_array_index(global_capture_opts.ifaces, interface_options, 0);
@@ -3286,13 +2990,7 @@ if (global_capture_opts.ifaces->len > 0) {
 #if GTK_CHECK_VERSION(2,24,0)
   entry_text = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT(if_cb));
 #else
-#if GTK_CHECK_VERSION(2,6,0)
   entry_text = gtk_combo_box_get_active_text (GTK_COMBO_BOX(if_cb));
-#else
-  gtk_combo_box_get_active_iter(GTK_COMBO_BOX(if_cb), &iter);
-  model = gtk_combo_box_get_model(GTK_COMBO_BOX(if_cb));
-  gtk_tree_model_get(model, &iter, 0, &entry_text, -1);
-#endif
 #endif /* GTK_CHECK_VERSION(2,24,0) */
   if(!entry_text)
     entry_text = '\0';
@@ -3357,13 +3055,7 @@ if (global_capture_opts.ifaces->len > 0) {
 #if GTK_CHECK_VERSION(2,24,0)
   filter_text = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT(filter_cm));
 #else
-#if GTK_CHECK_VERSION(2,6,0)
   filter_text = gtk_combo_box_get_active_text (GTK_COMBO_BOX(filter_cm));
-#else
-  gtk_combo_box_get_active_iter(GTK_COMBO_BOX(filter_cm), &iter);
-  model = gtk_combo_box_get_model(GTK_COMBO_BOX(filter_cm));
-  gtk_tree_model_get(model, &iter, 0, &filter_text, -1);
-#endif
 #endif /* GTK_CHECK_VERSION(2,24,0 */
   if (interface_opts.cfilter)
     g_free(interface_opts.cfilter);
diff --git a/gtk/capture_file_dlg.c b/gtk/capture_file_dlg.c
index 3832f1bebd..d1f17c8ebd 100644
--- a/gtk/capture_file_dlg.c
+++ b/gtk/capture_file_dlg.c
@@ -454,9 +454,6 @@ file_open_cmd(GtkWidget *w)
 #else /* _WIN32 */
   GtkWidget	*main_hb, *main_vb, *filter_hbox, *filter_bt, *filter_te,
   		*m_resolv_cb, *n_resolv_cb, *t_resolv_cb, *prev;
-#if !GTK_CHECK_VERSION(2,12,0)
-  GtkTooltips *tooltips = gtk_tooltips_new();
-#endif
   /* No Apply button, and "OK" just sets our text widget, it doesn't
      activate it (i.e., it doesn't cause us to try to open the file). */
   static construct_args_t args = {
@@ -522,12 +519,7 @@ file_open_cmd(GtkWidget *w)
                    G_CALLBACK(filter_button_destroy_cb), NULL);
   gtk_box_pack_start(GTK_BOX(filter_hbox), filter_bt, FALSE, TRUE, 0);
   gtk_widget_show(filter_bt);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(filter_bt, "Open the \"Display Filter\" dialog, to edit/apply filters");
-#else
-  gtk_tooltips_set_tip(tooltips, filter_bt,
-    "Open the \"Display Filter\" dialog, to edit/apply filters", NULL);
-#endif
 
   filter_te = gtk_entry_new();
   g_object_set_data(G_OBJECT(filter_bt), E_FILT_TE_PTR_KEY, filter_te);
@@ -539,11 +531,7 @@ file_open_cmd(GtkWidget *w)
   g_signal_connect(file_open_w, "key-press-event", G_CALLBACK (filter_parent_dlg_key_pressed_cb), NULL);
   colorize_filter_te_as_empty(filter_te);
   gtk_widget_show(filter_te);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(filter_te, "Enter a display filter.");
-#else
-  gtk_tooltips_set_tip(tooltips, filter_te, "Enter a display filter.", NULL);
-#endif
 
   g_object_set_data(G_OBJECT(file_open_w), E_RFILTER_TE_KEY, filter_te);
 
@@ -755,9 +743,6 @@ file_merge_cmd(GtkWidget *w)
   GtkWidget	*main_hb, *main_vb, *ft_hb, *ft_lb, *ft_combo_box, *filter_hbox,
 		*filter_bt, *filter_te, *prepend_rb, *chrono_rb,
 		*append_rb, *prev;
-#if !GTK_CHECK_VERSION(2,12,0)
-  GtkTooltips *tooltips = gtk_tooltips_new();
-#endif
   int combo_box_item_to_select;
   /* No Apply button, and "OK" just sets our text widget, it doesn't
      activate it (i.e., it doesn't cause us to try to open the file). */
@@ -843,12 +828,7 @@ file_merge_cmd(GtkWidget *w)
                    G_CALLBACK(filter_button_destroy_cb), NULL);
   gtk_box_pack_start(GTK_BOX(filter_hbox), filter_bt, FALSE, TRUE, 0);
   gtk_widget_show(filter_bt);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(filter_bt, "Open the \"Display Filter\" dialog, to edit/apply filters");
-#else
-  gtk_tooltips_set_tip(tooltips, filter_bt,
-    "Open the \"Display Filter\" dialog, to edit/apply filters", NULL);
-#endif
 
   filter_te = gtk_entry_new();
   g_object_set_data(G_OBJECT(filter_bt), E_FILT_TE_PTR_KEY, filter_te);
@@ -860,49 +840,27 @@ file_merge_cmd(GtkWidget *w)
   g_signal_connect(file_merge_w, "key-press-event", G_CALLBACK (filter_parent_dlg_key_pressed_cb), NULL);
   colorize_filter_te_as_empty(filter_te);
   gtk_widget_show(filter_te);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(filter_te, "Enter a display filter.");
-#else
-  gtk_tooltips_set_tip(tooltips, filter_te, "Enter a display filter.", NULL);
-#endif
 
   g_object_set_data(G_OBJECT(file_merge_w), E_RFILTER_TE_KEY, filter_te);
 
   prepend_rb = gtk_radio_button_new_with_mnemonic_from_widget(NULL,
       "Prepend packets to existing file");
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(prepend_rb, "The resulting file contains the packets from the selected, followed by the packets from the currently loaded file, the packet timestamps will be ignored.");
-#else
-  gtk_tooltips_set_tip(tooltips, prepend_rb,
-      "The resulting file contains the packets from the selected, followed by the packets from the currently loaded file,"
-      " the packet timestamps will be ignored.", NULL);
-#endif
   gtk_box_pack_start(GTK_BOX(main_vb), prepend_rb, FALSE, FALSE, 0);
   g_object_set_data(G_OBJECT(file_merge_w),
                   E_MERGE_PREPEND_KEY, prepend_rb);
   gtk_widget_show(prepend_rb);
 
   chrono_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(prepend_rb), "Merge packets chronologically");
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(chrono_rb, "The resulting file contains all the packets from the currently loaded and the selected file, sorted by the packet timestamps.");
-#else
-  gtk_tooltips_set_tip(tooltips, chrono_rb,
-      "The resulting file contains all the packets from the currently loaded and the selected file,"
-      " sorted by the packet timestamps.", NULL);
-#endif
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chrono_rb), TRUE);
   gtk_box_pack_start(GTK_BOX(main_vb), chrono_rb, FALSE, FALSE, 0);
   gtk_widget_show(chrono_rb);
   g_object_set_data(G_OBJECT(file_merge_w), E_MERGE_CHRONO_KEY, chrono_rb);
 
   append_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(prepend_rb), "Append packets to existing file");
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(append_rb, "The resulting file contains the packets from the currently loaded, followed by the packets from the selected file, the packet timestamps will be ignored.");
-#else
-  gtk_tooltips_set_tip(tooltips, append_rb,
-      "The resulting file contains the packets from the currently loaded, followed by the packets from the selected file,"
-      " the packet timestamps will be ignored.", NULL);
-#endif
   gtk_box_pack_start(GTK_BOX(main_vb), append_rb, FALSE, FALSE, 0);
   gtk_widget_show(append_rb);
   g_object_set_data(G_OBJECT(file_merge_w), E_MERGE_APPEND_KEY, append_rb);
diff --git a/gtk/capture_if_dlg.c b/gtk/capture_if_dlg.c
index 9c7e78915d..dd48920ea9 100644
--- a/gtk/capture_if_dlg.c
+++ b/gtk/capture_if_dlg.c
@@ -274,7 +274,7 @@ capture_prepare_cb(GtkWidget *prepare_bt _U_, gpointer if_data _U_)
   for (ifs = 0; (curr = g_list_nth(if_data_list, ifs)); ifs++) {
     temp = (if_dlg_data_t *)(curr->data);
     if (temp->selected ) {
-      interface_opts.name = g_strdup(temp->device); 
+      interface_opts.name = g_strdup(temp->device);
       interface_opts.descr = get_interface_descriptive_name(interface_opts.name);
       cap_settings = capture_get_cap_settings (interface_opts.name);
       interface_opts.monitor_mode = cap_settings.monitor_mode;
@@ -690,7 +690,7 @@ capture_if_stop_cb(GtkWidget *w _U_, gpointer d _U_)
     guint ifs;
     GList *curr;
     if_dlg_data_t *if_data;
-    
+
     for (ifs = 0; ifs < g_list_length(if_data_list); ifs++) {
         curr = g_list_nth(if_data_list, ifs);
         if_data = (if_dlg_data_t *)(curr->data);
@@ -718,9 +718,6 @@ capture_if_cb(GtkWidget *w _U_, gpointer d _U_)
   GtkWidget         *if_tb;
   GtkWidget         *if_lb;
   GtkWidget         *eb;
-#if !GTK_CHECK_VERSION(2,12,0)
-  GtkTooltips       *tooltips;
-#endif
   int               err;
   gchar             *err_str;
   GtkRequisition    requisition;
@@ -809,10 +806,6 @@ capture_if_cb(GtkWidget *w _U_, gpointer d _U_)
   cap_if_w = dlg_window_new("Wireshark: Capture Interfaces");  /* transient_for top_level */
   gtk_window_set_destroy_with_parent (GTK_WINDOW(cap_if_w), TRUE);
 
-#if !GTK_CHECK_VERSION(2,12,0)
-  tooltips = gtk_tooltips_new();
-#endif
-
   main_sw = gtk_scrolled_window_new(NULL, NULL);
   gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(main_sw), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
   gtk_container_add(GTK_CONTAINER(cap_if_w), main_sw);
@@ -872,7 +865,7 @@ capture_if_cb(GtkWidget *w _U_, gpointer d _U_)
       }
 
       if_dlg_data = g_malloc0(sizeof(if_dlg_data_t));
-      
+
       if (preselected > 0) {
         found = FALSE;
         for (i = 0; i < (gint)global_capture_opts.ifaces->len; i++) {
@@ -890,16 +883,10 @@ capture_if_cb(GtkWidget *w _U_, gpointer d _U_)
       }
       else
         if_dlg_data->selected = FALSE;
-      
+
       if_dlg_data->if_info = *if_info;
 
       if_dlg_data->choose_bt = gtk_check_button_new();
-#if !GTK_CHECK_VERSION(2,12,0)
-      tmp_str = g_strdup_printf("Choose the interfaces to capture from\n\n%s", if_tool_str->str);
-      gtk_tooltips_set_tip(tooltips, if_dlg_data->choose_bt,
-          tmp_str, NULL);
-      g_free(tmp_str);
-#endif
       gtk_table_attach_defaults(GTK_TABLE(if_tb), if_dlg_data->choose_bt, 0, 1, row, row+1);
       if (gbl_capture_in_progress) {
           gtk_widget_set_sensitive(if_dlg_data->choose_bt, FALSE);
@@ -986,12 +973,7 @@ capture_if_cb(GtkWidget *w _U_, gpointer d _U_)
       /* details button */
 #ifdef _WIN32
       if_dlg_data->details_bt = gtk_button_new_from_stock(WIRESHARK_STOCK_CAPTURE_DETAILS);
-#if GTK_CHECK_VERSION(2,12,0)
       gtk_widget_set_tooltip_text(if_dlg_data->details_bt, "Open the capture details dialog of this interface.");
-#else
-      gtk_tooltips_set_tip(tooltips, if_dlg_data->details_bt,
-          "Open the capture details dialog of this interface.", NULL);
-#endif
       gtk_table_attach_defaults(GTK_TABLE(if_tb), if_dlg_data->details_bt, 8, 9, row, row+1);
       if (capture_if_has_details(if_dlg_data->device)) {
         g_signal_connect(if_dlg_data->details_bt, "clicked", G_CALLBACK(capture_details_cb), if_dlg_data);
@@ -1020,27 +1002,14 @@ capture_if_cb(GtkWidget *w _U_, gpointer d _U_)
   g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)(HELP_CAPTURE_INTERFACES_DIALOG));
 
   stop_bt = g_object_get_data(G_OBJECT(bbox), WIRESHARK_STOCK_CAPTURE_STOP);
-#if !GTK_CHECK_VERSION(2,12,0)
-  gtk_tooltips_set_tip(tooltips, stop_bt,"Stop a running capture.", NULL);
-#endif
   g_signal_connect(stop_bt, "clicked", G_CALLBACK(capture_if_stop_cb), NULL);
   close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
   window_set_cancel_button(cap_if_w, close_bt, window_cancel_button_cb);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(close_bt, "Close this window.");
-#else
-  gtk_tooltips_set_tip(tooltips, close_bt, "Close this window.", NULL);
-#endif
   options_bt = g_object_get_data(G_OBJECT(bbox), WIRESHARK_STOCK_CAPTURE_OPTIONS);
   g_signal_connect(options_bt, "clicked", G_CALLBACK(capture_prepare_cb), if_dlg_data);
-#if !GTK_CHECK_VERSION(2,12,0)
-  gtk_tooltips_set_tip(tooltips, options_bt, "Open the capture options dialog with this interface selected.", NULL);
-#endif
   capture_bt = g_object_get_data(G_OBJECT(bbox), WIRESHARK_STOCK_CAPTURE_START);
   g_signal_connect(capture_bt, "clicked", G_CALLBACK(capture_do_cb), if_dlg_data);
-#if !GTK_CHECK_VERSION(2,12,0)
-  gtk_tooltips_set_tip(tooltips, capture_bt, "Immediately start a capture from this interface", NULL);
-#endif
   gtk_widget_size_request(GTK_WIDGET(close_bt), &requisition);
   /* height + static offset + what the GTK MS Windows Engine needs in addition per interface */
   height += requisition.height + 20 + ifs;
diff --git a/gtk/color_dlg.c b/gtk/color_dlg.c
index c47367f043..4a5dc517e8 100644
--- a/gtk/color_dlg.c
+++ b/gtk/color_dlg.c
@@ -167,10 +167,6 @@ colorize_dialog_new (char *filter)
   GtkWidget *dlg_vbox;
   GtkWidget *main_hbox;
   GtkWidget *ctrl_vbox;
-#if GTK_CHECK_VERSION(2,12,0)
-#else
-  GtkTooltips *tooltips;
-#endif
   GtkWidget *order_fr;
   GtkWidget *order_vbox;
   GtkWidget *color_filter_up;
@@ -214,10 +210,6 @@ colorize_dialog_new (char *filter)
 
   color_dlg_num_of_filters = 0;
   color_dlg_row_selected = -1; /* no row selected */
-#if GTK_CHECK_VERSION(2,12,0)
-#else
-  tooltips = gtk_tooltips_new ();
-#endif
   /* Resizing of the dialog window is now reasonably done.
    * Default size is set so that it should fit into every usual screen resolution.
    * All other widgets are always packed depending on the current window size. */
@@ -245,47 +237,26 @@ colorize_dialog_new (char *filter)
 
   color_new = gtk_button_new_from_stock(GTK_STOCK_NEW);
   gtk_box_pack_start (GTK_BOX (edit_vbox), color_new, FALSE, FALSE, 5);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(color_new, "Create a new filter at the top of the list");
-#else
-  gtk_tooltips_set_tip (tooltips, color_new, ("Create a new filter at the top of the list"), NULL);
-#endif                
 
   color_edit = gtk_button_new_from_stock(WIRESHARK_STOCK_EDIT);
   gtk_box_pack_start (GTK_BOX (edit_vbox), color_edit, FALSE, FALSE, 5);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(color_edit, " If more than one filter is selected, edit the first selected one");
-#else
-  gtk_tooltips_set_tip (tooltips, color_edit, ("Edit the properties of the selected filter."
-      " If more than one filter is selected, edit the first selected one"), NULL);
-#endif
   gtk_widget_set_sensitive (color_edit, FALSE);
 
   color_enable = gtk_button_new_from_stock(WIRESHARK_STOCK_ENABLE);
   gtk_box_pack_start (GTK_BOX (edit_vbox), color_enable, FALSE, FALSE, 5);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(color_enable, "Enable the selected filter(s)");
-#else
-  gtk_tooltips_set_tip (tooltips, color_enable, ("Enable the selected filter(s)"), NULL);
-#endif
   gtk_widget_set_sensitive (color_enable, FALSE);
 
   color_disable = gtk_button_new_from_stock(WIRESHARK_STOCK_DISABLE);
   gtk_box_pack_start (GTK_BOX (edit_vbox), color_disable, FALSE, FALSE, 5);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(color_disable, "Disable the selected filter(s)");
-#else
-  gtk_tooltips_set_tip (tooltips, color_disable, ("Disable the selected filter(s)"), NULL);
-#endif
   gtk_widget_set_sensitive (color_disable, FALSE);
 
   color_delete = gtk_button_new_from_stock(GTK_STOCK_DELETE);
   gtk_box_pack_start (GTK_BOX (edit_vbox), color_delete, FALSE, FALSE, 5);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(color_delete, "Delete the selected filter(s)");
-#else
-  gtk_tooltips_set_tip (tooltips, color_delete, ("Delete the selected filter(s)"), NULL);
-#endif
   gtk_widget_set_sensitive (color_delete, FALSE);
   /* End edit buttons frame */
 
@@ -300,25 +271,13 @@ colorize_dialog_new (char *filter)
 
   color_import = gtk_button_new_from_stock(WIRESHARK_STOCK_IMPORT);
   gtk_box_pack_start (GTK_BOX (manage_vbox), color_import, FALSE, FALSE, 5);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(color_import, "Load filters from a file and append them to the list");
-#else
-  gtk_tooltips_set_tip(tooltips, color_import, ("Load filters from a file and append them to the list"), NULL);
-#endif
   color_export = gtk_button_new_from_stock(WIRESHARK_STOCK_EXPORT);
   gtk_box_pack_start (GTK_BOX (manage_vbox), color_export, FALSE, FALSE, 5);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(color_export, "Save all/selected filters to a file");
-#else
-  gtk_tooltips_set_tip(tooltips, color_export, ("Save all/selected filters to a file"), NULL);
-#endif
   color_clear = gtk_button_new_from_stock(GTK_STOCK_CLEAR);
   gtk_box_pack_start(GTK_BOX (manage_vbox), color_clear, FALSE, FALSE, 5);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(color_clear, "Clear the filter list and revert to system-wide default filter set");
-#else
-  gtk_tooltips_set_tip(tooltips, color_clear, ("Clear the filter list and revert to system-wide default filter set"), NULL);
-#endif
 
   /* filter list frame */
   list_fr = gtk_frame_new("Filter");
@@ -385,11 +344,7 @@ colorize_dialog_new (char *filter)
 
   color_filter_up = gtk_button_new_from_stock(GTK_STOCK_GO_UP);
   gtk_box_pack_start (GTK_BOX (order_vbox), color_filter_up, FALSE, FALSE, 0);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(color_filter_up, "Move filter higher in list");
-#else  
-  gtk_tooltips_set_tip (tooltips, color_filter_up, ("Move filter higher in list"), NULL);
-#endif
   gtk_widget_set_sensitive (color_filter_up, FALSE);
 
   order_move_label = gtk_label_new (("Move\nselected filter\nup or down"));
@@ -397,11 +352,7 @@ colorize_dialog_new (char *filter)
 
   color_filter_down = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN);
   gtk_box_pack_start (GTK_BOX (order_vbox), color_filter_down, FALSE, FALSE, 0);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(color_filter_down, "Move filter lower in list");
-#else  
-  gtk_tooltips_set_tip (tooltips, color_filter_down, ("Move filter lower in list"), NULL);
-#endif
   gtk_widget_set_sensitive (color_filter_down, FALSE);
 
 
@@ -410,38 +361,18 @@ colorize_dialog_new (char *filter)
   gtk_box_pack_start (GTK_BOX (dlg_vbox), button_ok_hbox, FALSE, FALSE, 5);
 
   color_ok = g_object_get_data(G_OBJECT(button_ok_hbox), GTK_STOCK_OK);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(color_ok, "Apply the color filters to the display and close this dialog");
-#else 
-  gtk_tooltips_set_tip (tooltips, color_ok, ("Apply the color filters to the display and close this dialog"), NULL);
-#endif
   color_apply = g_object_get_data(G_OBJECT(button_ok_hbox), GTK_STOCK_APPLY);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(color_apply, "Apply the color filters to the display and keep this dialog open");
-#else   
-  gtk_tooltips_set_tip (tooltips, color_apply, ("Apply the color filters to the display and keep this dialog open"), NULL);
-#endif
 
   color_save = g_object_get_data(G_OBJECT(button_ok_hbox), GTK_STOCK_SAVE);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(color_save, "Save the color filters permanently and keep this dialog open");
-#else 
-  gtk_tooltips_set_tip (tooltips, color_save, ("Save the color filters permanently and keep this dialog open"), NULL);
-#endif
   color_cancel = g_object_get_data(G_OBJECT(button_ok_hbox), GTK_STOCK_CANCEL);
   window_set_cancel_button(color_win, color_cancel, color_cancel_cb);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(color_cancel, "Cancel changes done (since last \"Apply\") and close this dialog");
-#else 
-  gtk_tooltips_set_tip (tooltips, color_cancel, ("Cancel changes done (since last \"Apply\") and close this dialog"), NULL);
-#endif
 
   color_help = g_object_get_data(G_OBJECT(button_ok_hbox), GTK_STOCK_HELP);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(color_help, "Get help about this dialog");
-#else   
-  gtk_tooltips_set_tip (tooltips, color_help, ("Get help about this dialog"), NULL);
-#endif
   g_signal_connect(color_help, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_COLORING_RULES_DIALOG);
 
   gtk_widget_grab_default(color_ok);
@@ -1111,4 +1042,3 @@ color_cancel_cb(GtkWidget *widget _U_, gpointer user_data _U_)
   /* Destroy the dialog box. */
   window_destroy(colorize_win);
 }
-
diff --git a/gtk/color_edit_dlg.c b/gtk/color_edit_dlg.c
index 14f56a7d16..2755a17935 100644
--- a/gtk/color_edit_dlg.c
+++ b/gtk/color_edit_dlg.c
@@ -97,9 +97,6 @@ edit_color_filter_dialog(GtkWidget *color_filters,
   color_filter_t *colorf;
   GtkWidget      *edit_dialog;
   GtkWidget      *dialog_vbox;
-#if !GTK_CHECK_VERSION(2,12,0)
-  GtkTooltips    *tooltips = gtk_tooltips_new();
-#endif
   GdkColor       bg_color, fg_color;
 
   GtkWidget *filter_fr;
@@ -173,11 +170,7 @@ edit_color_filter_dialog(GtkWidget *color_filters,
   gtk_widget_modify_text(filt_name_entry, GTK_STATE_NORMAL, &fg_color);
 
   gtk_box_pack_start (GTK_BOX (filter_name_hbox), filt_name_entry, TRUE, TRUE, 0);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(filt_name_entry, "This is the editable name of the filter. (No @ characters allowed.)");
-#else
-  gtk_tooltips_set_tip (tooltips, filt_name_entry, ("This is the editable name of the filter. (No @ characters allowed.)"), NULL);
-#endif
 
   /* filter string hbox */
   filter_string_hbox = gtk_hbox_new (FALSE, 0);
@@ -194,22 +187,14 @@ edit_color_filter_dialog(GtkWidget *color_filters,
   gtk_entry_set_text(GTK_ENTRY(filt_text_entry), colorf->filter_text);
 
   gtk_box_pack_start (GTK_BOX (filter_string_hbox), filt_text_entry, TRUE, TRUE, 0);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(filt_text_entry, "This is the editable text of the filter");
-#else
-  gtk_tooltips_set_tip (tooltips, filt_text_entry, ("This is the editable text of the filter"), NULL);
-#endif
 
   /* Create the "Add Expression..." button, to pop up a dialog
      for constructing filter comparison expressions. */
   add_expression_bt = gtk_button_new_from_stock(WIRESHARK_STOCK_ADD_EXPRESSION);
   g_signal_connect(add_expression_bt, "clicked", G_CALLBACK(filter_expr_cb), filt_text_entry);
   gtk_box_pack_start (GTK_BOX(filter_string_hbox), add_expression_bt, FALSE, FALSE, 3);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(add_expression_bt, "Add an expression to the filter string");
-#else
-  gtk_tooltips_set_tip (tooltips, add_expression_bt, ("Add an expression to the filter string"), NULL);
-#endif
 
   /* Show the (in)validity of the default filter string */
   filter_te_syntax_check_cb(filt_text_entry, NULL);
@@ -228,19 +213,11 @@ edit_color_filter_dialog(GtkWidget *color_filters,
 
   colorize_filter_fg = gtk_button_new_with_label (("Foreground Color..."));
   gtk_box_pack_start (GTK_BOX (colorize_hbox), colorize_filter_fg, TRUE, FALSE, 0);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(colorize_filter_fg, "Select foreground color for data display");
-#else
-  gtk_tooltips_set_tip (tooltips, colorize_filter_fg, ("Select foreground color for data display"), NULL);
-#endif
 
   colorize_filter_bg = gtk_button_new_with_label (("Background Color..."));
   gtk_box_pack_start (GTK_BOX (colorize_hbox), colorize_filter_bg, TRUE, FALSE, 0);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(colorize_filter_bg, "Select background color for data display");
-#else
-  gtk_tooltips_set_tip (tooltips, colorize_filter_bg, ("Select background color for data display"), NULL);
-#endif
 
   /* status frame */
   status_fr = gtk_frame_new("Status");
@@ -253,11 +230,7 @@ edit_color_filter_dialog(GtkWidget *color_filters,
   disabled_cb = gtk_check_button_new_with_label("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);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(disabled_cb, "Color rule won't be checked if this box is selected");
-#else
-  gtk_tooltips_set_tip (tooltips, disabled_cb, ("Color rule won't be checked if this box is selected"), NULL);
-#endif
 
   /* button box */
   bbox = dlg_button_row_new(GTK_STOCK_OK, GTK_STOCK_CANCEL, NULL);
@@ -265,18 +238,10 @@ edit_color_filter_dialog(GtkWidget *color_filters,
   gtk_container_set_border_width  (GTK_CONTAINER (bbox), 0);
 
   edit_color_filter_ok = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(edit_color_filter_ok, "Accept filter color change");
-#else
-  gtk_tooltips_set_tip (tooltips, edit_color_filter_ok, ("Accept filter color change"), NULL);
-#endif
 
   edit_color_filter_cancel = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
-#if GTK_CHECK_VERSION(2,12,0)
   gtk_widget_set_tooltip_text(edit_color_filter_cancel, "Reject filter color change");
-#else
-  gtk_tooltips_set_tip (tooltips, edit_color_filter_cancel, ("Reject filter color change"), NULL);
-#endif
 
   gtk_widget_grab_default(edit_color_filter_ok);
 
diff --git a/gtk/color_utils.c b/gtk/color_utils.c
index e865571272..7ec62c5ca2 100644
--- a/gtk/color_utils.c
+++ b/gtk/color_utils.c
@@ -126,27 +126,3 @@ gdkcolor_to_color_t(color_t *target, const GdkColor *source)
 	target->green = source->green;
 	target->blue  = source->blue;
 }
-
-#if GTK_CHECK_VERSION(2,12,0)
-#else
-/** Copied from GTK sources
- * gdk_color_to_string:
- * Returns a textual specification of parameter color in the hexadecimal form
- *  \c #rrrrggggbbbb \c , where  \c r \c ,
- *  \c g  \c and  \c b \c are hex digits
- * representing the red, green and blue components respectively.
- *
- * @param color a #GdkColor
- * @return a newly-allocated text string
- *
- * Since: 2.12
- **/
-gchar *
-gdk_color_to_string (const GdkColor *color)
-{
-	g_return_val_if_fail (color != NULL, NULL);
-
-	return g_strdup_printf ("#%04x%04x%04x", color->red, color->green, color->blue);
-}
-#endif /* GTK_CHECK_VERSION(2,12,0) */
-
diff --git a/gtk/color_utils.h b/gtk/color_utils.h
index abea5c8912..63d7b364c7 100644
--- a/gtk/color_utils.h
+++ b/gtk/color_utils.h
@@ -62,8 +62,4 @@ void color_t_to_gdkcolor(GdkColor *target, const color_t *source);
  */
 void gdkcolor_to_color_t(color_t *target, const GdkColor *source);
 
-#if GTK_CHECK_VERSION(2,12,0)
-#else
-gchar * gdk_color_to_string (const GdkColor *color);
-#endif /* GTK_CHECK_VERSION(2,12,0) */
 #endif /* __COLORS_H__ */
diff --git a/gtk/conversations_table.c b/gtk/conversations_table.c
index 131cdf1e22..7ef808d225 100644
--- a/gtk/conversations_table.c
+++ b/gtk/conversations_table.c
@@ -2102,12 +2102,7 @@ draw_ct_table_data(conversations_table *ct)
 
             get_ct_table_address(ct, conversation, entries);
             conversation->iter_valid = TRUE;
-#if GTK_CHECK_VERSION(2,6,0)
             gtk_list_store_insert_with_values( store , &conversation->iter, G_MAXINT,
-#else
-            gtk_list_store_append(store, &conversation->iter);
-            gtk_list_store_set (store, &conversation->iter,
-#endif
                   SRC_ADR_COLUMN,  entries[0],
                   SRC_PORT_COLUMN, entries[1],
                   DST_ADR_COLUMN,  entries[2],
@@ -2522,9 +2517,6 @@ init_conversation_table(gboolean hide_ports, const char *table_name, const char
     gboolean ret;
     GtkWidget *copy_bt, *follow_stream_bt;
     gboolean add_follow_stream_button = FALSE;
-#if !GTK_CHECK_VERSION(2,12,0)
-    GtkTooltips *tooltips = gtk_tooltips_new();
-#endif
 
     conversations=g_malloc0(sizeof(conversations_table));
 
@@ -2563,12 +2555,7 @@ init_conversation_table(gboolean hide_ports, const char *table_name, const char
     window_set_cancel_button(conversations->win, close_bt, window_cancel_button_cb);
 
     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 all statistical values of this page to the clipboard in CSV (Comma Separated Values) format.");
-#else
-    gtk_tooltips_set_tip(tooltips, copy_bt,
-                         "Copy all statistical values of this page to the clipboard in CSV (Comma Separated Values) format.", NULL);
-#endif
     g_object_set_data(G_OBJECT(copy_bt), CONV_PTR_KEY, conversations);
     g_signal_connect(copy_bt, "clicked", G_CALLBACK(copy_as_csv_cb), NULL);
 
@@ -2604,9 +2591,6 @@ ct_nb_switch_page_cb(GtkNotebook *nb, GtkNotebookPage *pg _U_, guint page, gpoin
     GtkWidget *copy_bt = (GtkWidget *) data;
     GtkWidget *follow_stream_bt = g_object_get_data(G_OBJECT(nb), FOLLOW_STREAM_BT_KEY);
     void      **pages = g_object_get_data(G_OBJECT(nb), NB_PAGES_KEY);
-#if !GTK_CHECK_VERSION(2,12,0)
-    GtkTooltips *tooltips = gtk_tooltips_new();
-#endif
 
     page++;
 
@@ -2617,25 +2601,13 @@ ct_nb_switch_page_cb(GtkNotebook *nb, GtkNotebookPage *pg _U_, guint page, gpoin
 
     /* Filter Stream only available for TCP and UDP */
     if (strcmp(((conversations_table *)pages[page])->name, "TCP") == 0) {
-#if GTK_CHECK_VERSION(2,12,0)
         gtk_widget_set_tooltip_text(follow_stream_bt, "Follow TCP Stream.");
-#else
-        gtk_tooltips_set_tip(tooltips, follow_stream_bt, "Follow TCP Stream.", NULL);
-#endif
         gtk_widget_set_sensitive(follow_stream_bt, TRUE);
     } else if (strcmp(((conversations_table *)pages[page])->name, "UDP") == 0) {
-#if GTK_CHECK_VERSION(2,12,0)
         gtk_widget_set_tooltip_text(follow_stream_bt, "Follow UDP Stream.");
-#else
-        gtk_tooltips_set_tip(tooltips, follow_stream_bt, "Follow UDP Stream.", NULL);
-#endif
         gtk_widget_set_sensitive(follow_stream_bt, TRUE);
     } else {
-#if GTK_CHECK_VERSION(2,12,0)
         gtk_widget_set_tooltip_text(follow_stream_bt, "Follow TCP or UDP Stream.");
-#else
-        gtk_tooltips_set_tip(tooltips, follow_stream_bt, "Follow TCP or UDP Stream.", NULL);
-#endif
         gtk_widget_set_sensitive(follow_stream_bt, FALSE);
     }
 }
@@ -2774,9 +2746,6 @@ init_conversation_notebook_cb(GtkWidget *w _U_, gpointer d _U_)
     GtkWidget *page_lb;
     GSList  *current_table;
     register_ct_t *registered;
-#if !GTK_CHECK_VERSION(2,12,0)
-    GtkTooltips *tooltips = gtk_tooltips_new();
-#endif
     GtkWidget *copy_bt;
     GtkWidget *follow_stream_bt;
 
@@ -2821,23 +2790,14 @@ 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_active(GTK_TOGGLE_BUTTON(resolv_cb), TRUE);
-#if GTK_CHECK_VERSION(2,12,0)
     gtk_widget_set_tooltip_text(resolv_cb, "Show results of name resolutions rather than the \"raw\" values. "
                                  "Please note: The corresponding name resolution must be enabled.");
-#else
-    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);
-#endif
     g_signal_connect(resolv_cb, "toggled", G_CALLBACK(ct_resolve_toggle_dest), pages);
 
     filter_cb = gtk_check_button_new_with_mnemonic("Limit to display filter");
     gtk_container_add(GTK_CONTAINER(hbox), filter_cb);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(filter_cb), FALSE);
-#if GTK_CHECK_VERSION(2,12,0)
     gtk_widget_set_tooltip_text(filter_cb, "Limit the list to conversations matching the current display filter.");
-#else
-    gtk_tooltips_set_tip(tooltips, filter_cb, "Limit the list to conversations matching the current display filter.", NULL);
-#endif
     g_signal_connect(filter_cb, "toggled", G_CALLBACK(ct_filter_toggle_dest), pages);
 
     /* Button row. */
@@ -2851,21 +2811,12 @@ init_conversation_notebook_cb(GtkWidget *w _U_, gpointer d _U_)
     window_set_cancel_button(win, close_bt, window_cancel_button_cb);
 
     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 all statistical values of this page to the clipboard in CSV (Comma Separated Values) format.");
-#else
-    gtk_tooltips_set_tip(tooltips, copy_bt,
-                         "Copy all statistical values of this page to the clipboard in CSV (Comma Separated Values) format.", NULL);
-#endif
     g_signal_connect(copy_bt, "clicked", G_CALLBACK(copy_as_csv_cb), NULL);
     g_object_set_data(G_OBJECT(copy_bt), CONV_PTR_KEY, pages[page]);
 
     follow_stream_bt = g_object_get_data(G_OBJECT(bbox), WIRESHARK_STOCK_FOLLOW_STREAM);
-#if GTK_CHECK_VERSION(2,12,0)
     gtk_widget_set_tooltip_text(follow_stream_bt, "Follow Stream.");
-#else
-    gtk_tooltips_set_tip(tooltips, follow_stream_bt, "Follow Stream.", NULL);
-#endif
     g_object_set_data(G_OBJECT(follow_stream_bt), E_DFILTER_TE_KEY, main_display_filter_widget);
     g_object_set_data(G_OBJECT(follow_stream_bt), CONV_PTR_KEY, pages[page]);
     g_signal_connect(follow_stream_bt, "clicked", G_CALLBACK(follow_stream_cb), NULL);
@@ -3074,4 +3025,3 @@ add_conversation_table_data(conversations_table *ct, const address *src, const a
  * ex: set shiftwidth=4 tabstop=8 expandtab
  * :indentSize=4:tabSize=8:noTabs=true:
  */
-
diff --git a/gtk/dfilter_expr_dlg.c b/gtk/dfilter_expr_dlg.c
index b65076848e..d2baa7de4d 100644
--- a/gtk/dfilter_expr_dlg.c
+++ b/gtk/dfilter_expr_dlg.c
@@ -251,10 +251,8 @@ show_relations(GtkWidget *relation_list, ftenum_t ftype)
 	    ftype_can_le(ftype) || (ftype_can_slice(ftype) && ftype_can_le(FT_BYTES)));
 	add_relation_list(relation_list, "contains",
 	    ftype_can_contains(ftype) || (ftype_can_slice(ftype) && ftype_can_contains(FT_BYTES)));
-#if defined(HAVE_LIBPCRE) || GLIB_CHECK_VERSION(2,14,0)
 	add_relation_list(relation_list, "matches",
 	    ftype_can_matches(ftype) || (ftype_can_slice(ftype) && ftype_can_matches(FT_BYTES)));
-#endif
 
         gtk_tree_model_get_iter_first(gtk_tree_view_get_model(GTK_TREE_VIEW(relation_list)), &iter);
         gtk_tree_selection_select_iter(gtk_tree_view_get_selection(GTK_TREE_VIEW(relation_list)), &iter);
diff --git a/gtk/dissector_tables_dlg.c b/gtk/dissector_tables_dlg.c
index dc325584e8..30dd6d3c48 100644
--- a/gtk/dissector_tables_dlg.c
+++ b/gtk/dissector_tables_dlg.c
@@ -6,17 +6,17 @@
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -63,14 +63,14 @@ win_destroy_cb(GtkWindow *win _U_, gpointer data _U_)
 }
 
 /*
- * For a dissector table, put 
+ * For a dissector table, put
  * its short name and its
  * descriptive name in the treeview.
  */
 
 struct dissector_tables_tree_info {
     GtkWidget       *tree;
-    GtkTreeIter     iter; 
+    GtkTreeIter     iter;
     GtkTreeIter     new_iter;
 };
 
@@ -105,25 +105,16 @@ struct dissector_tables_trees {
 
 typedef struct dissector_tables_trees dissector_tables_trees_t;
 
-static void 
+static void
 proto_add_to_list(dissector_tables_tree_info_t *tree_info,
-                  GtkTreeStore *store, 
+                  GtkTreeStore *store,
                   gchar        *str,
                   const gchar  *proto_name)
 {
-#if GTK_CHECK_VERSION(2,10,0)
     gtk_tree_store_insert_with_values(store, &tree_info->new_iter, &tree_info->iter, G_MAXINT,
                                       TABLE_UI_NAME_COL,    str,
                                       TABLE_SHORT_NAME_COL, proto_name,
                                       -1);
-#else
-    gtk_tree_store_append(store, &tree_info->new_iter, &tree_info->iter);
-    gtk_tree_store_set (store, &tree_info->new_iter,
-                        TABLE_UI_NAME_COL,    str,
-                        TABLE_SHORT_NAME_COL, proto_name,
-                        -1);
-#endif
-
 }
 
 static void
@@ -170,9 +161,9 @@ decode_proto_add_to_list (const gchar *table_name _U_, ftenum_t selector_type _U
 
 }
 
-static void 
+static void
 table_name_add_to_list(dissector_tables_tree_info_t  *tree_info,
-                       GtkWidget  *tree_view, 
+                       GtkWidget  *tree_view,
                        const char *table_name,
                        const char *ui_name)
 {
@@ -181,19 +172,10 @@ table_name_add_to_list(dissector_tables_tree_info_t  *tree_info,
     tree_info->tree = tree_view;
     store = GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(tree_view))); /* Get store */
 
-#if GTK_CHECK_VERSION(2,10,0)
     gtk_tree_store_insert_with_values(store, &tree_info->iter, NULL, G_MAXINT,
                                       TABLE_UI_NAME_COL,    ui_name,
                                       TABLE_SHORT_NAME_COL, table_name,
                                       -1);
-#else
-    gtk_tree_store_append (store, &tree_info->iter, NULL);  /* Acquire an iterator */
-    gtk_tree_store_set (store, &tree_info->iter,
-                        TABLE_UI_NAME_COL,    ui_name,
-                        TABLE_SHORT_NAME_COL, table_name,
-                        -1);
-#endif
-
 }
 
 static void
@@ -226,7 +208,7 @@ display_dissector_table_names(const char *table_name, const char *ui_name,
     g_free(tree_info);
 }
 
-static GtkWidget* 
+static GtkWidget*
 init_table(void)
 {
     GtkTreeStore      *store;
@@ -246,10 +228,8 @@ init_table(void)
     tree_view = GTK_TREE_VIEW(tree);
     sortable = GTK_TREE_SORTABLE(store);
 
-#if GTK_CHECK_VERSION(2,6,0)
     /* Speed up the list display */
     gtk_tree_view_set_fixed_height_mode(tree_view, TRUE);
-#endif
 
     /* Setup the sortable columns */
     gtk_tree_view_set_headers_clickable(GTK_TREE_VIEW (tree), FALSE);
@@ -261,7 +241,7 @@ init_table(void)
      * cell_renderer to the first column of the model */
     renderer = gtk_cell_renderer_text_new ();
     column = gtk_tree_view_column_new_with_attributes ("UI name", renderer, "text", TABLE_UI_NAME_COL, NULL);
-    gtk_tree_sortable_set_sort_func(sortable, TABLE_UI_NAME_COL, 
+    gtk_tree_sortable_set_sort_func(sortable, TABLE_UI_NAME_COL,
                                     ui_sort_func, GINT_TO_POINTER(TABLE_UI_NAME_COL), NULL);
     gtk_tree_view_column_set_sort_column_id(column, TABLE_UI_NAME_COL);
     gtk_tree_view_column_set_resizable(column, TRUE);
@@ -272,7 +252,7 @@ init_table(void)
 
     renderer = gtk_cell_renderer_text_new ();
     column = gtk_tree_view_column_new_with_attributes ("Short name", renderer, "text", TABLE_SHORT_NAME_COL, NULL);
-    gtk_tree_sortable_set_sort_func(sortable, TABLE_SHORT_NAME_COL, 
+    gtk_tree_sortable_set_sort_func(sortable, TABLE_SHORT_NAME_COL,
                                     ui_sort_func, GINT_TO_POINTER(TABLE_SHORT_NAME_COL), NULL);
     gtk_tree_view_column_set_sort_column_id(column, TABLE_SHORT_NAME_COL);
     gtk_tree_view_column_set_resizable(column, TRUE);
diff --git a/gtk/expert_comp_dlg.c b/gtk/expert_comp_dlg.c
index c64dcc13a7..202af916b8 100644
--- a/gtk/expert_comp_dlg.c
+++ b/gtk/expert_comp_dlg.c
@@ -138,7 +138,7 @@ static void expert_dlg_display_reset(expert_tapdata_t * etd)
 }
 
 /* complete reset, e.g. capture file closed */
-static void 
+static void
 expert_dlg_reset(void *tapdata)
 {
     expert_tapdata_t * etd = tapdata;
@@ -157,7 +157,7 @@ expert_dlg_reset(void *tapdata)
     expert_dlg_display_reset(etd);
 }
 
-static int 
+static int
 expert_dlg_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *pointer)
 {
     expert_info_t    *ei;
@@ -378,10 +378,8 @@ expert_dlg_init_table(expert_tapdata_t * etd, GtkWidget *vbox)
     etd->tree_view = GTK_TREE_VIEW(tree);
     sortable = GTK_TREE_SORTABLE(store);
 
-#if GTK_CHECK_VERSION(2,6,0)
     /* Speed up the list display */
     gtk_tree_view_set_fixed_height_mode(etd->tree_view, TRUE);
-#endif
 
     /* Setup the sortable columns */
     gtk_tree_view_set_headers_clickable(GTK_TREE_VIEW (tree), FALSE);
@@ -596,12 +594,7 @@ expert_dlg_draw(void *data)
          * :
          * 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
                     NO_COLUMN, packet_no,
                     SEVERITY_COLUMN, severity_str,
                     GROUP_COLUMN, group_str,
diff --git a/gtk/expert_comp_table.c b/gtk/expert_comp_table.c
index 8db2519e70..e018d98d38 100644
--- a/gtk/expert_comp_table.c
+++ b/gtk/expert_comp_table.c
@@ -650,10 +650,8 @@ init_error_table(error_equiv_table *err, guint num_procs, GtkWidget *vbox)
     err->tree_view = GTK_TREE_VIEW(tree);
     sortable = GTK_TREE_SORTABLE(store);
 
-#if GTK_CHECK_VERSION(2,6,0)
     /* Speed up the list display */
       gtk_tree_view_set_fixed_height_mode(err->tree_view, TRUE);
-#endif
 
     gtk_tree_view_set_headers_clickable(GTK_TREE_VIEW (tree), FALSE);
 
diff --git a/gtk/export_object_smb.c b/gtk/export_object_smb.c
index 9d82cd2f04..46684f75a9 100644
--- a/gtk/export_object_smb.c
+++ b/gtk/export_object_smb.c
@@ -261,32 +261,6 @@ find_incoming_file(GSList *GSL_active_files,active_file *incoming_file)
 	return row;
 }
 
-#if !GLIB_CHECK_VERSION(2,6,0)
-/**
- * g_strv_length:
- * @str_array: a %NULL-terminated array of strings.
- *
- * Returns the length of the given %NULL-terminated
- * string array @str_array.
- *
- * Return value: length of @str_array.
- *
- * Since: 2.6
- **/
-static guint
-g_strv_length (gchar **str_array)
-{
-	guint i = 0;
-
-	g_return_val_if_fail (str_array != NULL, 0);
-
-	while (str_array[i])
-		++i;
-
-	return i;
-}
-#endif
-
 /* This is the function answering to the registered tap listener call */
 static gboolean
 eo_smb_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data)
diff --git a/gtk/export_sslkeys.c b/gtk/export_sslkeys.c
index 2c8e490286..199238c960 100644
--- a/gtk/export_sslkeys.c
+++ b/gtk/export_sslkeys.c
@@ -23,7 +23,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * 
+ *
  */
 
 #ifdef HAVE_CONFIG_H
@@ -94,7 +94,7 @@ ssl_export_sessions_func(gpointer key, gpointer value, gpointer user_data)
     StringInfo* keylist = (StringInfo*)user_data;
 
     offset = strlen(keylist->data);
-    
+
     /*
      * XXX - should this be a string that grows as necessary to hold
      * everything in it?
@@ -241,9 +241,7 @@ savesslkeys_cb(GtkWidget * w _U_, gpointer data _U_)
      * Build the dialog box we need.
      */
     savesslkeys_dlg = file_selection_new("Wireshark: Export SSL Session Keys", FILE_SELECTION_SAVE);
-#if GTK_CHECK_VERSION(2,8,0)
     gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(savesslkeys_dlg), TRUE);
-#endif
 
     /* label */
     label = g_strdup_printf("Will save %u SSL Session %s to specified file.",