* cleanup: drop gmime-2.4 support

This commit is contained in:
djcb
2013-07-21 14:44:44 +03:00
parent 8656f6721e
commit b7324d5af6
11 changed files with 13 additions and 96 deletions

View File

@ -398,8 +398,6 @@ mu_cmd_remove (MuStore *store, MuConfig *opts, GError **err)
#ifdef BUILD_CRYPTO
struct _VData {
MuMsgPartSigStatus combined_status;
char *report;
@ -512,16 +510,6 @@ mu_cmd_verify (MuConfig *opts, GError **err)
return vdata.combined_status == MU_MSG_PART_SIG_STATUS_GOOD ?
MU_OK : MU_ERROR;
}
#else
MuError
mu_cmd_verify (MuConfig *opts, GError **err)
{
mu_util_g_set_error (err, MU_ERROR_IN_PARAMETERS,
"this mu does not support the "
"'verify' command");
return MU_ERROR_IN_PARAMETERS;
}
#endif /*!BUILD_CRYPTO*/
static void

View File

@ -506,15 +506,6 @@ parse_cmd (int *argcp, char ***argvp, GError **err)
}
#endif /*!BUILD_GUILE*/
#ifndef BUILD_CRYPTO
if (MU_CONFIG.cmd == MU_CONFIG_CMD_VERIFY) {
mu_util_g_set_error (err, MU_ERROR_IN_PARAMETERS,
"command 'verify' not supported");
return FALSE;
}
#endif /*!BUILD_CRYPTO */
return TRUE;
}

View File

@ -888,10 +888,8 @@ main (int argc, char *argv[])
g_test_add_func ("/mu-cmd/test-mu-view-attach", test_mu_view_attach);
g_test_add_func ("/mu-cmd/test-mu-mkdir-01", test_mu_mkdir_01);
#ifdef BUILD_CRYPTO
g_test_add_func ("/mu-cmd/test-mu-verify-good", test_mu_verify_good);
g_test_add_func ("/mu-cmd/test-mu-verify-bad", test_mu_verify_bad);
#endif /*BUILD_CRYPTO*/
g_log_set_handler (NULL,
G_LOG_LEVEL_MASK | G_LOG_LEVEL_WARNING|