From e10ac949fc95e321d82480de5cf3abf128d5b0bb Mon Sep 17 00:00:00 2001
From: wkendrick <wkendrick>
Date: Thu, 14 Apr 2011 06:31:24 +0000
Subject: Resurrecting informational options (--help, --usage, --version, --verbose-version)

---
diff --git a/src/parse.gperf b/src/parse.gperf
index f5006fa..4c3f527 100644
--- a/src/parse.gperf
+++ b/src/parse.gperf
@@ -38,28 +38,28 @@ struct cfg
 
 static void imm_version(void)
 {
-//  show_version(0);
+  show_version(0);
 }
 
 static void imm_verbose_version(void)
 {
-//  show_version(1);
+  show_version(1);
 }
 
 static void imm_usage(void)
 {
-//  show_usage(0);
+  show_usage(0);
 }
 
 static void imm_help(void)
 {
-//  show_version(0);
-//  show_usage(0);
+  show_version(0);
+  show_usage(0);
 }
 
 static void imm_copying(void)
 {
-//  show_version(0);
+  show_version(0);
   printf("\n"
          "This program is free software; you can redistribute it\n"
          "and/or modify it under the terms of the GNU General Public\n"
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index 55e4b11..43ba206 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -1617,7 +1617,7 @@ static void blit_brush(int x, int y, int direction);
 static void stamp_draw(int x, int y);
 static void rec_undo_buffer(void);
 
-static void show_usage(int exitcode);
+void show_usage(int exitcode);
 static char *progname;
 
 static SDL_Cursor *get_cursor(unsigned char *bits, unsigned char *mask_bits,
@@ -6233,7 +6233,7 @@ static void rec_undo_buffer(void)
 
 
 /* Show program version: */
-static void show_version(int details)
+void show_version(int details)
 {
   printf("\nTux Paint\n");
   printf("  Version " VER_VERSION " (" VER_DATE ")\n");
@@ -6363,7 +6363,7 @@ static void show_version(int details)
 
 /* Show usage display: */
 
-static void show_usage(int exitcode)
+void show_usage(int exitcode)
 {
   FILE *f = exitcode ? stderr : stdout;
   char *blank;
@@ -20969,7 +20969,7 @@ static void parse_argv_options(struct cfginfo *restrict tmpcfg, char *argv[])
     {"-h",  "help"},
     {"-u",  "usage"},
     {"-v",  "version"},
-    {"-vv", "version-verbose"},
+    {"-vv", "verbose-version"},
     {"-l",  "lang"},
     {"-L",  "locale"},
     {"-b",  "startblank"},
--
cgit v0.9.1