path: root/ui/gtk/file_import_dlg.c
diff options
authorGuy Harris <guy@alum.mit.edu>2014-06-21 18:02:27 -0700
committerGuy Harris <guy@alum.mit.edu>2014-06-22 01:06:25 +0000
commitc46329c27b8c31729d2d51dc4f69da9b3923de04 (patch)
tree196522550c36225b4248bc8c6ed2fb86d5b0ddab /ui/gtk/file_import_dlg.c
parenta70dea195625f32a026d10d937345d177f81aead (diff)
Add a routine to return a version string including VCS information.
Add a routine get_ws_vcs_version_info() that, for builds from a tree checked out from Wireshark's version control system, returns a string that includes both the Wireshark version number and an indication of what particular VCS version was checked out, and just returns Wireshark's version number for other builds. Use that routine rather than manually gluing VERSION and the Git version number together. ("vcs", not "git", just in case we do something bizarre or mercurial some day. :-)) Change-Id: Ie5c6dc83b9d3f56655eaef30fec3ec9916b6320d Reviewed-on: https://code.wireshark.org/review/2529 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui/gtk/file_import_dlg.c')
1 files changed, 2 insertions, 2 deletions
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("");
- 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;