As per a suggestion by Ulf Lamping, rename gtk_*.[ch] to gui_*.[ch], so

that it doesn't appear to be part of GTK+.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@15501 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index c880fda4d0da600cc46c6702660580a4bc54e1a5..5467cf495d6fe752bb608b8856f0248052dacedd 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -62,7 +62,7 @@ noinst_HEADERS = \
        graph_analysis.h \
        gsm_map_stat.h  \
        gtkglobals.h    \
        graph_analysis.h \
        gsm_map_stat.h  \
        gtkglobals.h    \

-       gtk_stat_util.h \
+       gui_stat_util.h \

        gui_prefs.h     \
        gui_utils.h     \
        help_dlg.h      \
        gui_prefs.h     \
        gui_utils.h     \
        help_dlg.h      \


@@ -91,7 +91,7 @@ noinst_HEADERS = \
        sat.h           \
        sctp_stat.h     \
        service_response_time_table.h   \
        sat.h           \
        sctp_stat.h     \
        service_response_time_table.h   \

-       gtk_stat_menu.h \
+       gui_stat_menu.h \

        stream_prefs.h  \
        summary_dlg.h   \
        supported_protos_dlg.h   \
        stream_prefs.h  \
        summary_dlg.h   \
        supported_protos_dlg.h   \

diff --git a/gtk/Makefile.common b/gtk/Makefile.common
index 0913d798831d221a6e8c1522c7c05b2a60fe8ac0..c0a46c87ce293ed005cf01fe362e961cb72bbf9d 100644 (file)
--- a/gtk/Makefile.common
+++ b/gtk/Makefile.common
@@ -65,7 +65,7 @@ ETHEREAL_GTK_SRC = \
        font_utils.c    \
        goto_dlg.c      \
        graph_analysis.c \
        font_utils.c    \
        goto_dlg.c      \
        graph_analysis.c \

-       gtk_stat_util.c \
+       gui_stat_util.c \

        gui_prefs.c     \
        gui_utils.c \
        help_dlg.c      \
        gui_prefs.c     \
        gui_utils.c \
        help_dlg.c      \

diff --git a/gtk/ansi_a_stat.c b/gtk/ansi_a_stat.c
index 97edeaa9dfd245f520da89d51d12a1205ee9e026..52ec6deccdbabc9e0450e0229ee1e9e15297391f 100644 (file)
--- a/gtk/ansi_a_stat.c
+++ b/gtk/ansi_a_stat.c
@@ -42,7 +42,7 @@
 #include "epan/value_string.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 #include "epan/value_string.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include "image/clist_ascend.xpm"
 #include "image/clist_descend.xpm"
 #include "simple_dialog.h"
 #include "image/clist_ascend.xpm"
 #include "image/clist_descend.xpm"
 #include "simple_dialog.h"

diff --git a/gtk/ansi_map_stat.c b/gtk/ansi_map_stat.c
index 3f460b89947ed53c31b02ab3e887650a66ba3954..529d2caa7efda983fd9b14417f179ea9010d6bb0 100644 (file)
--- a/gtk/ansi_map_stat.c
+++ b/gtk/ansi_map_stat.c
@@ -42,7 +42,7 @@
 #include "epan/value_string.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 #include "epan/value_string.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include "image/clist_ascend.xpm"
 #include "image/clist_descend.xpm"
 #include "simple_dialog.h"
 #include "image/clist_ascend.xpm"
 #include "image/clist_descend.xpm"
 #include "simple_dialog.h"

diff --git a/gtk/conversations_eth.c b/gtk/conversations_eth.c
index e582e30a58b118e591c243d2c4ec86f5d025fff7..1d2d0f093a80c52503089633c04fa2e79fdbf467 100644 (file)
--- a/gtk/conversations_eth.c
+++ b/gtk/conversations_eth.c
@@ -35,7 +35,7 @@
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include <epan/tap.h>
 #include "../register.h"
 #include "conversations_table.h"
 #include <epan/tap.h>
 #include "../register.h"
 #include "conversations_table.h"

diff --git a/gtk/conversations_fc.c b/gtk/conversations_fc.c
index 16e96f4c694a3b1419594923103ffde748a06409..45f1c89e6a8af272d58b70ecddbfedaabf076f48 100644 (file)
--- a/gtk/conversations_fc.c
+++ b/gtk/conversations_fc.c
@@ -35,7 +35,7 @@
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include <epan/tap.h>
 #include "../register.h"
 #include "conversations_table.h"
 #include <epan/tap.h>
 #include "../register.h"
 #include "conversations_table.h"

