[Xfce4-commits] <xfce4-terminal:master> Don't check for version and help in attr parsing.

[Nick Schermer]

Updating branch refs/heads/master
         to 7ac4ebaf1f564388e0cc4a46c5d59ed47019cb7e (commit)
       from 09c901193ba62d88039f86ba582a5e54a39a1d0e (commit)

commit 7ac4ebaf1f564388e0cc4a46c5d59ed47019cb7e
Author: Nick Schermer <nick at xfce.org>
Date:   Fri Dec 28 15:14:45 2012 +0100

    Don't check for version and help in attr parsing.
    
    We already aborted if those are passed in the arguments.

 terminal/terminal-options.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/terminal/terminal-options.c b/terminal/terminal-options.c
index 375b285..64e2f2e 100644
--- a/terminal/terminal-options.c
+++ b/terminal/terminal-options.c
@@ -438,9 +438,7 @@ terminal_window_attr_parse (gint              argc,
           tab_attr = win_attr->tabs->data;
           attrs = g_slist_append (attrs, win_attr);
         }
-      else if (terminal_option_cmp ("help", 'h', argc, argv, &n, NULL)
-               || terminal_option_cmp ("version", 'V', argc, argv, &n, NULL)
-               || terminal_option_cmp ("disable-server", 0, argc, argv, &n, NULL)
+      else if (terminal_option_cmp ("disable-server", 0, argc, argv, &n, NULL)
                || terminal_option_cmp ("sync", 0, argc, argv, &n, NULL)
                || terminal_option_cmp ("g-fatal-warnings", 0, argc, argv, &n, NULL))
         {