From f9a55ad4aa95e7c8e8403582b8166a65fc3e631b Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Wed, 13 Jul 2011 23:10:50 +0300 Subject: [PATCH 1/2] * mu-cmd-cfind.c: include a header-line for --format=mutt-ab (fixes issue #42) (thanks!) --- src/mu-cmd-cfind.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/mu-cmd-cfind.c b/src/mu-cmd-cfind.c index 3fdf8cde..85a2d68e 100644 --- a/src/mu-cmd-cfind.c +++ b/src/mu-cmd-cfind.c @@ -75,6 +75,9 @@ print_header (OutputFormat format) g_print (";; -*-coding: utf-8-emacs;-*-\n" ";;; file-version: 6\n"); break; + case FORMAT_MUTT_AB: + g_print ("Matching address in the mu database:\n"); + break; default: break; } @@ -164,7 +167,8 @@ typedef struct _ECData ECData; 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) { case FORMAT_MUTT_ALIAS: each_contact_mutt_alias (email, name); break; From 3bf7c4d6419885a23e2476187775423e30b3a5d4 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Wed, 13 Jul 2011 23:28:05 +0300 Subject: [PATCH 2/2] * test-mu-cmd-find.c: update unit test for --format=mutt-ab changes --- src/mu-cmd-cfind.c | 2 +- src/tests/test-mu-cmd-cfind.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mu-cmd-cfind.c b/src/mu-cmd-cfind.c index 85a2d68e..9f74d5e4 100644 --- a/src/mu-cmd-cfind.c +++ b/src/mu-cmd-cfind.c @@ -76,7 +76,7 @@ print_header (OutputFormat format) ";;; file-version: 6\n"); break; case FORMAT_MUTT_AB: - g_print ("Matching address in the mu database:\n"); + g_print ("Matching addresses in the mu database:\n"); break; default: break; diff --git a/src/tests/test-mu-cmd-cfind.c b/src/tests/test-mu-cmd-cfind.c index 09e9bf77..12ca455d 100644 --- a/src/tests/test-mu-cmd-cfind.c +++ b/src/tests/test-mu-cmd-cfind.c @@ -191,6 +191,7 @@ test_mu_cfind_mutt_ab (void) NULL, NULL)); g_assert_cmpstr (output, ==, + "Matching addresses in the mu database:\n" "hk@testmu.xxx\tHelmut Kröger\t\n" "testmu@testmu.xx\tMü\t\n"); g_free (cmdline);