diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-12-30 22:28:25 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-12-31 06:29:11 +0000 |
| commit | 27be466c9b6ac1bdd62a5b86bf9c684ac55482ee (patch) | |
| tree | ef81ff7dfb56101e3e1ce762c9a6a2c671c8d54d /ui/gtk/main.c | |
| parent | 84110d2981fbc017ef3771e8c051054b6546bc1f (diff) | |
Do the full string in get_{compiled,runtime}_version_info().
Have them start the string with "Compiled" or "Running on", and return
the string when done.
Change-Id: Ic4d290c963621fa0385dc5aab766fd4ad31d3810
Reviewed-on: https://code.wireshark.org/review/6155
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui/gtk/main.c')
| -rw-r--r-- | ui/gtk/main.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/ui/gtk/main.c b/ui/gtk/main.c index 1a3632adde..930c8d668d 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -2257,15 +2257,12 @@ main(int argc, char *argv[]) #endif /* HAVE_AIRPCAP */ #endif /* _WIN32 */ - /* Assemble the compile-time version information string */ - comp_info_str = g_string_new("Compiled "); + /* Get the compile-time version information string */ + comp_info_str = get_compiled_version_info(get_wireshark_gtk_compiled_info, + get_gui_compiled_info); - get_compiled_version_info(comp_info_str, get_wireshark_gtk_compiled_info, - get_gui_compiled_info); - - /* Assemble the run-time version information string */ - runtime_info_str = g_string_new("Running "); - get_runtime_version_info(runtime_info_str, get_wireshark_runtime_info); + /* Get the run-time version information string */ + runtime_info_str = get_runtime_version_info(get_wireshark_runtime_info); /* Add it to the information to be reported on a crash. */ ws_add_crash_info("Wireshark %s\n" |