diff --git a/gtk/conversations_fddi.c b/gtk/conversations_fddi.c
index f27e89a9932b9927271ecbb80d7294d1a1091fc5..7687b79ed5b06726b799f031a32c40659cf91179 100644 (file)
--- a/gtk/conversations_fddi.c
+++ b/gtk/conversations_fddi.c
@@ -35,7 +35,7 @@
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include <epan/tap.h>
 #include "../register.h"
 #include "conversations_table.h"
 #include <epan/tap.h>
 #include "../register.h"
 #include "conversations_table.h"

diff --git a/gtk/conversations_ip.c b/gtk/conversations_ip.c
index 1ec3e4aa2fa7e54498fb3d657acf256f5f45d24b..119ca4897db68d4313ab9734d7d689a9ca62f8be 100644 (file)
--- a/gtk/conversations_ip.c
+++ b/gtk/conversations_ip.c
@@ -35,7 +35,7 @@
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include <epan/tap.h>
 #include "../register.h"
 #include "conversations_table.h"
 #include <epan/tap.h>
 #include "../register.h"
 #include "conversations_table.h"

diff --git a/gtk/conversations_ipx.c b/gtk/conversations_ipx.c
index 00e5393d91f3bcf475789fb6e1110da5ea0e457d..87b37f58d062892e85e30f4c8e5397a328e01d01 100644 (file)
--- a/gtk/conversations_ipx.c
+++ b/gtk/conversations_ipx.c
@@ -35,7 +35,7 @@
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include <epan/tap.h>
 #include "../register.h"
 #include "conversations_table.h"
 #include <epan/tap.h>
 #include "../register.h"
 #include "conversations_table.h"

diff --git a/gtk/conversations_jxta.c b/gtk/conversations_jxta.c
index 210ab4a49e0a505ffee0908acf93522228a2c1e3..3ec61b694c0a33d75daca6ef9cebc137b2aaceb7 100644 (file)
--- a/gtk/conversations_jxta.c
+++ b/gtk/conversations_jxta.c
@@ -36,7 +36,7 @@
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include <epan/tap.h>
 #include "../register.h"
 #include "conversations_table.h"
 #include <epan/tap.h>
 #include "../register.h"
 #include "conversations_table.h"

diff --git a/gtk/conversations_sctp.c b/gtk/conversations_sctp.c
index f6ea83df749e4ac746d72c1b6aaa7691dfcba79b..69427710dc96b7ae670b488d1884b641fd842561 100644 (file)
--- a/gtk/conversations_sctp.c
+++ b/gtk/conversations_sctp.c
@@ -35,7 +35,7 @@
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include <epan/tap.h>
 #include "../register.h"
 #include "conversations_table.h"
 #include <epan/tap.h>
 #include "../register.h"
 #include "conversations_table.h"

diff --git a/gtk/conversations_tcpip.c b/gtk/conversations_tcpip.c
index 1cbd3d4adc55549c633eb3b1ff0dbea5dfd198b3..f3a099f78762dffe2e8d1cded82fd8ec8c4e284f 100644 (file)
--- a/gtk/conversations_tcpip.c
+++ b/gtk/conversations_tcpip.c
@@ -35,7 +35,7 @@
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include <epan/tap.h>
 #include "../register.h"
 #include "conversations_table.h"
 #include <epan/tap.h>
 #include "../register.h"
 #include "conversations_table.h"

diff --git a/gtk/conversations_tr.c b/gtk/conversations_tr.c
index 8af5f7802bfcd709df15ad9005c1ff4ef2415b51..38a08de96b18657c2ed50094495d03d97cce2f90 100644 (file)
--- a/gtk/conversations_tr.c
+++ b/gtk/conversations_tr.c
@@ -35,7 +35,7 @@
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include <epan/tap.h>
 #include "../register.h"
 #include "conversations_table.h"
 #include <epan/tap.h>
 #include "../register.h"
 #include "conversations_table.h"

