From c8b507f8264d39df96277de7f7f699030ee675ce Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Sun, 15 Nov 2020 17:03:24 +0200 Subject: [PATCH] mu: remove obsolete MU_FEATURE_CRYPTO --- lib/utils/mu-util.c | 1 - lib/utils/mu-util.h | 3 --- lib/utils/test-mu-util.c | 4 +--- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/lib/utils/mu-util.c b/lib/utils/mu-util.c index 353a26c2..e71e9c10 100644 --- a/lib/utils/mu-util.c +++ b/lib/utils/mu-util.c @@ -256,7 +256,6 @@ mu_util_is_local_file (const char* path) gboolean mu_util_supports (MuFeature feature) { - /* check for Guile support */ #ifndef BUILD_GUILE if (feature & MU_FEATURE_GUILE) diff --git a/lib/utils/mu-util.h b/lib/utils/mu-util.h index cf2ff695..762c5091 100644 --- a/lib/utils/mu-util.h +++ b/lib/utils/mu-util.h @@ -211,15 +211,12 @@ gboolean mu_util_play (const char *path, gboolean allow_local, gboolean mu_util_program_in_path (const char *prog); - enum _MuFeature { MU_FEATURE_GUILE = 1 << 0, /* do we support Guile 2.0? */ MU_FEATURE_GNUPLOT = 1 << 1, /* do we have gnuplot installed? */ - MU_FEATURE_CRYPTO = 1 << 2 /* do we support crypto (Gmime >= 2.6) */ }; typedef enum _MuFeature MuFeature; - /** * Check whether mu supports some particular feature * diff --git a/lib/utils/test-mu-util.c b/lib/utils/test-mu-util.c index 7e6c4a58..05c37a6e 100644 --- a/lib/utils/test-mu-util.c +++ b/lib/utils/test-mu-util.c @@ -186,7 +186,6 @@ test_mu_util_supports (void) #endif /*BUILD_GUILE*/ g_assert_cmpuint (mu_util_supports (MU_FEATURE_GUILE), == ,has_guile); - g_assert_cmpuint (mu_util_supports (MU_FEATURE_CRYPTO), == ,TRUE); path = g_find_program_in_path ("gnuplot"); g_free (path); @@ -195,8 +194,7 @@ test_mu_util_supports (void) path ? TRUE : FALSE); g_assert_cmpuint ( - mu_util_supports (MU_FEATURE_GNUPLOT|MU_FEATURE_GUILE| - MU_FEATURE_CRYPTO), + mu_util_supports (MU_FEATURE_GNUPLOT|MU_FEATURE_GUILE), ==, has_guile && path ? TRUE : FALSE); }