Changeset 883b421 for functions.c

Timestamp:

Aug 11, 2013, 4:40:51 PM (11 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Parents:

76e80de (diff), ca1fb26a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge ca1fb26a9a22aea6ecd68b0150859ef065c6afc5 into 76e80dee6b4f058b982a12b57bc4ec5220eb2e13

File:

• functions.c (modified) (5 diffs)

functions.c

@@ -115 +115 @@
 void owl_function_show_license(void)
 {
-  const char *text;
-
-  text=""
-    "BarnOwl version " OWL_VERSION_STRING "\n"
+  char *text = g_strdup_printf(
+    "BarnOwl version %s\n"
     "Copyright (c) 2006-2011 The BarnOwl Developers. All rights reserved.\n"
     "Copyright (c) 2004 James Kretchmar. All rights reserved.\n"
@@ -155 +153 @@
     "WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE\n"
     "OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN\n"
-    "IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n";
+    "IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n",
+    version);
   owl_function_popless_text(text);
+  g_free(text);
 }
 
@@ -1359 +1359 @@
 void owl_function_about(void)
 {
-  owl_function_popless_text(
-    "This is BarnOwl version " OWL_VERSION_STRING ".\n\n"
+  char *text = g_strdup_printf(
+    "This is BarnOwl version %s.\n\n"
     "BarnOwl is a fork of the Owl zephyr client, written and\n"
     "maintained by Alejandro Sedeno and Nelson Elhage at the\n"
@@ -1379 +1379 @@
     "This program is free software. You can redistribute it and/or\n"
     "modify under the terms of the Sleepycat License. Use the \n"
-    "':show license' command to display the full license\n"
-  );
+      "':show license' command to display the full license\n",
+      version);
+  owl_function_popless_text(text);
+  g_free(text);
 }
 
@@ -1781 +1783 @@
 
   owl_fmtext_append_normal(&fm, "  Version: ");
-  owl_fmtext_append_normal(&fm, OWL_VERSION_STRING);
+  owl_fmtext_append_normal(&fm, version);
   owl_fmtext_append_normal(&fm, "\n");