X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=src%2Faddrbook.c;h=e6001a1f828f0eaeb206204ff5789a766604d610;hp=91d7f6e093e3af83656c4cd5e5a82d6e7d61d674;hb=40d786203a9a2a3d7c7caf2c6424f5232fe7a486;hpb=691ff6e618248520af5944c15fac4aa275d51adf;ds=sidebyside diff --git a/src/addrbook.c b/src/addrbook.c index 91d7f6e09..e6001a1f8 100644 --- 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); - // addrbook_show_attribs( attr ); + /* addrbook_show_attribs( attr ); */ 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 ); } + /* Get next tag (person, group or folder) */ 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 { - // Item not recognized - retVal = FALSE; - } } 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 ) ) { - // printf( "Caught Ya!!!\n" ); + /* printf( "Caught Ya!!!\n" ); */ xml_close_file( file ); return book->retVal; }