aboutsummaryrefslogtreecommitdiffstats
path: root/ui/gtk
diff options
context:
space:
mode:
Diffstat (limited to 'ui/gtk')
-rw-r--r--ui/gtk/about_dlg.c6
-rw-r--r--ui/gtk/file_import_dlg.c4
-rw-r--r--ui/gtk/follow_stream.c5
-rw-r--r--ui/gtk/main.c13
-rw-r--r--ui/gtk/main_titlebar.c4
-rw-r--r--ui/gtk/main_welcome.c6
-rw-r--r--ui/gtk/summary_dlg.c5
7 files changed, 22 insertions, 21 deletions
diff --git a/ui/gtk/about_dlg.c b/ui/gtk/about_dlg.c
index 904680e5d2..a7b251defc 100644
--- a/ui/gtk/about_dlg.c
+++ b/ui/gtk/about_dlg.c
@@ -30,6 +30,7 @@
#include <wsutil/filesystem.h>
#include <wsutil/plugins.h>
#include <wsutil/copyright_info.h>
+#include <wsutil/ws_version_info.h>
#ifdef HAVE_LIBSMI
#include <epan/oids.h>
#endif
@@ -41,7 +42,6 @@
#endif
#include "../log.h"
-#include "../version_info.h"
#include "../register.h"
#include "ui/last_open_dir.h"
@@ -314,7 +314,7 @@ about_wireshark_page_new(void)
/* Construct the message string */
message = g_strdup_printf(
- "Version " VERSION "%s\n"
+ "Version %s\n"
"\n"
"%s"
"\n"
@@ -325,7 +325,7 @@ about_wireshark_page_new(void)
"Wireshark is Open Source Software released under the GNU General Public License.\n"
"\n"
"Check the man page and http://www.wireshark.org for more information.",
- wireshark_gitversion, get_copyright_info(), comp_info_str->str,
+ get_ws_vcs_version_info(), get_copyright_info(), comp_info_str->str,
runtime_info_str->str);
msg_label = gtk_label_new(message);
diff --git a/ui/gtk/file_import_dlg.c b/ui/gtk/file_import_dlg.c
index d2a288d34f..fc0c4ec384 100644
--- a/ui/gtk/file_import_dlg.c
+++ b/ui/gtk/file_import_dlg.c
@@ -31,7 +31,6 @@
#include "globals.h"
#include "wtap.h"
#include "pcap-encap.h"
-#include "version_info.h"
#include "ui/simple_dialog.h"
#include "ui/alert_box.h"
@@ -51,6 +50,7 @@
#include "wsutil/file_util.h"
#include "wsutil/tempfile.h"
#include "wsutil/os_version_info.h"
+#include "wsutil/ws_version_info.h"
#define INPUT_FRM_KEY "input_frame"
@@ -474,7 +474,7 @@ file_import_open(text_import_info_t *info)
os_info_str = g_string_new("");
get_os_version_info(os_info_str);
- g_snprintf(appname, sizeof(appname), "Wireshark " VERSION "%s", wireshark_gitversion);
+ g_snprintf(appname, sizeof(appname), "Wireshark %s", get_ws_vcs_version_info());
shb_hdr = g_new(wtapng_section_t,1);
shb_hdr->section_length = -1;
diff --git a/ui/gtk/follow_stream.c b/ui/gtk/follow_stream.c
index 16a8898530..3b548efc52 100644
--- a/ui/gtk/follow_stream.c
+++ b/ui/gtk/follow_stream.c
@@ -44,6 +44,7 @@
#include <ui/simple_dialog.h>
#include <wsutil/file_util.h>
+#include <wsutil/ws_version_info.h>
#include "ui/gtk/color_utils.h"
#include "ui/gtk/stock_icons.h"
@@ -61,8 +62,6 @@
#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
*/
@@ -458,7 +457,7 @@ follow_print_stream(GtkWidget * w _U_, gpointer data)
return;
}
- if (!print_preamble(stream, cfile.filename, wireshark_gitversion))
+ if (!print_preamble(stream, cfile.filename, get_ws_vcs_version_info()))
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 1d29eb2402..a1caf1acfa 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -64,6 +64,7 @@
#include <wsutil/u3.h>
#include <wsutil/copyright_info.h>
#include <wsutil/os_version_info.h>
+#include <wsutil/ws_version_info.h>
#include <wiretap/merge.h>
@@ -1165,12 +1166,12 @@ print_usage(gboolean print_ver) {
if (print_ver) {
output = stdout;
- fprintf(output, "Wireshark " VERSION "%s\n"
+ fprintf(output, "Wireshark %s\n"
"Interactively dump and analyze network traffic.\n"
"See http://www.wireshark.org for more information.\n"
"\n"
"%s",
- wireshark_gitversion, get_copyright_info());
+ get_ws_vcs_version_info(), get_copyright_info());
} else {
output = stderr;
}
@@ -1260,14 +1261,14 @@ print_usage(gboolean print_ver) {
static void
show_version(void)
{
- printf(PACKAGE " " VERSION "%s\n"
+ printf(PACKAGE " %s\n"
"\n"
"%s"
"\n"
"%s"
"\n"
"%s",
- wireshark_gitversion, get_copyright_info(), comp_info_str->str,
+ get_ws_vcs_version_info(), get_copyright_info(), comp_info_str->str,
runtime_info_str->str);
}
@@ -2253,12 +2254,12 @@ main(int argc, char *argv[])
get_runtime_version_info(runtime_info_str, get_gui_runtime_info);
#ifdef _WIN32
- ws_add_crash_info(PACKAGE " " VERSION "%s\n"
+ ws_add_crash_info(PACKAGE " %s\n"
"\n"
"%s"
"\n"
"%s",
- wireshark_gitversion, comp_info_str->str, runtime_info_str->str);
+ get_ws_vcs_version_info(), comp_info_str->str, runtime_info_str->str);
/* Start windows sockets */
WSAStartup( MAKEWORD( 1, 1 ), &wsaData );
diff --git a/ui/gtk/main_titlebar.c b/ui/gtk/main_titlebar.c
index b703f43cc7..caf70ece9f 100644
--- a/ui/gtk/main_titlebar.c
+++ b/ui/gtk/main_titlebar.c
@@ -33,7 +33,7 @@
#include "gui_utils.h"
#include "main_titlebar.h"
-#include "../version_info.h"
+#include <wsutil/ws_version_info.h>
/*
* Key to attach the "un-decorated" title to the window, so that if the
@@ -76,7 +76,7 @@ main_titlebar_update(void)
if ((prefs.gui_version_placement == version_title_only) ||
(prefs.gui_version_placement == version_both)) {
gchar *old_title = title;
- title = g_strdup_printf("%s [Wireshark %s %s]", title, VERSION, wireshark_gitversion);
+ title = g_strdup_printf("%s [Wireshark %s]", title, get_ws_vcs_version_info());
g_free(old_title);
}
gtk_window_set_title(GTK_WINDOW(top_level), title);
diff --git a/ui/gtk/main_welcome.c b/ui/gtk/main_welcome.c
index 674a63984b..ca34a12230 100644
--- a/ui/gtk/main_welcome.c
+++ b/ui/gtk/main_welcome.c
@@ -37,6 +37,7 @@
#include <wsutil/file_util.h>
#include <wsutil/str_util.h>
+#include <wsutil/ws_version_info.h>
#ifdef HAVE_LIBPCAP
#include "ui/iface_lists.h"
@@ -65,7 +66,6 @@
#include "ui/gtk/webbrowser.h"
#endif
#endif /* HAVE_LIBPCAP */
-#include "../version_info.h"
#ifdef _WIN32
#include <tchar.h>
@@ -335,8 +335,8 @@ welcome_header_set_message(gchar *msg) {
if ((prefs.gui_version_placement == version_welcome_only) ||
(prefs.gui_version_placement == version_both)) {
- g_string_append_printf(message, "</span>\n<span size=\"large\" foreground=\"white\">Version " VERSION "%s",
- wireshark_gitversion);
+ g_string_append_printf(message, "</span>\n<span size=\"large\" foreground=\"white\">Version %s",
+ get_ws_vcs_version_info());
}
}
diff --git a/ui/gtk/summary_dlg.c b/ui/gtk/summary_dlg.c
index b01a62138e..ef53201528 100644
--- a/ui/gtk/summary_dlg.c
+++ b/ui/gtk/summary_dlg.c
@@ -31,11 +31,12 @@
#include <wiretap/wtap.h>
+#include <wsutil/ws_version_info.h>
+
#include "../globals.h"
#include "../file.h"
#include "../summary.h"
#include "../capture-pcap-util.h"
-#include "../version_info.h"
#ifdef HAVE_LIBPCAP
#include "../capture.h"
@@ -666,7 +667,7 @@ summary_to_texbuff(GtkTextBuffer *buffer)
#endif
/* Add Wireshark version*/
- g_snprintf(string_buff, SUM_STR_MAX, "Summary created by Wireshark %s\n\n", wireshark_gitversion);
+ g_snprintf(string_buff, SUM_STR_MAX, "Summary created by Wireshark %s\n\n", get_ws_vcs_version_info());
gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
/* Info about file */
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-14 06:19:19 +0000