aboutsummaryrefslogtreecommitdiffstats
path: root/ui/gtk
diff options
context:
space:
mode:
Diffstat (limited to 'ui/gtk')
-rw-r--r--ui/gtk/follow_stream.c6
-rw-r--r--ui/gtk/main.c2
-rw-r--r--ui/gtk/main_menubar.c3
-rw-r--r--ui/gtk/packet_win.c2
-rw-r--r--ui/gtk/prefs_dlg.c2
-rw-r--r--ui/gtk/print_dlg.c2
6 files changed, 9 insertions, 8 deletions
diff --git a/ui/gtk/follow_stream.c b/ui/gtk/follow_stream.c
index e08ae18420..f43fdaf7f5 100644
--- a/ui/gtk/follow_stream.c
+++ b/ui/gtk/follow_stream.c
@@ -40,7 +40,7 @@
#include <epan/charsets.h>
#include <../isprint.h>
-#include <../print.h>
+#include <epan/print.h>
#include <ui/alert_box.h>
#include <ui/last_open_dir.h>
@@ -64,6 +64,8 @@
#include "ui/win32/print_win32.h"
#endif
+#include "version_info.h"
+
/* static variable declarations to speed up the performance
* of follow_load_text and follow_add_to_gtk_text
*/
@@ -459,7 +461,7 @@ follow_print_stream(GtkWidget * w _U_, gpointer data)
return;
}
- if (!print_preamble(stream, cfile.filename))
+ if (!print_preamble(stream, cfile.filename, wireshark_svnversion))
goto print_error;
switch (follow_read_stream(follow_info, follow_print_text, stream)) {
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index 30395d9c9c..812777b490 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -86,6 +86,7 @@
#include <epan/uat.h>
#include <epan/column.h>
#include <epan/disabled_protos.h>
+#include <epan/print.h>
/* general (not GTK specific) */
#include "../file.h"
@@ -94,7 +95,6 @@
#include "../filters.h"
#include "../color.h"
#include "../color_filters.h"
-#include "../print.h"
#include "../register.h"
#include "../ringbuffer.h"
#include "ui/util.h"
diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c
index a968920c62..e9b9081753 100644
--- a/ui/gtk/main_menubar.c
+++ b/ui/gtk/main_menubar.c
@@ -42,12 +42,11 @@
#include <epan/epan_dissect.h>
#include <epan/column.h>
#include <epan/stats_tree_priv.h>
-
#include <epan/filesystem.h>
+#include <epan/print.h>
#include "cfile.h"
#include "globals.h"
-#include "print.h"
#include "color_filters.h"
#include "stat_menu.h"
#include "u3.h"
diff --git a/ui/gtk/packet_win.c b/ui/gtk/packet_win.c
index 5cb45dfff8..541e9c1a68 100644
--- a/ui/gtk/packet_win.c
+++ b/ui/gtk/packet_win.c
@@ -51,9 +51,9 @@
#include <epan/epan_dissect.h>
#include <epan/strutil.h>
#include <epan/tvbuff-int.h>
+#include <epan/print.h>
#include "../file.h"
-#include "../print.h"
#include "../summary.h"
#include "ui/recent.h"
diff --git a/ui/gtk/prefs_dlg.c b/ui/gtk/prefs_dlg.c
index 54fbe51039..9bc073f72a 100644
--- a/ui/gtk/prefs_dlg.c
+++ b/ui/gtk/prefs_dlg.c
@@ -33,9 +33,9 @@
#include <epan/strutil.h>
#include <epan/prefs-int.h>
#include <epan/epan_dissect.h>
+#include <epan/print.h>
#include "../file.h"
-#include "../print.h"
#include "ui/preference_utils.h"
#include "ui/simple_dialog.h"
diff --git a/ui/gtk/print_dlg.c b/ui/gtk/print_dlg.c
index bfbb640eec..54036b3622 100644
--- a/ui/gtk/print_dlg.c
+++ b/ui/gtk/print_dlg.c
@@ -31,8 +31,8 @@
#include <epan/prefs.h>
#include <epan/epan_dissect.h>
#include <epan/filesystem.h>
+#include <epan/print.h>
-#include "print.h"
#include "ui/alert_box.h"
#include "ui/simple_dialog.h"
#include "ui/util.h"