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

* make the output of mu cfind/extract/view locale-encoded except for cfind

Browse Source 
with --format=bbdb
This commit is contained in:
Dirk-Jan C. Binnema
2011-06-02 11:09:04 +03:00
parent de539ea3f8
commit ccbf76b793
3 changed files with 61 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/mu-cmd-cfind.c
View File

@ -110,8 +110,9 @@ each_contact_mutt_alias (const char *email, const char *name)
gchar *nick;
nick = mu_str_guess_nick (name);
g_print ("alias %s %s <%s>\n", nick, name, email);
mu_util_print_encoded ("alias %s %s <%s>\n",
nick, name, email);
g_free (nick);
}
@ -123,9 +124,9 @@ each_contact_wl (const char *email, const char *name)
{
if (name) {
gchar *nick;
nick = mu_str_guess_nick (name);
g_print ("%s \"%s\" \"%s\"\n", email, nick, name);
nick = mu_str_guess_nick (name);
mu_util_print_encoded ("%s \"%s\" \"%s\"\n",
email, nick, name);
g_free (nick);
}
}
@ -135,23 +136,24 @@ static void
each_contact_org_contact (const char *email, const char *name)
{
if (name)
g_print ("* %s\n:PROPERTIES:\n:EMAIL: %s\n:END:\n\n",
name, email);
mu_util_print_encoded (
"* %s\n:PROPERTIES:\n:EMAIL: %s\n:END:\n\n",
name, email);
}
static void
print_plain (const char *email, const char *name, gboolean color)
{
if (name)
g_print ("%s%s%s ",
color ? MU_COLOR_MAGENTA : "",
name,
color ? MU_COLOR_DEFAULT : "");
if (name) {
if (color) fputs (MU_COLOR_MAGENTA, stdout);
mu_util_fputs_encoded (name, stdout);
fputs (" ", stdout);
}
g_print ("%s%s%s\n",
color ? MU_COLOR_GREEN : "",
email,
color ? MU_COLOR_DEFAULT : "");
if (color) fputs (MU_COLOR_GREEN, stdout);
mu_util_fputs_encoded (email, stdout);
if (color) fputs (MU_COLOR_DEFAULT, stdout);
fputs ("\n", stdout);
}
struct _ECData {
@ -167,13 +169,13 @@ each_contact (const char *email, const char *name, time_t tstamp, ECData *ecdata
switch (ecdata->format) {
case FORMAT_MUTT_ALIAS: each_contact_mutt_alias (email, name); break;
case FORMAT_MUTT_AB:
g_print ("%s\t%s\t\n", email, name ? name : ""); break;
mu_util_print_encoded ("%s\t%s\t\n",
email, name ? name : ""); break;
case FORMAT_WL: each_contact_wl (email, name); break;
case FORMAT_ORG_CONTACT: each_contact_org_contact (email, name); break;
case FORMAT_BBDB: each_contact_bbdb (email, name, tstamp); break;
case FORMAT_BBDB: each_contact_bbdb (email, name, tstamp); break;
case FORMAT_CSV:
g_print ("%s,%s\n", name ? name : "", email);
mu_util_print_encoded ("%s,%s\n", name ? name : "", email);
break;
default:
print_plain (email, name, ecdata->color);