gnome-terminal r3096 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Thu Sep 25 18:54:25 2008
New Revision: 3096
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=3096&view=rev

Log:
Fall back to creating a new instance if the factory method doesn't
exist.

Modified:
   trunk/src/terminal.c

Modified: trunk/src/terminal.c
==============================================================================
--- trunk/src/terminal.c	(original)
+++ trunk/src/terminal.c	Thu Sep 25 18:54:25 2008
@@ -1311,6 +1311,15 @@
                                                     (const char **) argv_copy,
                                                     &error))
         {
+          if (g_error_matches (error, DBUS_GERROR, DBUS_GERROR_UNKNOWN_METHOD))
+            {
+              /* Incompatible factory version, fall back, to new instance */
+              g_printerr (_("Incompatible factory version; creating a new instance.\n"));
+              g_strfreev (env);
+
+              goto factory_disabled;
+            }
+
           g_printerr (_("Factory error: %s\n"), error->message);
           g_error_free (error);
           ret = EXIT_FAILURE;