[gnome-terminal] Handle errors from terminal_app_handle_options() also in the factory



commit 0fe16944d097f63674470f4d528b72137bbaee15
Author: Christian Persch <chpe gnome org>
Date:   Sun Aug 23 21:42:12 2009 +0200

    Handle errors from terminal_app_handle_options() also in the factory

 src/terminal.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/src/terminal.c b/src/terminal.c
index c17f233..aa8e3a9 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -480,9 +480,16 @@ factory_disabled:
   terminal_app_initialize (options->use_factory);
   g_signal_connect (terminal_app_get (), "quit", G_CALLBACK (gtk_main_quit), NULL);
 
-  terminal_app_handle_options (terminal_app_get (), options, TRUE /* allow resume */, NULL);
+  terminal_app_handle_options (terminal_app_get (), options, TRUE /* allow resume */, &error);
   terminal_options_free (options);
 
+  if (error)
+    {
+      g_printerr ("Error handling options: %s\n", error->message);
+      g_clear_error (&error);
+      goto shutdown;
+    }
+
   /* Now change directory to $HOME so we don't prevent unmounting, e.g. if the
    * factory is started by nautilus-open-terminal. See bug #565328.
    * On failure back to /.
@@ -493,6 +500,8 @@ factory_disabled:
 
   gtk_main ();
 
+shutdown:
+
   terminal_app_shutdown ();
 
   if (factory)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]