#include "image/clist_descend.xpm"
#include "simple_dialog.h"
#include "globals.h"
-#include "tap.h"
+#include <epan/tap.h>
#include "gtk/find_dlg.h"
#include "color.h"
#include "gtk/color_dlg.h"
}
-#if (GTK_MAJOR_VERSION > 2)
+#if (GTK_MAJOR_VERSION >= 2)
static void
copy_as_csv_cb(GtkWindow *win _U_, gpointer data)
{
GString *error_string;
GtkWidget *label;
char title[256];
-#if (GTK_MAJOR_VERSION > 2)
+#if (GTK_MAJOR_VERSION >= 2)
GtkWidget *copy_bt;
GtkTooltips *tooltips = gtk_tooltips_new();
#endif
/* create popup menu for this table */
ct_create_popup_menu(conversations);
-#if (GTK_MAJOR_VERSION > 2)
+#if (GTK_MAJOR_VERSION >= 2)
/* XXX - maybe we want to have a "Copy as CSV" stock button here? */
/*copy_bt = gtk_button_new_with_label ("Copy content to clipboard as CSV");*/
copy_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_COPY);