Clean up the word wrap stuff a bit. (Arguably, that should be done in

the code that displays it - we might, for example, be able to have the
About dialog word-wrap to the appropriate size, and word-wrap text
printed to the standard output to the terminal width if it's going to a
terminal and to 80 or whatever columns otherwise.)

Don't report anything in dumpcap about libraries not used by dumpcap. 
(It was printing a blank, which looked a bit weird.)

Fix the handling of _MSC_VER as per Gerald's fix for _MSC_FULL_VER.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19618 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 5 insertions, 2 deletions

diff --git a/gtk/main.c b/gtk/main.c
index cc78a274f0..7ddf4baa8d 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -2003,9 +2003,12 @@ static void main_cf_callback(gint event, gpointer data, gpointer user_data _U_)
 }
 
 static void
-portaudio_info(GString *str)
+get_epan_and_portaudio_version_info(GString *str)
 {
+  get_epan_compiled_version_info(str);
+
 #ifdef HAVE_LIBPORTAUDIO
+  g_string_append(str, ", ");
 #ifdef PORTAUDIO_API_1
   g_string_append(str, "with PortAudio <= V18");
 #else /* PORTAUDIO_API_1 */
@@ -2120,7 +2123,7 @@ main(int argc, char *argv[])
 #endif
   g_string_append(comp_info_str, ", ");
 
-  get_compiled_version_info(comp_info_str, portaudio_info);
+  get_compiled_version_info(comp_info_str, get_epan_and_portaudio_version_info);
 
   /* Assemble the run-time version information string */
   runtime_info_str = g_string_new("Running ");