gnome-terminal r2651 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Thu May 29 19:42:02 2008
New Revision: 2651
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2651&view=rev

Log:
Ignore unknown options when handling a new-terminal event from another instance.
Don't call exit() when parsing the passed options fail; instead just ignore the request.
Bug #531720.


Modified:
   trunk/src/terminal.c

Modified: trunk/src/terminal.c
==============================================================================
--- trunk/src/terminal.c	(original)
+++ trunk/src/terminal.c	Thu May 29 19:42:02 2008
@@ -1635,6 +1635,7 @@
                                                  argv);
   
   context = get_goption_context (parsing_results);
+  g_option_context_set_ignore_unknown_options (context, TRUE);
   if(!g_option_context_parse (context, &argc, &argv, &error))
   {
       g_warning ("Error parsing options: %s, passed from terminal child",
@@ -1642,7 +1643,7 @@
       g_error_free (error);
       g_option_context_free (context);
       option_parsing_results_free (parsing_results);
-      exit(1);
+      return;
   }
   g_option_context_free (context);