+2007-07-10 [colin] 2.10.0cvs13
+
+ * src/editaddress.c
+ * src/editaddress_other_attributes_ldap.h
+ * src/ldapupdate.c
+ Fix --disable-ldap build
+
2007-07-09 [colin] 2.10.0cvs12
* src/Makefile.am
( cvs diff -u -r 1.30.2.33 -r 1.30.2.34 src/prefs_toolbar.c; ) > 2.10.0cvs10.patchset
( cvs diff -u -r 1.155.2.66 -r 1.155.2.67 src/Makefile.am; cvs diff -u -r 1.5.2.19 -r 1.5.2.20 src/exporthtml.c; cvs diff -u -r 1.28.2.35 -r 1.28.2.36 src/mbox.c; cvs diff -u -r 1.16.2.51 -r 1.16.2.52 src/msgcache.c; cvs diff -u -r 1.1.2.44 -r 1.1.2.45 src/prefs_summaries.c; cvs diff -u -r 1.3.2.48 -r 1.3.2.49 src/prefs_themes.c; cvs diff -u -r 1.47.2.43 -r 1.47.2.44 src/procheader.c; cvs diff -u -r 1.24.2.14 -r 1.24.2.15 src/common/Makefile.am; cvs diff -u -r 1.6.2.11 -r 1.6.2.12 src/common/log.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/common/timing.h; cvs diff -u -r 1.36.2.104 -r 1.36.2.105 src/common/utils.c; cvs diff -u -r 1.20.2.46 -r 1.20.2.47 src/common/utils.h; diff -u /dev/null src/common/w32_account.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/common/w32lib.h; cvs diff -u -r 1.20.2.14 -r 1.20.2.15 src/gtk/Makefile.am; cvs diff -u -r 1.2.2.18 -r 1.2.2.19 src/gtk/colorlabel.c; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/plugins/pgpcore/Makefile.am; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpcore/claws.def; cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/plugins/pgpcore/passphrase.c; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/plugins/pgpcore/pgp_viewer.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpcore/plugin.def; cvs diff -u -r 1.1.2.45 -r 1.1.2.46 src/plugins/pgpcore/sgpgme.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/pgpinline/Makefile.am; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpinline/claws.def; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpinline/mypgpcore.def; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpinline/plugin.def; cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/plugins/pgpmime/Makefile.am; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpmime/claws.def; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpmime/mypgpcore.def; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpmime/plugin.def; ) > 2.10.0cvs11.patchset
( cvs diff -u -r 1.155.2.67 -r 1.155.2.68 src/Makefile.am; cvs diff -u -r 1.13.2.11 -r 1.13.2.12 src/addritem.c; cvs diff -u -r 1.12.2.9 -r 1.12.2.10 src/addritem.h; cvs diff -u -r 1.14.2.24 -r 1.14.2.25 src/editaddress.c; diff -u /dev/null src/editaddress_other_attributes_ldap.c; diff -u /dev/null src/editaddress_other_attributes_ldap.h; cvs diff -u -r 1.8.2.21 -r 1.8.2.22 src/editldap.c; cvs diff -u -r 1.2.2.9 -r 1.2.2.10 src/ldapctrl.c; cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/ldapctrl.h; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/ldapupdate.c; ) > 2.10.0cvs12.patchset
+( cvs diff -u -r 1.14.2.25 -r 1.14.2.26 src/editaddress.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/editaddress_other_attributes_ldap.h; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/ldapupdate.c; ) > 2.10.0cvs13.patchset
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=12
+EXTRA_VERSION=13
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
addressbook_edit_person_widgetset_create( parent, cancelled );
addressbook_edit_person_page_basic( PAGE_BASIC, _( "_User Data" ) );
addressbook_edit_person_page_email( PAGE_EMAIL, _( "_Email Addresses" ) );
+#ifdef USE_LDAP
if (personeditdlg.ldap)
addressbook_edit_person_page_attrib_ldap(&personeditdlg, PAGE_ATTRIBUTES, _("O_ther Attributes"));
else
+#endif
addressbook_edit_person_page_attrib( PAGE_ATTRIBUTES, _( "O_ther Attributes" ) );
gtk_widget_show_all( personeditdlg.container );
}
#ifndef __EDITADDRESS_OTHER_ATTRIBUTES_LDAP_H__
#define __EDITADDRESS_OTHER_ATTRIBUTES_LDAP_H__
-#ifdef USE_LDAP
-
#include <glib.h>
#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
gboolean ldap;
};
+#ifdef USE_LDAP
+
static const char *ATTRIBUTE[] = {
"telephoneNumber",
/*"description (Remarks)",*/
LdapControl *ctl;
gchar *filter;
gchar *attribute;
- int retVal, i;
+ int retVal = -2, i;
AttrKeyValue *mail;
g_return_val_if_fail(ld != NULL || server != NULL || attr != NULL, -1);