--- src/terminal.c.check-dbus-connection	2009-06-13 15:01:13.000000000 +0900
+++ src/terminal.c	2009-06-13 15:07:45.000000000 +0900
@@ -451,7 +451,7 @@
    * session bus running), we'd crash later on. Tell the user about it
    * now, and exit. See bug #561663.
    */
-  if (!gconf_ping_daemon ())
+  if (!connection && !gconf_ping_daemon ())
     {
       g_printerr ("Failed to contact the GConf daemon; exiting.\n");
       exit (1);

--- src/terminal.c.dbus	2009-04-18 01:30:45.000000000 +0900
+++ src/terminal.c	2009-06-13 22:39:06.000000000 +0900
@@ -246,7 +246,7 @@
   const char *startup_id, *display_name;
   GdkDisplay *display;
   TerminalOptions *options;
-  DBusGConnection *connection;
+  DBusGConnection *connection = NULL;
   char *factory_name = NULL;
   DBusGProxy *proxy;
   guint32 request_name_ret;
@@ -448,7 +448,7 @@
    * session bus running), we'd crash later on. Tell the user about it
    * now, and exit. See bug #561663.
    */
-  if (!gconf_ping_daemon ())
+  if (!connection && !gconf_ping_daemon ())
     {
       g_printerr ("Failed to contact the GConf daemon; exiting.\n");
       exit (1);