diff --git a/gtk/conversations_udpip.c b/gtk/conversations_udpip.c
index c8bf2ed70f58fb6e6da497f59cd868c1148e7109..da05d77932ce1049dec88ce2aeb0e325285972c5 100644 (file)
--- a/gtk/conversations_udpip.c
+++ b/gtk/conversations_udpip.c
@@ -35,7 +35,7 @@
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include <epan/tap.h>
 #include "../register.h"
 #include "conversations_table.h"
 #include <epan/tap.h>
 #include "../register.h"
 #include "conversations_table.h"

diff --git a/gtk/conversations_wlan.c b/gtk/conversations_wlan.c
index 3060d5f5621e1fe3cea66094cd036bd48587dd1a..9b7e04cbbbd23bcd9d447fedf14af9a364098252 100644 (file)
--- a/gtk/conversations_wlan.c
+++ b/gtk/conversations_wlan.c
@@ -35,7 +35,7 @@
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include <epan/tap.h>
 #include "../register.h"
 #include "conversations_table.h"
 #include <epan/tap.h>
 #include "../register.h"
 #include "conversations_table.h"

diff --git a/gtk/dcerpc_stat.c b/gtk/dcerpc_stat.c
index 88dca08a662a00d69648b1ffa4ee2dc79b3dee5a..464ea1637132da38e8db6eed55c8c963bb130ef8 100644 (file)
--- a/gtk/dcerpc_stat.c
+++ b/gtk/dcerpc_stat.c
@@ -42,7 +42,7 @@
 
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include "simple_dialog.h"
 #include "dlg_utils.h"
 #include "gui_utils.h"
 #include "simple_dialog.h"
 #include "dlg_utils.h"
 #include "gui_utils.h"

diff --git a/gtk/fc_stat.c b/gtk/fc_stat.c
index f95ebba00f54ecb30a88c406aa238a4526b91a84..a1d81782944565ab75104d4eb3eda1451f23364f 100644 (file)
--- a/gtk/fc_stat.c
+++ b/gtk/fc_stat.c
@@ -40,7 +40,7 @@
 
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include <epan/tap.h>
 #include <epan/dissectors/packet-fc.h>
 #include "../register.h"
 #include <epan/tap.h>
 #include <epan/dissectors/packet-fc.h>
 #include "../register.h"

diff --git a/gtk/flow_graph.c b/gtk/flow_graph.c
index 056a9147c0eae29906aee00c934d4d2e49a251ad..cdd92c2f56fa7259f1768c9ff2b4cec032830230 100644 (file)
--- a/gtk/flow_graph.c
+++ b/gtk/flow_graph.c
@@ -35,7 +35,7 @@
 #include "graph_analysis.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 #include "graph_analysis.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include "dlg_utils.h"
 #include "gui_utils.h"
 #include "compat_macros.h"
 #include "dlg_utils.h"
 #include "gui_utils.h"
 #include "compat_macros.h"

diff --git a/gtk/gsm_a_stat.c b/gtk/gsm_a_stat.c
index 2190a627a93dc21b135d7cc535dbb7c31594a527..dd6408dd5a89c3be1468a0a7410f7950d015c75b 100644 (file)
--- a/gtk/gsm_a_stat.c
+++ b/gtk/gsm_a_stat.c
@@ -42,7 +42,7 @@
 #include "epan/value_string.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 #include "epan/value_string.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include "image/clist_ascend.xpm"
 #include "image/clist_descend.xpm"
 #include "simple_dialog.h"
 #include "image/clist_ascend.xpm"
 #include "image/clist_descend.xpm"
 #include "simple_dialog.h"

diff --git a/gtk/gsm_map_stat.c b/gtk/gsm_map_stat.c
index d80b4e6dd50dc088e15fecee31060f1f57c6133f..85831314fe6ca449e6dd95fa69b912ee0cf714bc 100644 (file)
--- a/gtk/gsm_map_stat.c
+++ b/gtk/gsm_map_stat.c
@@ -42,7 +42,7 @@
 #include "epan/value_string.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 #include "epan/value_string.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include "image/clist_ascend.xpm"
 #include "image/clist_descend.xpm"
 #include "simple_dialog.h"
 #include "image/clist_ascend.xpm"
 #include "image/clist_descend.xpm"
 #include "simple_dialog.h"

