aboutsummaryrefslogtreecommitdiffstats
path: root/shell/main.c
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2000-07-28 01:22:28 +0800
committerDan Winship <danw@src.gnome.org>2000-07-28 01:22:28 +0800
commit84d7c755a0216918b31ae5917c0cffd86d9cc870 (patch)
tree6c332c0036ad942e158604060cf83210d61ceed1 /shell/main.c
parent96dfd1f12df19062aeaf60cec782963ea853cf1d (diff)
downloadgsoc2013-evolution-84d7c755a0216918b31ae5917c0cffd86d9cc870.tar
gsoc2013-evolution-84d7c755a0216918b31ae5917c0cffd86d9cc870.tar.gz
gsoc2013-evolution-84d7c755a0216918b31ae5917c0cffd86d9cc870.tar.bz2
gsoc2013-evolution-84d7c755a0216918b31ae5917c0cffd86d9cc870.tar.lz
gsoc2013-evolution-84d7c755a0216918b31ae5917c0cffd86d9cc870.tar.xz
gsoc2013-evolution-84d7c755a0216918b31ae5917c0cffd86d9cc870.tar.zst
gsoc2013-evolution-84d7c755a0216918b31ae5917c0cffd86d9cc870.zip
work with either gconf 0.5 or newer
* main.c (idle_cb): work with either gconf 0.5 or newer svn path=/trunk/; revision=4396
Diffstat (limited to 'shell/main.c')
-rw-r--r--shell/main.c4
1 files changed, 4 insertions, 0 deletions
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);