fix bug where opening folder has massive slowdown when using the 'Display sender...
authorPaul Mangan <paul@claws-mail.org>
Wed, 30 Apr 2003 14:21:06 +0000 (14:21 +0000)
committerPaul Mangan <paul@claws-mail.org>
Wed, 30 Apr 2003 14:21:06 +0000 (14:21 +0000)
ChangeLog.claws
configure.ac
src/addrindex.c

index 31863a3..8ed5d36 100644 (file)
@@ -1,3 +1,9 @@
+2003-04-30 [paul]      0.8.11claws128
+
+       * src/addrindex.c
+               fix bug where opening folder has massive slowdown when
+               using the 'Display sender using address book' option
+
 2003-04-30 [paul]      0.8.11claws127
 
        * src/plugins/clamav/clamav_plugin.c
index 343e817..c21e5ba 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws127
+EXTRA_VERSION=claws128
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
@@ -412,7 +412,7 @@ if test x"$ac_cv_enable_image_viewer_plugin" = xyes; then
 fi
 AM_CONDITIONAL(BUILD_IMAGE_VIEWER_PLUGIN, test x"$ac_cv_enable_image_viewer_plugin" = xyes)
 if test x"$ac_cv_enable_image_viewer_plugin" = xyes; then
-       PLUGINS="image $PLUGINS"
+       PLUGINS="image-viewer $PLUGINS"
 fi
 
 AC_ARG_ENABLE(dillo-viewer-plugin,
index 785a44c..aa9c6ca 100644 (file)
@@ -1520,9 +1520,11 @@ static void addrindex_read_index( AddressIndex *addrIndex, XMLFile *file ) {
                                else if( addrIndex->lastType == ADDR_IF_JPILOT ) {
                                        ds = addrindex_parse_jpilot( file );
                                }
+#ifdef USE_LDAP
                                else if( addrIndex->lastType == ADDR_IF_LDAP ) {
                                        ds = addrindex_parse_ldap( file );
                                }
+#endif
                                if( ds ) {
                                        ds->interface = dsIFace;
                                        addrindex_hash_add_cache( addrIndex, ds );
@@ -1635,9 +1637,11 @@ static void addrindex_write_index( AddressIndex *addrIndex, FILE *fp ) {
                                        if( iface->type == ADDR_IF_JPILOT ) {
                                                addrindex_write_jpilot( fp, ds, lvlItem );
                                        }
+#ifdef USE_LDAP
                                        if( iface->type == ADDR_IF_LDAP ) {
                                                addrindex_write_ldap( fp, ds, lvlItem );
                                        }
+#endif
                                }
                                nodeDS = g_list_next( nodeDS );
                        }