Merge branch 'master' into procmule
This commit is contained in:
@ -75,6 +75,9 @@ print_header (OutputFormat format)
|
|||||||
g_print (";; -*-coding: utf-8-emacs;-*-\n"
|
g_print (";; -*-coding: utf-8-emacs;-*-\n"
|
||||||
";;; file-version: 6\n");
|
";;; file-version: 6\n");
|
||||||
break;
|
break;
|
||||||
|
case FORMAT_MUTT_AB:
|
||||||
|
g_print ("Matching addresses in the mu database:\n");
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -164,7 +167,8 @@ typedef struct _ECData ECData;
|
|||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
each_contact (const char *email, const char *name, time_t tstamp, ECData *ecdata)
|
each_contact (const char *email, const char *name, time_t tstamp,
|
||||||
|
ECData *ecdata)
|
||||||
{
|
{
|
||||||
switch (ecdata->format) {
|
switch (ecdata->format) {
|
||||||
case FORMAT_MUTT_ALIAS: each_contact_mutt_alias (email, name); break;
|
case FORMAT_MUTT_ALIAS: each_contact_mutt_alias (email, name); break;
|
||||||
|
|||||||
@ -191,6 +191,7 @@ test_mu_cfind_mutt_ab (void)
|
|||||||
NULL, NULL));
|
NULL, NULL));
|
||||||
g_assert_cmpstr (output,
|
g_assert_cmpstr (output,
|
||||||
==,
|
==,
|
||||||
|
"Matching addresses in the mu database:\n"
|
||||||
"hk@testmu.xxx\tHelmut Kröger\t\n"
|
"hk@testmu.xxx\tHelmut Kröger\t\n"
|
||||||
"testmu@testmu.xx\tMü\t\n");
|
"testmu@testmu.xx\tMü\t\n");
|
||||||
g_free (cmdline);
|
g_free (cmdline);
|
||||||
|
|||||||
Reference in New Issue
Block a user