diff options
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gtk/main.c | 13 | ||||
| -rw-r--r-- | ui/qt/main.cpp | 13 |
2 files changed, 10 insertions, 16 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" diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp index 4449a0aa98..8a05d8cc49 100644 --- a/ui/qt/main.cpp +++ b/ui/qt/main.cpp @@ -571,17 +571,14 @@ int main(int argc, char *argv[]) }; static const char optstring[] = OPTSTRING; - /* Assemble the compile-time version information string */ - comp_info_str = g_string_new("Compiled "); - - // xxx qtshark - get_compiled_version_info(comp_info_str, get_wireshark_qt_compiled_info, - get_gui_compiled_info); + /* Get the compile-time version information string */ + // XXX qtshark + comp_info_str = get_compiled_version_info(get_wireshark_qt_compiled_info, + get_gui_compiled_info); /* Assemble the run-time version information string */ - runtime_info_str = g_string_new("Running "); // xxx qtshark - get_runtime_version_info(runtime_info_str, get_wireshark_runtime_info); + 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" |