LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "oc: NGImap4Connection:fetchUids changed error messages" 

This reverts commit 41320a4813.
pull/78/head
Julio García 2015-04-20 13:15:04 +02:00
parent 9901788db6
commit 1d9e085658
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenChange/NGImap4Connection+Monkeypatching.m
View File

@ -73,8 +73,8 @@
partial_result = [[self client] fetchUids:partial_uids parts:_parts];
if (![[partial_result valueForKey:@"result"] boolValue]) {
[self errorWithFormat: @"Error fetching %u uids for url: %@",
total, _url];
[self errorWithFormat: @"could not fetch %d uids for url: %@",
[_uids count], _url];
return nil;
}
@ -99,8 +99,8 @@
current_obj = [target objectForKey: key];
if (current_obj == nil) {
/* This should never happen but just in case... */
[self errorWithFormat: @"Error merging fetchUids results: "
@"nonexistent key %@ on current target", key];
[self errorWithFormat: @"Error while merging results: nonexistent key "
@"%@ on current target", key];
continue;
}
@ -115,13 +115,13 @@
[self _mergeNGHashMap: obj into: current_obj];
} else if ([obj isKindOfClass: [NSNumber class]]) {
if (obj != current_obj) {
[self errorWithFormat: @"Error merging fetchUids results: "
@"incorrect value for key %@: %@ != %@",
[self errorWithFormat: @"While fetching uids problem happened "
@"merging results for key %@: %@ != %@",
key, obj, current_obj];
}
} else {
[self errorWithFormat: @"Error merging fetchUids results: "
@"ignored %@ (%@) key", key, [key class]];
[self errorWithFormat: @"While fetching uids and mergin results ignored "
@"%@ (%@) key", key, [key class]];
}
}
}
@ -135,8 +135,8 @@
current_obj = [target objectsForKey: key];
if (current_obj == nil) {
/* This should never happen but just in case... */
[self errorWithFormat: @"Error merging fetchUids results: "
@"nonexistent key %@ on current target", key];
[self errorWithFormat: @"Error while merging results: nonexistent key "
@"%@ on current target", key];
continue;
}