Included import of LDIF files.

diff --git a/ChangeLog.claws b/ChangeLog.claws
index e491451087d2cff8912d0e6c91d3c3f88404afc6..4f1b5c8646fe697a8828aa4fe47acd8c5e7c9736 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,11 @@
+2001-09-24 [match]
+       * src/ldif.[ch], src/importldif.[ch], addressbook.c
+               import LDIF files.
+       * src/addrcache.[ch], addrindex.[ch]
+               small update for future
+       * src/addrbook.c
+               fix test XML file.
+

 2001-09-24 [melvin]
        * src/gtkspell.[ch]
                added 'Learn from mistakes' option
 2001-09-24 [melvin]
        * src/gtkspell.[ch]
                added 'Learn from mistakes' option

diff --git a/src/Makefile.am b/src/Makefile.am
index 024f8a6705a3a1283597107df465e22ecdf976b5..db6d13495f122aa7b124e4f92ecee025a86abcc7 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -91,6 +91,8 @@ sylpheed_SOURCES = \
        imap.c imap.h \
        xml.c xml.h \
        html.c html.h \
        imap.c imap.h \
        xml.c xml.h \
        html.c html.h \

+       ldif.c ldif.h \
+       importldif.c importldif.h \

        procmime.c procmime.h \
        rfc2015.c rfc2015.h \
        passphrase.c passphrase.h \
        procmime.c procmime.h \
        rfc2015.c rfc2015.h \
        passphrase.c passphrase.h \

diff --git a/src/addrbook.c b/src/addrbook.c
index 91d7f6e093e3af83656c4cd5e5a82d6e7d61d674..e6001a1f828f0eaeb206204ff5789a766604d610 100644 (file)
--- a/src/addrbook.c
+++ b/src/addrbook.c
@@ -2043,19 +2043,16 @@ static gboolean addrbook_chkread_tree( AddressBookFile *book, XMLFile *file ) {
        }
 
        attr = xml_get_current_tag_attr(file);
        }
 
        attr = xml_get_current_tag_attr(file);

-       // addrbook_show_attribs( attr );
+       /* addrbook_show_attribs( attr ); */

 
        retVal = TRUE;
        for (;;) {
                if (! file->level ) break;
 
        retVal = TRUE;
        for (;;) {
                if (! file->level ) break;

-               // Get item tag
-               if( xml_parse_next_tag( file ) ) {
-                       longjmp( book->jumper, 1 );
-               }
-               // Get next tag (person, group or folder)
+               /* Get item tag */

                if( xml_parse_next_tag( file ) ) {
                        longjmp( book->jumper, 1 );
                }
                if( xml_parse_next_tag( file ) ) {
                        longjmp( book->jumper, 1 );
                }

+               /* Get next tag (person, group or folder) */

                if( xml_compare_tag( file, AB_ELTAG_PERSON ) ) {
                        addrbook_chkparse_person( book, file );
                }
                if( xml_compare_tag( file, AB_ELTAG_PERSON ) ) {
                        addrbook_chkparse_person( book, file );
                }


@@ -2065,10 +2062,6 @@ static gboolean addrbook_chkread_tree( AddressBookFile *book, XMLFile *file ) {
                else if( xml_compare_tag( file, AB_ELTAG_FOLDER ) ) {
                        addrbook_chkparse_folder( book, file );
                }
                else if( xml_compare_tag( file, AB_ELTAG_FOLDER ) ) {
                        addrbook_chkparse_folder( book, file );
                }

-               else {
-                       // Item not recognized
-                       retVal = FALSE;
-               }

        }
        return retVal;
 }
        }
        return retVal;
 }


@@ -2092,7 +2085,7 @@ gint addrbook_test_read_file( AddressBookFile *book, gchar *fileName ) {
        if( file ) {
                book->retVal = MGU_BAD_FORMAT;
                if( setjmp( book->jumper ) ) {
        if( file ) {
                book->retVal = MGU_BAD_FORMAT;
                if( setjmp( book->jumper ) ) {

-                       // printf( "Caught Ya!!!\n" );
+                       /* printf( "Caught Ya!!!\n" ); */

                        xml_close_file( file );
                        return book->retVal;
                }
                        xml_close_file( file );
                        return book->retVal;
                }