revert the 'fix' of 0.8.11claws128 because it doesn't fix it

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 5ccf69070148d35391ff70c7a959c42069ab8851..a7dfd353d22fd022b6ca89b01db6144e3443b8bb 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2003-04-30 [paul]      0.8.11claws133
+
+       * src/addrindex.c
+               revert the 'fix' of 0.8.11claws128 because it doesn't fix it
+       

 2003-04-30 [melvin]    0.8.11claws132
 
        New: Dillo plugin preferences (patch by Dimitar Haralanov)
 2003-04-30 [melvin]    0.8.11claws132
 
        New: Dillo plugin preferences (patch by Dimitar Haralanov)

diff --git a/configure.ac b/configure.ac
index f7afdb56bfb45824a74a9ed10013de5ef90de572..45e9a7ad72393e2142b02c1836bcceeab5720bba 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws132
+EXTRA_VERSION=claws133

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/addrindex.c b/src/addrindex.c
index aa9c6ca041f4fd67a508e2e043d24e9b5d64aa72..785a44c398c506f6d43c05d07971d7f834d0a526 100644 (file)
--- a/src/addrindex.c
+++ b/src/addrindex.c
@@ -1520,11 +1520,9 @@ static void addrindex_read_index( AddressIndex *addrIndex, XMLFile *file ) {
                                else if( addrIndex->lastType == ADDR_IF_JPILOT ) {
                                        ds = addrindex_parse_jpilot( 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 );
                                }
                                else if( addrIndex->lastType == ADDR_IF_LDAP ) {
                                        ds = addrindex_parse_ldap( file );
                                }

-#endif

                                if( ds ) {
                                        ds->interface = dsIFace;
                                        addrindex_hash_add_cache( addrIndex, ds );
                                if( ds ) {
                                        ds->interface = dsIFace;
                                        addrindex_hash_add_cache( addrIndex, ds );


@@ -1637,11 +1635,9 @@ static void addrindex_write_index( AddressIndex *addrIndex, FILE *fp ) {
                                        if( iface->type == ADDR_IF_JPILOT ) {
                                                addrindex_write_jpilot( fp, ds, lvlItem );
                                        }
                                        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 );
                                        }
                                        if( iface->type == ADDR_IF_LDAP ) {
                                                addrindex_write_ldap( fp, ds, lvlItem );
                                        }

-#endif

                                }
                                nodeDS = g_list_next( nodeDS );
                        }
                                }
                                nodeDS = g_list_next( nodeDS );
                        }