Don't put a newline at the end of the compiled-with version information

- we don't put it at the end of the run-time version information.

Add newlines into formats used with that information where appropriate
(the "About" dialog box already had a newline in the format).

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

diff --git a/gtk/main.c b/gtk/main.c
index 17db2c843b1d7711b219d220e213216510e08faf..40e89749ef1a5df41db63f0baf3bb32438ced204 100644 (file)
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1,6 +1,6 @@
 /* main.c
  *
- * $Id: main.c,v 1.437 2004/05/21 00:18:46 guy Exp $
+ * $Id: main.c,v 1.438 2004/05/22 04:15:01 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -1310,7 +1310,7 @@ print_usage(gboolean print_ver) {
 #ifdef CVSVERSION
        " (" CVSVERSION ")"
 #endif
-       "\n%s\n%s\n",
+       "\n%s\n\n%s\n",
        comp_info_str->str, runtime_info_str->str);
   } else {
     output = stderr;
@@ -1347,7 +1347,7 @@ show_version(void)
 #ifdef CVSVERSION
       " (" CVSVERSION ")"
 #endif
-      "\n%s\n%s\n",
+      "\n%s\n\n%s\n",
       comp_info_str->str, runtime_info_str->str);
 }
 

diff --git a/version_info.c b/version_info.c
index 2bba50551b2976f4c71d2650832327352f867d8c..374814eda76cbccb352e905e640754c31a6e45ad 100644 (file)
--- a/version_info.c
+++ b/version_info.c
@@ -1,7 +1,7 @@
 /* version_info.c
  * Routines to report version information for stuff used by Ethereal
  *
- * $Id: version_info.c,v 1.3 2004/02/24 01:14:27 guy Exp $
+ * $Id: version_info.c,v 1.4 2004/05/22 04:15:01 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -189,7 +189,7 @@ get_compiled_version_info(GString *str)
        break_point = str->len - 1;
        g_string_append(str,
                        "\nNOTE: this build does not support the \"matches\" operator for Ethereal filter"
-                       "\nsyntax.\n");
+                       "\nsyntax.");
        do_word_wrap(str, break_point);
 #endif /* HAVE_LIBPCRE */
 }