emacs/mu
1
0
Fork 0
mirror of https://github.com/djcb/mu.git synced 2024-06-25 07:28:02 +02:00
Code Issues Releases Wiki Activity

index: improve error message when file does not seem to be an email

Browse Source
This commit is contained in:
djcb 2013-10-13 19:58:25 +03:00
parent 66ebdf21e0
commit edfdef44a4
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/mu-index.c
View File

@ -128,9 +128,9 @@ insert_or_update_maybe (const char *fullpath, const char *mdir,
time_t filestamp, MuIndexCallbackData *data, time_t filestamp, MuIndexCallbackData *data,
gboolean *updated) gboolean *updated)
{ {
MuMsg *msg; MuMsg *msg;
GError *err; GError *err;
gboolean rv; gboolean rv;
*updated = FALSE; *updated = FALSE;
if (!needs_index (data, fullpath, filestamp)) if (!needs_index (data, fullpath, filestamp))
@ -139,8 +139,13 @@ insert_or_update_maybe (const char *fullpath, const char *mdir,
err = NULL; err = NULL;
msg = mu_msg_new_from_file (fullpath, mdir, &err); msg = mu_msg_new_from_file (fullpath, mdir, &err);
if (!msg) { if (!msg) {
g_warning ("error creating message object: %s", if (!err)
err ? err->message : "cause unknown"); g_warning ("error creating message object: %s",
fullpath);
else {
g_warning ("%s", err->message);
g_clear_error (&err);
}
/* warn, then simply continue */ /* warn, then simply continue */
return MU_OK; return MU_OK;
} }

6
lib/mu-msg-file.c
View File

@ -155,8 +155,7 @@ init_mime_msg (MuMsgFile *self, const char* path, GError **err)
g_object_unref (stream); g_object_unref (stream);
if (!parser) { if (!parser) {
g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_GMIME, g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_GMIME,
"%s: cannot create mime parser for %s", "cannot create mime parser for %s", path);
__FUNCTION__, path);
return FALSE; return FALSE;
} }
@ -164,8 +163,7 @@ init_mime_msg (MuMsgFile *self, const char* path, GError **err)
g_object_unref (parser); g_object_unref (parser);
if (!self->_mime_msg) { if (!self->_mime_msg) {
g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_GMIME, g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_GMIME,
"%s: cannot construct mime message for %s", "message seems invalid, ignoring (%s)", path);
__FUNCTION__, path);
return FALSE; return FALSE;
} }