gnome-terminal r3229 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Sat Nov 29 21:08:07 2008
New Revision: 3229
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=3229&view=rev

Log:
Bug 561663 â gnome-terminal crashes when gconf isn't set up correctly
Abort early when GConf isn't set up correctly, e.g. because there's no
dbus session bus running.

Modified:
   trunk/src/terminal.c

Modified: trunk/src/terminal.c
==============================================================================
--- trunk/src/terminal.c	(original)
+++ trunk/src/terminal.c	Sat Nov 29 21:08:07 2008
@@ -206,6 +206,9 @@
   g_free (uri);
 }
 
+/* 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)
 {
@@ -383,6 +386,15 @@
 factory_disabled:
   g_free (argv_copy);
 
+  /* 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);