a better fix for the bug where opening folder has massive slowdown when using the...

diff --git a/ChangeLog.claws b/ChangeLog.claws
index a7dfd353d22fd022b6ca89b01db6144e3443b8bb..df23374bf1c3a425d62cd9fee139b1d073bd9575 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2003-04-30 [paul]      0.8.11claws134
+
+       * src/addrindex.c
+               ok, this time a better fix for the bug where opening folder
+               has massive slowdown when using the 'Display sender using 
+               address book' option
+
 2003-04-30 [paul]      0.8.11claws133
 
        * src/addrindex.c

diff --git a/configure.ac b/configure.ac
index 45e9a7ad72393e2142b02c1836bcceeab5720bba..36751ffdd5f523682f66cfeec4fdb742d60f3c35 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws133
+EXTRA_VERSION=claws134
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/addrindex.c b/src/addrindex.c
index 785a44c398c506f6d43c05d07971d7f834d0a526..46693d95b3a033fd186af71d5ef41ccc51bc6eb9 100644 (file)
--- a/src/addrindex.c
+++ b/src/addrindex.c
@@ -1215,24 +1215,6 @@ static void addrindex_write_jpilot( FILE *fp,AddressDataSource *ds, gint lvl ) {
        }
 }
 
-#else
-/*
- * Just read/write DOM fragments (preserve data found in file).
- */
-static AddressDataSource *addrindex_parse_jpilot( XMLFile *file ) {
-       AddressDataSource *ds;
-
-       ds = addrindex_create_datasource( ADDR_IF_JPILOT );
-       ds->rawDataSource = addrindex_read_fragment( file );
-       return ds;
-}
-
-static void addrindex_write_jpilot( FILE *fp, AddressDataSource *ds, gint lvl ) {
-       AddressIfFragment *fragment = ds->rawDataSource;
-       if( fragment ) {
-               addrindex_write_fragment( fp, fragment, lvl );
-       }
-}
 #endif
 
 #ifdef USE_LDAP
@@ -1449,25 +1431,6 @@ static void addrindex_write_ldap( FILE *fp, AddressDataSource *ds, gint lvl ) {
        addrindex_write_elem_e( fp, lvl, TAG_DS_LDAP );
 
 }
-
-#else
-/*
- * Just read/write DOM fragments (preserve data found in file).
- */
-static AddressDataSource *addrindex_parse_ldap( XMLFile *file ) {
-       AddressDataSource *ds;
-
-       ds = addrindex_create_datasource( ADDR_IF_LDAP );
-       ds->rawDataSource = addrindex_read_fragment( file );
-       return ds;
-}
-
-static void addrindex_write_ldap( FILE *fp, AddressDataSource *ds, gint lvl ) {
-       AddressIfFragment *fragment = ds->rawDataSource;
-       if( fragment ) {
-               addrindex_write_fragment( fp, fragment, lvl );
-       }
-}
 #endif
 
 /* **********************************************************************
@@ -1517,12 +1480,16 @@ static void addrindex_read_index( AddressIndex *addrIndex, XMLFile *file ) {
                                else if( addrIndex->lastType == ADDR_IF_VCARD ) {
                                        ds = addrindex_parse_vcard( file );
                                }
+#ifdef USE_JPILOT
                                else if( addrIndex->lastType == ADDR_IF_JPILOT ) {
                                        ds = addrindex_parse_jpilot( file );
                                }
+#endif
+#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 );
@@ -1632,12 +1599,16 @@ static void addrindex_write_index( AddressIndex *addrIndex, FILE *fp ) {
                                        if( iface->type == ADDR_IF_VCARD ) {
                                                addrindex_write_vcard( fp, ds, lvlItem );
                                        }
+#ifdef USE_JPILOT
                                        if( iface->type == ADDR_IF_JPILOT ) {
                                                addrindex_write_jpilot( fp, ds, lvlItem );
                                        }
+#endif
+#ifdef USE_LDAP
                                        if( iface->type == ADDR_IF_LDAP ) {
                                                addrindex_write_ldap( fp, ds, lvlItem );
                                        }
+#endif
                                }
                                nodeDS = g_list_next( nodeDS );
                        }