diff options
| -rw-r--r-- | ui/Makefile.common | 2 | ||||
| -rw-r--r-- | ui/cli/tap-rtp.c | 1 | ||||
| -rw-r--r-- | ui/gtk/Makefile.common | 1 | ||||
| -rw-r--r-- | ui/gtk/iax2_analysis.c | 4 | ||||
| -rw-r--r-- | ui/gtk/libgtkui.vcproj | 4 | ||||
| -rw-r--r-- | ui/gtk/rtp_analysis.c | 4 | ||||
| -rw-r--r-- | ui/gtk/rtp_stream.c | 3 | ||||
| -rw-r--r-- | ui/gtk/rtp_stream_dlg.c | 4 | ||||
| -rw-r--r-- | ui/gtk/voip_calls_dlg.c | 2 | ||||
| -rw-r--r-- | ui/rtp_analysis.h (renamed from ui/gtk/rtp_analysis.h) | 0 | ||||
| -rw-r--r-- | ui/rtp_stream.h (renamed from ui/gtk/rtp_stream.h) | 0 | ||||
| -rw-r--r-- | ui/tap-rtp-common.c | 2 | ||||
| -rw-r--r-- | ui/tap-rtp-common.h | 2 |
13 files changed, 15 insertions, 14 deletions
diff --git a/ui/Makefile.common b/ui/Makefile.common index 93eb221065..485eb77126 100644 --- a/ui/Makefile.common +++ b/ui/Makefile.common @@ -82,6 +82,8 @@ noinst_HEADERS = \ progress_dlg.h \ recent.h \ recent_utils.h \ + rtp_analysis.h \ + rtp_stream.h \ simple_dialog.h \ software_update.h \ ssl_key_export.h \ diff --git a/ui/cli/tap-rtp.c b/ui/cli/tap-rtp.c index da8809590f..f99eb1e350 100644 --- a/ui/cli/tap-rtp.c +++ b/ui/cli/tap-rtp.c @@ -45,6 +45,7 @@ #include <epan/rtp_pt.h> #include <epan/stat_cmd_args.h> #include <epan/addr_resolv.h> +#include "ui/rtp_stream.h" #include "ui/tap-rtp-common.h" /* The one and only global rtpstream_tapinfo_t structure for tshark and wireshark. diff --git a/ui/gtk/Makefile.common b/ui/gtk/Makefile.common index db96be58d2..fb085f6088 100644 --- a/ui/gtk/Makefile.common +++ b/ui/gtk/Makefile.common @@ -334,7 +334,6 @@ noinst_HEADERS = \ remote_icons.h \ rtp_analysis.h \ rtp_player.h \ - rtp_stream.h \ rtp_stream_dlg.h \ sat.h \ sctp_stat.h \ diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c index 0a6f8e0ec4..2ae2d2e171 100644 --- a/ui/gtk/iax2_analysis.c +++ b/ui/gtk/iax2_analysis.c @@ -81,9 +81,9 @@ #include "ui/gtk/gui_utils.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/main.h" -#include "ui/gtk/rtp_analysis.h" +#include "ui/rtp_analysis.h" #include "ui/gtk/iax2_analysis.h" -#include "ui/gtk/rtp_stream.h" +#include "ui/rtp_stream.h" #include "ui/gtk/rtp_stream_dlg.h" #include "ui/gtk/old-gtk-compat.h" #include "ui/gtk/gui_utils.h" diff --git a/ui/gtk/libgtkui.vcproj b/ui/gtk/libgtkui.vcproj index ab5be3088c..a9f9e1ace4 100644 --- a/ui/gtk/libgtkui.vcproj +++ b/ui/gtk/libgtkui.vcproj @@ -991,7 +991,7 @@ > </File> <File - RelativePath=".\rtp_analysis.h" + RelativePath="..\rtp_analysis.h" > </File> <File @@ -999,7 +999,7 @@ > </File> <File - RelativePath=".\rtp_stream.h" + RelativePath="..\rtp_stream.h" > </File> <File diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c index a4b86a0519..e92c9c1cb7 100644 --- a/ui/gtk/rtp_analysis.c +++ b/ui/gtk/rtp_analysis.c @@ -81,8 +81,8 @@ #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/pixmap_save.h" #include "ui/gtk/main.h" -#include "ui/gtk/rtp_analysis.h" -#include "ui/gtk/rtp_stream.h" +#include "ui/rtp_analysis.h" +#include "ui/rtp_stream.h" #include "ui/gtk/rtp_stream_dlg.h" #include "ui/gtk/stock_icons.h" diff --git a/ui/gtk/rtp_stream.c b/ui/gtk/rtp_stream.c index 766e7c97dc..3b373d0ed9 100644 --- a/ui/gtk/rtp_stream.c +++ b/ui/gtk/rtp_stream.c @@ -43,10 +43,11 @@ #include "../globals.h" #include "ui/alert_box.h" #include "ui/simple_dialog.h" +#include "ui/rtp_stream.h" #include "ui/tap-rtp-common.h" #include <wsutil/file_util.h> -#include "ui/gtk/rtp_stream.h" +#include "ui/rtp_stream.h" #include "ui/gtk/rtp_stream_dlg.h" #include "ui/gtk/main.h" diff --git a/ui/gtk/rtp_stream_dlg.c b/ui/gtk/rtp_stream_dlg.c index ff6a32360c..d6fb56c8b0 100644 --- a/ui/gtk/rtp_stream_dlg.c +++ b/ui/gtk/rtp_stream_dlg.c @@ -50,8 +50,8 @@ #include "ui/gtk/file_dlg.h" #include "ui/gtk/gui_utils.h" #include "ui/gtk/gtkglobals.h" -#include "ui/gtk/rtp_stream.h" -#include "ui/gtk/rtp_analysis.h" +#include "ui/rtp_stream.h" +#include "ui/rtp_analysis.h" #include "ui/gtk/stock_icons.h" #include "ui/gtk/old-gtk-compat.h" diff --git a/ui/gtk/voip_calls_dlg.c b/ui/gtk/voip_calls_dlg.c index 292fea427c..a05983c57a 100644 --- a/ui/gtk/voip_calls_dlg.c +++ b/ui/gtk/voip_calls_dlg.c @@ -64,7 +64,7 @@ #include "ui/gtk/stock_icons.h" #ifdef HAVE_LIBPORTAUDIO -#include "ui/gtk/rtp_analysis.h" +#include "ui/rtp_analysis.h" #include "ui/gtk/rtp_player.h" #endif /* HAVE_LIBPORTAUDIO */ diff --git a/ui/gtk/rtp_analysis.h b/ui/rtp_analysis.h index 2eb495c96b..2eb495c96b 100644 --- a/ui/gtk/rtp_analysis.h +++ b/ui/rtp_analysis.h diff --git a/ui/gtk/rtp_stream.h b/ui/rtp_stream.h index 059444b96d..059444b96d 100644 --- a/ui/gtk/rtp_stream.h +++ b/ui/rtp_stream.h diff --git a/ui/tap-rtp-common.c b/ui/tap-rtp-common.c index 00207a272e..2a474b0670 100644 --- a/ui/tap-rtp-common.c +++ b/ui/tap-rtp-common.c @@ -40,7 +40,7 @@ #include <epan/rtp_pt.h> #include <epan/addr_resolv.h> #include <epan/dissectors/packet-rtp.h> -#include "ui/gtk/rtp_stream.h" +#include "rtp_stream.h" #include "tap-rtp-common.h" /* XXX: are changes needed to properly handle situations where diff --git a/ui/tap-rtp-common.h b/ui/tap-rtp-common.h index 003f4f4771..fafe4a24c5 100644 --- a/ui/tap-rtp-common.h +++ b/ui/tap-rtp-common.h @@ -32,8 +32,6 @@ #ifndef TAP_RTP_COMMON_H_INCLUDED #define TAP_RTP_COMMON_H_INCLUDED -#include "ui/gtk/rtp_stream.h" - gint rtp_stream_info_cmp(gconstpointer, gconstpointer); void rtpstream_reset_cb(void*); void rtp_write_header(rtp_stream_info_t*, FILE*); |