aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog4
-rw-r--r--shell/main.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index bdfab07c57..3909397ab7 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-27 Dan Winship <danw@helixcode.com>
+
+ * main.c (idle_cb): work with either gconf 0.5 or newer
+
2000-07-26 Peter Williams <peterw@helixcode.com>
* e-storage.c (e_storage_new_folder): Fix tiny mem leak.
diff --git a/shell/main.c b/shell/main.c
index cdad9f76c9..352773e45f 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -114,7 +114,11 @@ idle_cb (gpointer data)
evolution_directory = (char *) data;
+#ifdef HAVE_GCONF_CLIENT_GET_DEFAULT
gconf_client = gconf_client_get_default ();
+#else
+ gconf_client = gconf_client_new ();
+#endif
shell = e_shell_new (evolution_directory, gconf_client);
g_free (evolution_directory);