Changes in owl.c [120dac7:ca1fb26a]

File:

• owl.c (modified) (4 diffs)

owl.c

@@ -36 +36 @@
 void usage(FILE *file)
 {
-  fprintf(file, "Barnowl version %s\n", OWL_VERSION_STRING);
+  fprintf(file, "Barnowl version %s\n", version);
   fprintf(file, "Usage: barnowl [-n] [-d] [-D] [-v] [-h] [-c <configfile>] [-s <confdir>] [-t <ttyname>]\n");
   fprintf(file, "  -n,--no-subs        don't load zephyr subscriptions\n");
@@ -80 +80 @@
       break;
     case 'v':
-      printf("This is BarnOwl version %s\n", OWL_VERSION_STRING);
+      printf("This is BarnOwl version %s\n", version);
       exit(0);
     case 'h':
@@ -578 +578 @@
   /* welcome message */
   owl_function_debugmsg("startup: creating splash message");
-  owl_function_adminmsg("",
+  char *welcome = g_strdup_printf(
     "-----------------------------------------------------------------------\n"
-    "Welcome to BarnOwl version " OWL_VERSION_STRING ".\n"
+    "Welcome to BarnOwl version %s.\n"
     "To see a quick introduction, type ':show quickstart'.                  \n"
     "Press 'h' for on-line help.                                            \n"
@@ -588 +588 @@
     "                                                                 OvO   \n"
     "Please report any bugs or suggestions to bug-barnowl@mit.edu    (   )  \n"
-    "-----------------------------------------------------------------m-m---\n"
-  );
+    "-----------------------------------------------------------------m-m---\n",
+    version);
+  owl_function_adminmsg("", welcome);
+  g_free(welcome);
 
   owl_function_debugmsg("startup: setting context interactive");