diff options
| author | Dan Winship <danw@src.gnome.org> | 2000-07-28 01:22:28 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2000-07-28 01:22:28 +0800 |
| commit | 84d7c755a0216918b31ae5917c0cffd86d9cc870 (patch) | |
| tree | 6c332c0036ad942e158604060cf83210d61ceed1 | |
| parent | 96dfd1f12df19062aeaf60cec782963ea853cf1d (diff) | |
| download | gsoc2013-evolution-84d7c755a0216918b31ae5917c0cffd86d9cc870.tar.gz 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
| -rw-r--r-- | shell/ChangeLog | 4 | ||||
| -rw-r--r-- | shell/main.c | 4 |
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); |