diff options
author | Irene RĂ¼ngeler <I.Ruengeler@fh-muenster.de> | 2013-10-24 09:36:33 +0000 |
---|---|---|
committer | Irene RĂ¼ngeler <I.Ruengeler@fh-muenster.de> | 2013-10-24 09:36:33 +0000 |
commit | 9188e541084a74ffd2959b914b925854c0633330 (patch) | |
tree | 8ccdc570419c4361aaccfc589dd615cce0487082 /ui | |
parent | d803c5bf9cd7722ef82a8213ddfefdcd0c2a1697 (diff) | |
download | wireshark-9188e541084a74ffd2959b914b925854c0633330.tar.gz |
Move sctp_stat to ui to make it independent from gtk.
svn path=/trunk/; revision=52812
Diffstat (limited to 'ui')
-rw-r--r-- | ui/CMakeLists.txt | 1 | ||||
-rw-r--r-- | ui/Makefile.common | 2 | ||||
-rw-r--r-- | ui/gtk/CMakeLists.txt | 1 | ||||
-rw-r--r-- | ui/gtk/Makefile.common | 2 | ||||
-rw-r--r-- | ui/gtk/main_menubar.c | 2 | ||||
-rw-r--r-- | ui/gtk/sctp_assoc_analyse.c | 2 | ||||
-rw-r--r-- | ui/gtk/sctp_byte_graph_dlg.c | 2 | ||||
-rw-r--r-- | ui/gtk/sctp_chunk_stat.c | 2 | ||||
-rw-r--r-- | ui/gtk/sctp_chunk_stat_dlg.c | 2 | ||||
-rw-r--r-- | ui/gtk/sctp_error_dlg.c | 2 | ||||
-rw-r--r-- | ui/gtk/sctp_graph_dlg.c | 2 | ||||
-rw-r--r-- | ui/gtk/sctp_stat_dlg.c | 2 | ||||
-rw-r--r-- | ui/sctp_stat.c (renamed from ui/gtk/sctp_stat.c) | 2 | ||||
-rw-r--r-- | ui/sctp_stat.h (renamed from ui/gtk/sctp_stat.h) | 0 |
14 files changed, 12 insertions, 12 deletions
diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt index 73375a3654..2af79f9093 100644 --- a/ui/CMakeLists.txt +++ b/ui/CMakeLists.txt @@ -35,6 +35,7 @@ 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 fc4ceb8825..a34788b42b 100644 --- a/ui/Makefile.common +++ b/ui/Makefile.common @@ -56,6 +56,7 @@ WIRESHARK_UI_SRC = \ preference_utils.c \ profile.c \ recent.c \ + sctp_stat.c \ software_update.c \ ssl_key_export.c \ tap-megaco-common.c \ @@ -81,6 +82,7 @@ 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 9fd0e1a817..306309abb3 100644 --- a/ui/gtk/CMakeLists.txt +++ b/ui/gtk/CMakeLists.txt @@ -110,7 +110,6 @@ 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 db96be58d2..f3afa5fdaf 100644 --- a/ui/gtk/Makefile.common +++ b/ui/gtk/Makefile.common @@ -128,7 +128,6 @@ 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 \ @@ -337,7 +336,6 @@ 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 e30b1cdbb5..66c314def1 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/gtk/sctp_stat.h" +#include "ui/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 7844bc0a89..110f857774 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/gtk/sctp_stat.h" +#include "ui/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 8226635959..081bb66f58 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/gtk/sctp_stat.h" +#include "ui/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 84d68237fa..48d153182c 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/gtk/sctp_stat.h" +#include "ui/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 4a7e1bdd30..3a38e504eb 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/gtk/sctp_stat.h" +#include "ui/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 34d3b8a67d..0c4ce8dc0c 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/gtk/sctp_stat.h" +#include "ui/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 c3597067bf..37000a418d 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/gtk/sctp_stat.h" +#include "ui/sctp_stat.h" #include "ui/gtk/gui_utils.h" #include "ui/gtk/old-gtk-compat.h" diff --git a/ui/gtk/sctp_stat_dlg.c b/ui/gtk/sctp_stat_dlg.c index 9ed9cf3165..8d27876edc 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/gtk/sctp_stat.h" +#include "ui/sctp_stat.h" #include "ui/gtk/gtkglobals.h" #include "ui/gtk/old-gtk-compat.h" diff --git a/ui/gtk/sctp_stat.c b/ui/sctp_stat.c index 5e050fc058..102e523157 100644 --- a/ui/gtk/sctp_stat.c +++ b/ui/sctp_stat.c @@ -37,7 +37,7 @@ #include "ui/simple_dialog.h" #include "ui/gtk/dlg_utils.h" -#include "ui/gtk/sctp_stat.h" +#include "ui/sctp_stat.h" #include "ui/gtk/main.h" #define SCTP_ABORT_CHUNK_T_BIT 0x01 diff --git a/ui/gtk/sctp_stat.h b/ui/sctp_stat.h index d91e76ce50..d91e76ce50 100644 --- a/ui/gtk/sctp_stat.h +++ b/ui/sctp_stat.h |