Again, some warnings removed.

[obnox/wireshark/wip.git] / gtk / conversations_table.c

diff --git a/gtk/conversations_table.c b/gtk/conversations_table.c
index 009fea679c0e9313c92f0d1abb5a1f2b3f4876ba..325f19c4707f3401741945d8c47ad31abea8d158 100644 (file)
--- a/gtk/conversations_table.c
+++ b/gtk/conversations_table.c
@@ -39,14 +39,14 @@
 #include "compat_macros.h"
 #include "epan/packet_info.h"
 #include "epan/to_str.h"
-#include "epan/resolv.h"
+#include "epan/addr_resolv.h"
 #include "sat.h"
 #include "conversations_table.h"
 #include "image/clist_ascend.xpm"
 #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"
@@ -1072,7 +1072,7 @@ draw_ct_table_data(conversations_table *ct)
 }
 
 
-#if (GTK_MAJOR_VERSION > 2)
+#if (GTK_MAJOR_VERSION >= 2)
 static void
 copy_as_csv_cb(GtkWindow *win _U_, gpointer data)
 {
@@ -1122,7 +1122,7 @@ init_ct_table_page(conversations_table *conversations, GtkWidget *vbox, gboolean
     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           
@@ -1209,7 +1209,7 @@ init_ct_table_page(conversations_table *conversations, GtkWidget *vbox, gboolean
     /* 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);