[Xfce4-commits] <thunar-volman:jannis/port-to-udev> Fix command line option handling (add code for --version).

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
         to 693abb789907d8548ce22bbc8629e3ece1cd8f39 (commit)
       from 3407dce340a7860de244ce2c1957f346482a1b80 (commit)

commit 693abb789907d8548ce22bbc8629e3ece1cd8f39
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Wed Jul 21 14:33:04 2010 +0200

    Fix command line option handling (add code for --version).

 thunar-volman/main.c |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/thunar-volman/main.c b/thunar-volman/main.c
index 96f16dd..2943c88 100644
--- a/thunar-volman/main.c
+++ b/thunar-volman/main.c
@@ -105,6 +105,19 @@ main (int    argc,
       return EXIT_FAILURE;
     }
 
+  /* check if we should print version information */
+  if (opt_version)
+    {
+      g_print ("%s %s (Xfce %s)\n\n", PACKAGE_NAME, PACKAGE_VERSION, 
+               xfce_version_string ());
+      g_print ("%s\n", "Copyright (c) 2004-2007 Benedikt Meurer <benny at xfce.org>");
+      g_print ("%s\n", "Copyright (c)      2010 Jannis Pohlmann <jannis at xfce.org>");
+      g_print ("\n%s\n\n", _("All rights reserved."));
+      g_print (_("Please report bugs to <%s>."), PACKAGE_BUGREPORT);
+      g_print ("\n");
+      return EXIT_SUCCESS;
+    }
+
   /* initialize xfconf */
   if (!xfconf_init (&error))
     {
@@ -114,7 +127,7 @@ main (int    argc,
     }
 
   /* check if we should print the version information */
-  if (opt_version)
+  if (opt_configure)
     {
       /* the --configure/-c option of thunar-volman exists for backwards-compatibility
        * reasons only. what we really do here is spawning thunar-volman-settings */