alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* mu-maildir: return right MuResult from callback

Browse Source
This commit is contained in:
Dirk-Jan C. Binnema
2010-09-12 21:39:15 +03:00
parent 26f216efef
commit 1a8de6e1db
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/mu-maildir.c
View File

@ -519,13 +519,14 @@ process_dir (const char* path, const char* mdir,
dir = opendir (path); dir = opendir (path);
if (G_UNLIKELY(!dir)) { if (G_UNLIKELY(!dir)) {
g_warning ("%s: ignoring %s: %s", path, g_warning ("%s: ignoring %s: %s", __FUNCTION__,
__FUNCTION__, strerror(errno)); path, strerror(errno));
return MU_OK; return MU_OK;
} }
if (dir_cb) { if (dir_cb) {
MuResult rv = dir_cb (path, TRUE, data); MuResult rv;
rv = dir_cb (path, TRUE, data);
if (rv != MU_OK) { if (rv != MU_OK) {
closedir (dir); closedir (dir);
return rv; return rv;
@ -534,10 +535,10 @@ process_dir (const char* path, const char* mdir,
result = process_dir_entries_sorted (dir, path, mdir, msg_cb, dir_cb, result = process_dir_entries_sorted (dir, path, mdir, msg_cb, dir_cb,
data); data);
closedir (dir); closedir (dir);
if (dir_cb) /* only run dir_cb if it exists and so far, things went ok */
if (dir_cb && result == MU_OK)
return dir_cb (path, FALSE, data); return dir_cb (path, FALSE, data);
return result; return result;