diff --git a/gtk/gsm_map_summary.c b/gtk/gsm_map_summary.c
index 3fbc701a011a3e76639754a835e7799bc3271729..dc4c288402497d3c67ebbb21a03f4abe2d753e87 100644 (file)
--- a/gtk/gsm_map_summary.c
+++ b/gtk/gsm_map_summary.c
@@ -39,7 +39,7 @@
 #include "epan/epan.h"
 #include "epan/value_string.h"
 #include "../stat_menu.h"
 #include "epan/epan.h"
 #include "epan/value_string.h"
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include "globals.h"
 #include "file.h"
 #include "summary.h"
 #include "globals.h"
 #include "file.h"
 #include "summary.h"

diff --git a/gtk/gtk_stat_menu.h b/gtk/gui_stat_menu.h
similarity index 99%
rename from gtk/gtk_stat_menu.h
rename to gtk/gui_stat_menu.h
index fc149a76aab48a3d4e9c2f927fe34df92f292897..52feb0673c4e367a505dd93fb2be147fafc3d139 100644 (file)
--- a/gtk/gtk_stat_menu.h
+++ b/gtk/gui_stat_menu.h
@@ -1,4 +1,4 @@
-/* gtk_stat_menu.h
+/* gui_stat_menu.h

  * GTK+-specific menu definitions for use by stats
  *
  * $Id$
  * GTK+-specific menu definitions for use by stats
  *
  * $Id$

diff --git a/gtk/gtk_stat_util.c b/gtk/gui_stat_util.c
similarity index 98%
rename from gtk/gtk_stat_util.c
rename to gtk/gui_stat_util.c
index 97c2f970f28b067e5283a9068da2adb661716ba3..81418cb89a642748fdd7d52bf1293dcb4e742682 100644 (file)
--- a/gtk/gtk_stat_util.c
+++ b/gtk/gui_stat_util.c
@@ -1,4 +1,4 @@
-/* gtk_stat_util.c
+/* gui_stat_util.c

  * gui functions used by stats
  * Copyright 2003 Lars Roland
  *
  * gui functions used by stats
  * Copyright 2003 Lars Roland
  *


@@ -35,7 +35,7 @@
 
 #include <gtk/gtk.h>
 #include <string.h>
 
 #include <gtk/gtk.h>
 #include <string.h>

-#include "gtk_stat_util.h"
+#include "gui_stat_util.h"

 #include "compat_macros.h"
 #include "../simple_dialog.h"
 #include "../file.h"
 #include "compat_macros.h"
 #include "../simple_dialog.h"
 #include "../file.h"

diff --git a/gtk/gtk_stat_util.h b/gtk/gui_stat_util.h
similarity index 98%
rename from gtk/gtk_stat_util.h
rename to gtk/gui_stat_util.h
index 3287cab81d63f969a5c6f04529695d0438f9cc8d..676563d0bb97e4b1295dc31c4978cc787691f546 100644 (file)
--- a/gtk/gtk_stat_util.h
+++ b/gtk/gui_stat_util.h
@@ -1,4 +1,4 @@
-/* gtk_stat_util.h
+/* gui_stat_util.h

  * gui functions used by stats
  * Copyright 2003 Lars Roland
  *
  * gui functions used by stats
  * Copyright 2003 Lars Roland
  *

diff --git a/gtk/h225_counter.c b/gtk/h225_counter.c
index 594198ed74d6784f4407e653163d6b8f06299608..185b7b65baf41f2372196cfa3a7e612a5b7dd05b 100644 (file)
--- a/gtk/h225_counter.c
+++ b/gtk/h225_counter.c
@@ -42,7 +42,7 @@
 #include <epan/tap.h>
 #include "../register.h"
 #include <epan/dissectors/packet-h225.h>
 #include <epan/tap.h>
 #include "../register.h"
 #include <epan/dissectors/packet-h225.h>

-#include "gtk_stat_util.h"
+#include "gui_stat_util.h"

 #include "compat_macros.h"
 #include "../simple_dialog.h"
 #include "dlg_utils.h"
 #include "compat_macros.h"
 #include "../simple_dialog.h"
 #include "dlg_utils.h"

diff --git a/gtk/h225_ras_srt.c b/gtk/h225_ras_srt.c
index 3fac6cd04c4493057e199263a55de0140b462793..89641f59d5424b2d77c6fa51afef12ebd48a88f0 100644 (file)
--- a/gtk/h225_ras_srt.c
+++ b/gtk/h225_ras_srt.c
@@ -43,7 +43,7 @@
 #include "../register.h"
 #include <epan/dissectors/packet-h225.h>
 #include "../timestats.h"
 #include "../register.h"
 #include <epan/dissectors/packet-h225.h>
 #include "../timestats.h"

-#include "gtk_stat_util.h"
+#include "gui_stat_util.h"

 #include "compat_macros.h"
 #include "../simple_dialog.h"
 #include "dlg_utils.h"
 #include "compat_macros.h"
 #include "../simple_dialog.h"
 #include "dlg_utils.h"

diff --git a/gtk/hostlist_eth.c b/gtk/hostlist_eth.c
index cca7d01640a313990638431e60c10e962c1991ab..5c0fcbc1ca4f166584d693cb16b94921a811069f 100644 (file)
--- a/gtk/hostlist_eth.c
+++ b/gtk/hostlist_eth.c
@@ -35,7 +35,7 @@
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include <epan/tap.h>
 #include "../register.h"
 #include "hostlist_table.h"
 #include <epan/tap.h>
 #include "../register.h"
 #include "hostlist_table.h"

diff --git a/gtk/hostlist_fc.c b/gtk/hostlist_fc.c
index c3af37242b7b2f539f90970e079fffde12caf871..2260d2980e3c27b2f05917a0a0d294563ee7455c 100644 (file)
--- a/gtk/hostlist_fc.c
+++ b/gtk/hostlist_fc.c
@@ -35,7 +35,7 @@
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include <epan/tap.h>
 #include "../register.h"
 #include "hostlist_table.h"
 #include <epan/tap.h>
 #include "../register.h"
 #include "hostlist_table.h"

diff --git a/gtk/hostlist_fddi.c b/gtk/hostlist_fddi.c
index ce78f8bd3cbf46bfe4b9df7b0aa1b18396dc511b..17d0dfe667dbaa4929e54d597d25203a4c2bc1e7 100644 (file)
--- a/gtk/hostlist_fddi.c
+++ b/gtk/hostlist_fddi.c
@@ -35,7 +35,7 @@
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include <epan/tap.h>
 #include "../register.h"
 #include "hostlist_table.h"
 #include <epan/tap.h>
 #include "../register.h"
 #include "hostlist_table.h"

diff --git a/gtk/hostlist_ip.c b/gtk/hostlist_ip.c
index 67d5fbe11bb955bf139d35cfbf22309a6f0ff682..c6ebae854073b2bd072d5e1e701ccac4b6572b43 100644 (file)
--- a/gtk/hostlist_ip.c
+++ b/gtk/hostlist_ip.c
@@ -37,7 +37,7 @@
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include <epan/tap.h>
 #include "../register.h"
 #include "hostlist_table.h"
 #include <epan/tap.h>
 #include "../register.h"
 #include "hostlist_table.h"

diff --git a/gtk/hostlist_ipx.c b/gtk/hostlist_ipx.c
index 875f9cd0e06cac972071b0d433c31b1fe1b45e17..28886a9fa17175001c45b7adb5ca9a7efef2dae0 100644 (file)
--- a/gtk/hostlist_ipx.c
+++ b/gtk/hostlist_ipx.c
@@ -35,7 +35,7 @@
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include <epan/tap.h>
 #include "../register.h"
 #include "hostlist_table.h"
 #include <epan/tap.h>
 #include "../register.h"
 #include "hostlist_table.h"

diff --git a/gtk/hostlist_jxta.c b/gtk/hostlist_jxta.c
index ca028f5c94f48b5ce78b091cf8416acc52bbf318..7e10849cc54f553044b08b6cd03f653911a58a2d 100644 (file)
--- a/gtk/hostlist_jxta.c
+++ b/gtk/hostlist_jxta.c
@@ -35,7 +35,7 @@
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include <epan/tap.h>
 #include "../register.h"
 #include "hostlist_table.h"
 #include <epan/tap.h>
 #include "../register.h"
 #include "hostlist_table.h"

diff --git a/gtk/hostlist_tcpip.c b/gtk/hostlist_tcpip.c
index da0edb7054a2e5e695c5f8ebf2c404cf11147566..b0b3332a81bebc0f70daa7c35ef7788b0629fc3f 100644 (file)
--- a/gtk/hostlist_tcpip.c
+++ b/gtk/hostlist_tcpip.c
@@ -35,7 +35,7 @@
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include <epan/tap.h>
 #include "../register.h"
 #include "hostlist_table.h"
 #include <epan/tap.h>
 #include "../register.h"
 #include "hostlist_table.h"

diff --git a/gtk/hostlist_tr.c b/gtk/hostlist_tr.c
index 4795c70922d72aa0ac1dc441947e7deca681ac8e..73b02698f65e3ce11e3582118b58a2a35506efb3 100644 (file)
--- a/gtk/hostlist_tr.c
+++ b/gtk/hostlist_tr.c
@@ -35,7 +35,7 @@
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include <epan/tap.h>
 #include "../register.h"
 #include "hostlist_table.h"
 #include <epan/tap.h>
 #include "../register.h"
 #include "hostlist_table.h"

diff --git a/gtk/hostlist_udpip.c b/gtk/hostlist_udpip.c
index d92a414b4d2730e21f5ce3bb828d5817f0c3010c..71aec7bf98295e98628ab827b81bcdc8b13f5b54 100644 (file)
--- a/gtk/hostlist_udpip.c
+++ b/gtk/hostlist_udpip.c
@@ -35,7 +35,7 @@
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include <epan/tap.h>
 #include "../register.h"
 #include "hostlist_table.h"
 #include <epan/tap.h>
 #include "../register.h"
 #include "hostlist_table.h"

diff --git a/gtk/hostlist_wlan.c b/gtk/hostlist_wlan.c
index 92df1bae64abf829eff8ec4ae33ea0ceebfe07ac..28bcd3ee0e956ee447fdba4dc066117dffc594b6 100644 (file)
--- a/gtk/hostlist_wlan.c
+++ b/gtk/hostlist_wlan.c
@@ -35,7 +35,7 @@
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include <epan/tap.h>
 #include "../register.h"
 #include "hostlist_table.h"
 #include <epan/tap.h>
 #include "../register.h"
 #include "hostlist_table.h"

diff --git a/gtk/io_stat.c b/gtk/io_stat.c
index bb5d6133a240ee9b3c877d2c7a6510ca23c5ab68..42274c9e15bcc5687cac3b61ba36f43e92bb1847 100644 (file)
--- a/gtk/io_stat.c
+++ b/gtk/io_stat.c
@@ -44,7 +44,7 @@
 #include "gui_utils.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 #include "gui_utils.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include <epan/tap.h>
 #include "../register.h"
 #include "alert_box.h"
 #include <epan/tap.h>
 #include "../register.h"
 #include "alert_box.h"

diff --git a/gtk/ldap_stat.c b/gtk/ldap_stat.c
index b0eae1307882f0b92bb324b9087c6b6270d9af0b..134844d2d4ea5b0d0bb9594c15a14e4331fe84a4 100644 (file)
--- a/gtk/ldap_stat.c
+++ b/gtk/ldap_stat.c
@@ -40,7 +40,7 @@
 
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include <epan/tap.h>
 #include <epan/dissectors/packet-ldap.h>
 #include "../register.h"
 #include <epan/tap.h>
 #include <epan/dissectors/packet-ldap.h>
 #include "../register.h"

diff --git a/gtk/menu.c b/gtk/menu.c
index 58d55a423175e27fe49d08226cd0f2d0cf640af4..7cdec439fa731b538d7173b105dcd3a15365fb2f 100644 (file)
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -33,7 +33,7 @@
 #include "main.h"
 #include "menu.h"
 #include "../stat_menu.h"
 #include "main.h"
 #include "menu.h"
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 #include <epan/prefs.h>
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 #include <epan/prefs.h>

diff --git a/gtk/mgcp_stat.c b/gtk/mgcp_stat.c
index 07d80b77976408c62f3c023d8e0523546b2b53c9..398f52639f1bb8d60701ea91a21e5246e36f074f 100644 (file)
--- a/gtk/mgcp_stat.c
+++ b/gtk/mgcp_stat.c
@@ -43,7 +43,7 @@
 #include "../register.h"
 #include "../plugins/mgcp/packet-mgcp.h"
 #include "../timestats.h"
 #include "../register.h"
 #include "../plugins/mgcp/packet-mgcp.h"
 #include "../timestats.h"

-#include "gtk_stat_util.h"
+#include "gui_stat_util.h"

 #include "compat_macros.h"
 #include "../simple_dialog.h"
 #include "dlg_utils.h"
 #include "compat_macros.h"
 #include "../simple_dialog.h"
 #include "dlg_utils.h"

diff --git a/gtk/mtp3_stat.c b/gtk/mtp3_stat.c
index afc2a0a1b469dc082b1ff099177fc79d422fa863..269f956a860327bae7a3f988a58340de2ded210c 100644 (file)
--- a/gtk/mtp3_stat.c
+++ b/gtk/mtp3_stat.c
@@ -42,7 +42,7 @@
 #include "epan/value_string.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 #include "epan/value_string.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include "image/clist_ascend.xpm"
 #include "image/clist_descend.xpm"
 #include "simple_dialog.h"
 #include "image/clist_ascend.xpm"
 #include "image/clist_descend.xpm"
 #include "simple_dialog.h"

diff --git a/gtk/mtp3_summary.c b/gtk/mtp3_summary.c
index fbbddaf4ef892d3e6b27c3dec8f899a1b3f41843..9d24805979ad43ed98383de23e423579ce86d66e 100644 (file)
--- a/gtk/mtp3_summary.c
+++ b/gtk/mtp3_summary.c
@@ -40,7 +40,7 @@
 #include "epan/epan.h"
 #include "epan/value_string.h"
 #include "../stat_menu.h"
 #include "epan/epan.h"
 #include "epan/value_string.h"
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include "globals.h"
 #include "file.h"
 #include "summary.h"
 #include "globals.h"
 #include "file.h"
 #include "summary.h"

diff --git a/gtk/rpc_progs.c b/gtk/rpc_progs.c
index 4db1898e3a8d0b7fe3b373592152345ecc4ddcc6..a78095dcbfcdc1006218f51825b4156125dbf275 100644 (file)
--- a/gtk/rpc_progs.c
+++ b/gtk/rpc_progs.c
@@ -39,7 +39,7 @@
 
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include <epan/tap.h>
 #include "../register.h"
 #include <epan/dissectors/packet-rpc.h>
 #include <epan/tap.h>
 #include "../register.h"
 #include <epan/dissectors/packet-rpc.h>

diff --git a/gtk/rpc_stat.c b/gtk/rpc_stat.c
index df1fe00faf2e9442327bce113e97aba26a7aa2f8..2780167edd87b4c8d1d1ad3f8774203d2a5d2138 100644 (file)
--- a/gtk/rpc_stat.c
+++ b/gtk/rpc_stat.c
@@ -39,7 +39,7 @@
 
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include "simple_dialog.h"
 #include "gui_utils.h"
 #include "dlg_utils.h"
 #include "simple_dialog.h"
 #include "gui_utils.h"
 #include "dlg_utils.h"

diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c
index 2686da9e1d93f596aaa4f5da015959550b69524d..5b5fad735e86ff63cca80e8ce371e6bbb25e93b2 100644 (file)
--- a/gtk/rtp_analysis.c
+++ b/gtk/rtp_analysis.c
@@ -69,7 +69,7 @@
 #include "alert_box.h"
 #include "simple_dialog.h"
 #include "../stat_menu.h"
 #include "alert_box.h"
 #include "simple_dialog.h"
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include "main.h"
 #include "progress_dlg.h"
 #include "compat_macros.h"
 #include "main.h"
 #include "progress_dlg.h"
 #include "compat_macros.h"

diff --git a/gtk/rtp_stream_dlg.c b/gtk/rtp_stream_dlg.c
index 97dd6a1810a8894dceac153b80bf2b88285e23e8..0903fd35d2191015cdd1869bc8bae31185f2ff21 100644 (file)
--- a/gtk/rtp_stream_dlg.c
+++ b/gtk/rtp_stream_dlg.c
@@ -37,7 +37,7 @@
 #include "epan/filesystem.h"
 
 #include "../stat_menu.h"
 #include "epan/filesystem.h"
 
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include "dlg_utils.h"
 #include "gui_utils.h"
 #include "compat_macros.h"
 #include "dlg_utils.h"
 #include "gui_utils.h"
 #include "compat_macros.h"

diff --git a/gtk/sctp_assoc_analyse.c b/gtk/sctp_assoc_analyse.c
index d14b7c98f0ad675290db0891f4afb3d7ccef6582..aa3fda552da133a7680702dc48162b711091127b 100644 (file)
--- a/gtk/sctp_assoc_analyse.c
+++ b/gtk/sctp_assoc_analyse.c
@@ -34,7 +34,7 @@
 #include "epan/filesystem.h"
 #include "register.h"
 #include "../stat_menu.h"
 #include "epan/filesystem.h"
 #include "register.h"
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include "dlg_utils.h"
 #include "gui_utils.h"
 #include "main.h"
 #include "dlg_utils.h"
 #include "gui_utils.h"
 #include "main.h"

diff --git a/gtk/sctp_chunk_stat.c b/gtk/sctp_chunk_stat.c
index 9c36144b6eafc05ced78d77816858c00a2b3be78..75d4e668b8b8d5e478005223fc1b4e05905c3433 100644 (file)
--- a/gtk/sctp_chunk_stat.c
+++ b/gtk/sctp_chunk_stat.c
@@ -43,7 +43,7 @@
 #include <epan/tap.h>
 #include "../register.h"
 #include <epan/dissectors/packet-sctp.h>
 #include <epan/tap.h>
 #include "../register.h"
 #include <epan/dissectors/packet-sctp.h>

-#include "gtk_stat_util.h"
+#include "gui_stat_util.h"

 #include "compat_macros.h"
 #include "../simple_dialog.h"
 #include "dlg_utils.h"
 #include "compat_macros.h"
 #include "../simple_dialog.h"
 #include "dlg_utils.h"

diff --git a/gtk/sctp_stat_dlg.c b/gtk/sctp_stat_dlg.c
index 77067c48a6f4ef4dbaba4ce3ecd134ca665aa3ca..824e3873862cb9ef05aa80c7579b54f667f688b0 100644 (file)
--- a/gtk/sctp_stat_dlg.c
+++ b/gtk/sctp_stat_dlg.c
@@ -36,7 +36,7 @@
 #include "image/clist_descend.xpm"
 
 #include "../stat_menu.h"
 #include "image/clist_descend.xpm"
 
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include "dlg_utils.h"
 #include "gui_utils.h"
 #include "main.h"
 #include "dlg_utils.h"
 #include "gui_utils.h"
 #include "main.h"

diff --git a/gtk/tap_dfilter_dlg.c b/gtk/tap_dfilter_dlg.c
index 604688361e48e491f0502236ad0d2926a0587aba..967950e3310764595aab222e6b349147f51823b4 100644 (file)
--- a/gtk/tap_dfilter_dlg.c
+++ b/gtk/tap_dfilter_dlg.c
@@ -44,7 +44,7 @@
 #include "filter_dlg.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 #include "filter_dlg.h"
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include "../tap_dfilter_dlg.h"
 #include "gui_utils.h"
 #include "gtkglobals.h"
 #include "../tap_dfilter_dlg.h"
 #include "gui_utils.h"
 #include "gtkglobals.h"

diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c
index 951f6012f76e893dd207062dd0fd2f2e45189e75..a914c6c084e8f896a01484c459b49e14c8e2772f 100644 (file)
--- a/gtk/tcp_graph.c
+++ b/gtk/tcp_graph.c
@@ -46,7 +46,7 @@
 #include "dlg_utils.h"
 #include <epan/epan_dissect.h>
 #include "../stat_menu.h"
 #include "dlg_utils.h"
 #include <epan/epan_dissect.h>
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include <epan/dissectors/packet-tcp.h>
 #include <epan/address.h>
 #include <epan/tap.h>
 #include <epan/dissectors/packet-tcp.h>
 #include <epan/address.h>
 #include <epan/tap.h>

diff --git a/gtk/voip_calls_dlg.c b/gtk/voip_calls_dlg.c
index 7ab19896c12bd9e04b14abe93b202da38ff26dad..831c8f75e1761b29f50ce67195c89f99063e9a85 100644 (file)
--- a/gtk/voip_calls_dlg.c
+++ b/gtk/voip_calls_dlg.c
@@ -52,7 +52,7 @@
 #include <epan/tap.h>
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 #include <epan/tap.h>
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"

-#include "gtk_stat_menu.h"
+#include "gui_stat_menu.h"

 #include "dlg_utils.h"
 #include "gui_utils.h"
 #include "compat_macros.h"
 #include "dlg_utils.h"
 #include "gui_utils.h"
 #include "compat_macros.h"