[Commits] [SCM] claws branch, master, updated. 3.15.0-198-g5b7108e

[mones at claws-mail.org]

The branch, master has been updated
       via  5b7108e97efe38ce7888b3af90a302e32c01c91e (commit)
      from  332848b93d871e039ae491adc08510ac0b10229c (commit)

Summary of changes:
 src/compose.c |    4 ++++
 1 file changed, 4 insertions(+)


- Log -----------------------------------------------------------------
commit 5b7108e97efe38ce7888b3af90a302e32c01c91e
Author: Ricardo Mones <ricardo at mones.org>
Date:   Tue Dec 12 18:27:23 2017 +0100

    Fix bug 3935: build from GIT master broken on arch linux
    
    Completes 48f72c22f91fbe0d6e872e89bd4dce9d39090e81 to allow building
    with disabled LDAP support.

diff --git a/src/compose.c b/src/compose.c
index e52f467..1938aad 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -7095,6 +7095,7 @@ extra_headers_done:
 	g_slist_foreach(extra_headers, (GFunc)compose_add_extra_header, (gpointer)model);
 }
 
+#ifdef USE_LDAP
 static void _ldap_srv_func(gpointer data, gpointer user_data)
 {
 	LdapServer *server = (LdapServer *)data;
@@ -7103,6 +7104,7 @@ static void _ldap_srv_func(gpointer data, gpointer user_data)
 	debug_print("%s server '%s'\n", (*enable == TRUE ? "enabling" : "disabling"), server->control->hostName);
 	server->searchFlag = *enable;
 }
+#endif
 
 static void compose_create_header_entry(Compose *compose) 
 {
@@ -9098,10 +9100,12 @@ static void compose_destroy(Compose *compose)
 
 	compose_list = g_list_remove(compose_list, compose);
 
+#ifdef USE_LDAP
 	gboolean enable = TRUE;
 	g_slist_foreach(compose->passworded_ldap_servers,
 			_ldap_srv_func, &enable);
 	g_slist_free(compose->passworded_ldap_servers);
+#endif
 
 	if (compose->updating) {
 		debug_print("danger, not destroying anything now\n");

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail