aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIain Holmes <iain@src.gnome.org>2001-10-04 05:34:49 +0800
committerIain Holmes <iain@src.gnome.org>2001-10-04 05:34:49 +0800
commit7d7e90a1bee57ae3c6ed82a210d5725be15602fa (patch)
treec91808ac936db6eed8fb8ef317577de95a768877
parent7708b2d8a0a0417758f4124e27614f576922ebdb (diff)
downloadgsoc2013-evolution-7d7e90a1bee57ae3c6ed82a210d5725be15602fa.tar.gz
gsoc2013-evolution-7d7e90a1bee57ae3c6ed82a210d5725be15602fa.tar.zst
gsoc2013-evolution-7d7e90a1bee57ae3c6ed82a210d5725be15602fa.zip
ifdef out the LDAP only bits. Cleans some warnings on startup
svn path=/trunk/; revision=13389
-rw-r--r--addressbook/ChangeLog6
-rw-r--r--addressbook/gui/component/addressbook-storage.c4
2 files changed, 10 insertions, 0 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 4f7373510f..890a831b1c 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-03 Iain Holmes <iain@ximian.com>
+
+ * addressbook/gui/component/addressbook-storage.c
+ (addressbook_storage_setup): Only load_storages if you have LDAP.
+ (load_source_data): Only do stuff if you have LDAP.
+
2001-10-03 Christopher James Lahey <clahey@ximian.com>
* gui/widgets/e-addressbook-reflow-adapter.c (addressbook_height),
diff --git a/addressbook/gui/component/addressbook-storage.c b/addressbook/gui/component/addressbook-storage.c
index 6154969b14..1a89f86afb 100644
--- a/addressbook/gui/component/addressbook-storage.c
+++ b/addressbook/gui/component/addressbook-storage.c
@@ -97,8 +97,10 @@ addressbook_storage_setup (EvolutionShellComponent *shell_component,
if (storage_path)
g_free (storage_path);
storage_path = g_concat_dir_and_file (evolution_homedir, ADDRESSBOOK_SOURCES_XML);
+#ifdef HAVE_LDAP
if (!load_source_data (storage_path))
deregister_storage ();
+#endif
}
#ifdef HAVE_LDAP
@@ -297,6 +299,7 @@ addressbook_storage_init_source_uri (AddressbookSource *source)
static gboolean
load_source_data (const char *file_path)
{
+#ifdef HAVE_LDAP
xmlDoc *doc;
xmlNode *root;
xmlNode *child;
@@ -376,6 +379,7 @@ load_source_data (const char *file_path)
deregister_storage();
xmlFreeDoc (doc);
+#endif
return TRUE;
}