gnome-terminal r2565 - branches/gnome-2-22/src

[chpe svn gnome org]

Author: chpe
Date: Fri May 23 22:02:18 2008
New Revision: 2565
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2565&view=rev

Log:
	* src/terminal.c: (handle_new_terminal_event): 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:
   branches/gnome-2-22/src/terminal.c

Modified: branches/gnome-2-22/src/terminal.c
==============================================================================
--- branches/gnome-2-22/src/terminal.c	(original)
+++ branches/gnome-2-22/src/terminal.c	Fri May 23 22:02:18 2008
@@ -3606,6 +3606,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",
@@ -3613,7 +3614,7 @@
       g_error_free (error);
       g_option_context_free (context);
       option_parsing_results_free (parsing_results);
-      exit(1);
+      return;
   }
   g_option_context_free (context);