[Commits] Makefile.am 1.1 1.2 ldap-plugin.c 1.3 1.4

[miras at claws-mail.org]

Update of /home/claws-mail/contacts/plugins/ldap
In directory claws-mail:/tmp/cvs-serv18563/plugins/ldap

Modified Files:
	Makefile.am ldap-plugin.c 
Log Message:
Lots of bug fixes and read-only support for LDAP. No searching implemented though

Index: Makefile.am
===================================================================
RCS file: /home/claws-mail/contacts/plugins/ldap/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.am	15 Sep 2011 15:52:56 -0000	1.1
+++ Makefile.am	14 Nov 2011 22:06:43 -0000	1.2
@@ -11,18 +11,23 @@
 INCLUDES = \
 	   -I${top_srcdir} \
 	   -I${top_srcdir}/src \
-	   -I$(top_srcdir)/src/dbus \
 	   -I${top_builddir} \
+	   -I$(top_srcdir)/src/dbus \
 	   @GLIB_CFLAGS@ \
-	   @GTK_CFLAGS@
+	   @GTK_CFLAGS@ \
+	   @GNUTLS_CFLAGS@
 
 AM_CPPFLAGS = \
-		-DG_LOG_DOMAIN=\"Claws-Contacts\"
+		-DG_LOG_DOMAIN=\"Claws-Contacts\" \
+		$(LIBGCRYPT_CFLAGS)
 
 ldap_plugin_la_SOURCES = \
 		ldap-plugin.c
 			
 ldap_plugin_la_LIBADD= \
 		   @GLIB_LIBS@ \
-		   @GTK_LIBS@
+		   @GTK_LIBS@ \
+		   @LDAP_LIBS@ \
+		   @GNUTLS_LIBS@ \
+		   $(LIBGCRYPT_LIBS)	
 

Index: ldap-plugin.c
===================================================================
RCS file: /home/claws-mail/contacts/plugins/ldap/ldap-plugin.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ldap-plugin.c	4 Oct 2011 20:21:40 -0000	1.3
+++ ldap-plugin.c	14 Nov 2011 22:06:43 -0000	1.4
@@ -36,12 +36,39 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <glib/gprintf.h>
+#include <ldap.h>
+#include <stdlib.h>
 #include "plugin.h"
 #include "gtk-utils.h"
 #include "utils.h"
 
 #define NAME "LDAP plugin"
+#define TIMEOUT 20
[...1221 lines suppressed...]
@@ -507,3 +1495,19 @@
 	return "GPL3+";
 }
 
+/**
+ * Does the plugin needs credentials for address books
+ * @return bool
+ */
+gboolean plugin_need_credentials(void) {
+	return TRUE;
+}
+
+/**
+ * Get list of additional config
+ * @return NULL if no additional config is required, a list of
+ * ExtraConfig otherwise
+ */
+GSList* plugin_extra_config(void) {
+	return g_slist_reverse(gslist_deep_copy(extra_config, extra_config_copy));
+}