Revert previous commit of Irene, which doesn't work (yet).

svn path=/trunk/; revision=52814

14 files changed, 12 insertions, 12 deletions

diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
index 2af79f9093..73375a3654 100644
--- a/ui/CMakeLists.txt
+++ b/ui/CMakeLists.txt
@@ -35,7 +35,6 @@ set(COMMON_UI_SRC
 	preference_utils.c
 	profile.c
 	recent.c
-	sctp_stat.c
 	ssl_key_export.c
 	software_update.c
 	tap-megaco-common.c
diff --git a/ui/Makefile.common b/ui/Makefile.common
index a34788b42b..fc4ceb8825 100644
--- a/ui/Makefile.common
+++ b/ui/Makefile.common
@@ -56,7 +56,6 @@ WIRESHARK_UI_SRC = \
 	preference_utils.c	\
 	profile.c		\
 	recent.c		\
-	sctp_stat.c	\
 	software_update.c	\
 	ssl_key_export.c	\
 	tap-megaco-common.c	\
@@ -82,7 +81,6 @@ noinst_HEADERS = \
 	progress_dlg.h		\
 	recent.h		\
 	recent_utils.h		\
-	sctp_stat.h		\
 	simple_dialog.h		\
 	software_update.h	\
 	ssl_key_export.h	\
diff --git a/ui/gtk/CMakeLists.txt b/ui/gtk/CMakeLists.txt
index 306309abb3..9fd0e1a817 100644
--- a/ui/gtk/CMakeLists.txt
+++ b/ui/gtk/CMakeLists.txt
@@ -110,6 +110,7 @@ set(WIRESHARK_GTK_SRC
 	sctp_byte_graph_dlg.c
 	sctp_error_dlg.c
 	sctp_graph_dlg.c
+	sctp_stat.c
 	service_response_time_table.c
 	simple_dialog.c
 	stock_icons.c
diff --git a/ui/gtk/Makefile.common b/ui/gtk/Makefile.common
index f3afa5fdaf..db96be58d2 100644
--- a/ui/gtk/Makefile.common
+++ b/ui/gtk/Makefile.common
@@ -128,6 +128,7 @@ WIRESHARK_GTK_SRC = \
 	sctp_byte_graph_dlg.c	\
 	sctp_error_dlg.c	\
 	sctp_graph_dlg.c	\
+	sctp_stat.c	\
 	service_response_time_table.c	\
 	simple_dialog.c	\
 	stock_icons.c	\
@@ -336,6 +337,7 @@ noinst_HEADERS = \
 	rtp_stream.h	\
 	rtp_stream_dlg.h \
 	sat.h		\
+	sctp_stat.h	\
 	service_response_time_table.h	\
 	time_shift_dlg.h	\
 	stock_icons.h	\
diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c
index 66c314def1..e30b1cdbb5 100644
--- a/ui/gtk/main_menubar.c
+++ b/ui/gtk/main_menubar.c
@@ -93,7 +93,7 @@
 #include "ui/gtk/conversations_table.h"
 #include "ui/gtk/hostlist_table.h"
 #include "ui/gtk/packet_history.h"
-#include "ui/sctp_stat.h"
+#include "ui/gtk/sctp_stat.h"
 #include "ui/gtk/firewall_dlg.h"
 #include "ui/gtk/macros_dlg.h"
 #include "epan/dissectors/packet-ssl-utils.h"
diff --git a/ui/gtk/sctp_assoc_analyse.c b/ui/gtk/sctp_assoc_analyse.c
index 110f857774..7844bc0a89 100644
--- a/ui/gtk/sctp_assoc_analyse.c
+++ b/ui/gtk/sctp_assoc_analyse.c
@@ -38,7 +38,7 @@
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/main.h"
-#include "ui/sctp_stat.h"
+#include "ui/gtk/sctp_stat.h"
 #include "ui/gtk/gtkglobals.h"
 
 #include "frame_tvbuff.h"
diff --git a/ui/gtk/sctp_byte_graph_dlg.c b/ui/gtk/sctp_byte_graph_dlg.c
index 081bb66f58..8226635959 100644
--- a/ui/gtk/sctp_byte_graph_dlg.c
+++ b/ui/gtk/sctp_byte_graph_dlg.c
@@ -39,7 +39,7 @@
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/main.h"
-#include "ui/sctp_stat.h"
+#include "ui/gtk/sctp_stat.h"
 
 #include "ui/gtk/old-gtk-compat.h"
 
diff --git a/ui/gtk/sctp_chunk_stat.c b/ui/gtk/sctp_chunk_stat.c
index 48d153182c..84d68237fa 100644
--- a/ui/gtk/sctp_chunk_stat.c
+++ b/ui/gtk/sctp_chunk_stat.c
@@ -47,7 +47,7 @@
 #include "ui/gtk/tap_param_dlg.h"
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/main.h"
-#include "ui/sctp_stat.h"
+#include "ui/gtk/sctp_stat.h"
 
 
 static void sctpstat_init(const char *opt_arg, void *userdata);
diff --git a/ui/gtk/sctp_chunk_stat_dlg.c b/ui/gtk/sctp_chunk_stat_dlg.c
index 3a38e504eb..4a7e1bdd30 100644
--- a/ui/gtk/sctp_chunk_stat_dlg.c
+++ b/ui/gtk/sctp_chunk_stat_dlg.c
@@ -35,7 +35,7 @@
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/main.h"
-#include "ui/sctp_stat.h"
+#include "ui/gtk/sctp_stat.h"
 
 static GtkWidget         *clist           = NULL;
 static GList             *last_list       = NULL;
diff --git a/ui/gtk/sctp_error_dlg.c b/ui/gtk/sctp_error_dlg.c
index 0c4ce8dc0c..34d3b8a67d 100644
--- a/ui/gtk/sctp_error_dlg.c
+++ b/ui/gtk/sctp_error_dlg.c
@@ -34,7 +34,7 @@
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/main.h"
-#include "ui/sctp_stat.h"
+#include "ui/gtk/sctp_stat.h"
 #include "ui/gtk/gui_utils.h"
 
 static GtkWidget *sctp_error_dlg=NULL;
diff --git a/ui/gtk/sctp_graph_dlg.c b/ui/gtk/sctp_graph_dlg.c
index 37000a418d..c3597067bf 100644
--- a/ui/gtk/sctp_graph_dlg.c
+++ b/ui/gtk/sctp_graph_dlg.c
@@ -39,7 +39,7 @@
 
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/main.h"
-#include "ui/sctp_stat.h"
+#include "ui/gtk/sctp_stat.h"
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/old-gtk-compat.h"
 
diff --git a/ui/sctp_stat.c b/ui/gtk/sctp_stat.c
index 102e523157..5e050fc058 100644
--- a/ui/sctp_stat.c
+++ b/ui/gtk/sctp_stat.c
@@ -37,7 +37,7 @@
 #include "ui/simple_dialog.h"
 
 #include "ui/gtk/dlg_utils.h"
-#include "ui/sctp_stat.h"
+#include "ui/gtk/sctp_stat.h"
 #include "ui/gtk/main.h"
 
 #define SCTP_ABORT_CHUNK_T_BIT        0x01
diff --git a/ui/sctp_stat.h b/ui/gtk/sctp_stat.h
index d91e76ce50..d91e76ce50 100644
--- a/ui/sctp_stat.h
+++ b/ui/gtk/sctp_stat.h
diff --git a/ui/gtk/sctp_stat_dlg.c b/ui/gtk/sctp_stat_dlg.c
index 8d27876edc..9ed9cf3165 100644
--- a/ui/gtk/sctp_stat_dlg.c
+++ b/ui/gtk/sctp_stat_dlg.c
@@ -36,7 +36,7 @@
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/main.h"
-#include "ui/sctp_stat.h"
+#include "ui/gtk/sctp_stat.h"
 #include "ui/gtk/gtkglobals.h"
 
 #include "ui/gtk/old-gtk-compat.h"