[PATCH gnome-terminal] commit 3229 did actually break things

[Simon Hengel <simon hengel wiktory org>]

Hello,

I guess commit 3229 breaks things. gconf_ping_daemon() gives 0, even if
dbus is running. This means, that if there is no gconfd-2 instance
around, gnome-terminal want start. If, with my system setup, I just
reverse 3229, everything is fine (== a gconfd-2 is started if not
already running)

Patch attached. Hope that helps.

Cheers,
Simon Hengel

Index: src/terminal.c
===================================================================
--- src/terminal.c	(revision 3436)
+++ src/terminal.c	(working copy)
@@ -234,9 +234,6 @@
   return g_string_free (name, FALSE);
 }
 
-/* Evil hack alert: this is exported from libgconf-2 but not in a public header */
-extern gboolean gconf_ping_daemon (void);
-         
 int
 main (int argc, char **argv)
 {
@@ -444,16 +441,6 @@
   g_free (argv_copy);
   g_free (factory_name);
 
-  /* If the gconf daemon isn't available (e.g. because there's no dbus
-   * session bus running), we'd crash later on. Tell the user about it
-   * now, and exit. See bug #561663.
-   */
-  if (!gconf_ping_daemon ())
-    {
-      g_printerr ("Failed to contact the GConf daemon; exiting.\n");
-      exit (1);
-    }
-
   gtk_window_set_default_icon_name (GNOME_TERMINAL_ICON_NAME);
 
   gtk_about_dialog_set_url_hook (about_url_hook, NULL, NULL);