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

* change mu_util_play a bit to better deal with non-ascii filenames

Browse Source 
- don't try to encode anything, but pass the filename into the argv for the
    program to open (before we, used g_spawn_command_line_async, and there we
    need to escape things for the command line. Now we use g_spawn_command, so
    we can pass argv as such.
  - add a GError** arg to mu_util_play, and update all callers
  - cleanup the mu-cmd-extract code a bit
This commit is contained in:
djcb
2012-04-15 19:59:53 +03:00
parent 7a04f14963
commit 6f4448be56
6 changed files with 108 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/mu-cmd-extract.c
View File

@ -38,35 +38,30 @@ save_part (MuMsg *msg, const char *targetdir, guint partidx, gboolean overwrite,
{
GError *err;
gchar *filepath;
gboolean rv;
err = NULL;
rv = FALSE;
filepath = mu_msg_part_filepath (msg, targetdir, partidx, &err);
if (!filepath) {
if (err) {
g_warning ("failed to save MIME-part: %s",
err->message);
g_error_free (err);
}
g_free (filepath);
return FALSE;
}
if (!filepath)
goto exit;
if (!mu_msg_part_save (msg, filepath, partidx, overwrite, FALSE, &err)) {
if (err) {
g_warning ("failed to save MIME-part: %s",
err->message);
g_error_free (err);
}
g_free (filepath);
return FALSE;
}
if (!mu_msg_part_save (msg, filepath, partidx, overwrite, FALSE, &err))
goto exit;
if (play)
mu_util_play (filepath, TRUE, FALSE);
rv = mu_util_play (filepath, TRUE, FALSE, &err);
else
rv = TRUE;
exit:
if (err)
g_warning ("error with MIME-part: %s",
err->message);
g_clear_error (&err);
g_free (filepath);
return TRUE;
return rv;
}
@ -211,30 +206,27 @@ save_part_if (MuMsg *msg, MuMsgPart *part, SaveData *sd)
err = NULL;
filepath = mu_msg_part_filepath (msg, sd->targetdir, part->index, &err);
if (!filepath) {
g_warning ("failed to get file path: %s",
err&&err->message ? err->message : "error");
g_clear_error (&err);
goto leave;
}
if (!filepath)
goto exit;
if (!mu_msg_part_save (msg, filepath, part->index,
sd->overwrite, FALSE, &err)) {
g_warning ("failed to save MIME-part: %s",
err&&err->message ? err->message : "error");
g_clear_error (&err);
goto leave;
}
sd->overwrite, FALSE, &err))
goto exit;
if (sd->play && !mu_util_play (filepath, TRUE, FALSE))
goto leave;
if (sd->play)
rv = mu_util_play (filepath, TRUE, FALSE, &err);
else
rv = TRUE;
rv = TRUE;
++sd->saved_num;
exit:
if (err)
g_warning ("error saving MIME part: %s", err->message);
leave:
sd->result = rv;
g_free (filepath);
g_clear_error (&err);
sd->result = rv;
}
static gboolean