projects
/
claws.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Included import of LDIF files.
[claws.git]
/
src
/
addrbook.c
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;
}