Do the word-wrapping in end_string(), once the string is completely

constructed.  Clean up the insertion of ", ".

Put the runtime libpcap version into the runtime version info.

svn path=/trunk/; revision=19625

1 files changed, 6 insertions, 2 deletions

diff --git a/gtk/main.c b/gtk/main.c
index 5c56984cd3..4fa68ed5eb 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -2020,7 +2020,6 @@ get_gui_compiled_info(GString *str)
 #endif /* HAVE_LIBPORTAUDIO */
 
   g_string_append(str, ", ");
-
 #ifdef HAVE_AIRPCAP
   get_compiled_airpcap_version(str);
 #else
@@ -2029,9 +2028,14 @@ get_gui_compiled_info(GString *str)
 }
 
 static void
-get_gui_runtime_info(GString *str)
+get_gui_runtime_info(GString *str
+#ifndef HAVE_AIRPCAP
+	_U_
+#endif
+)
 {
 #ifdef HAVE_AIRPCAP
+  g_string_append(str, ", ");
   get_runtime_airpcap_version(str);
 #endif
 }