From 64ddc0f48d36f3ff570c1a3f914d9d3a3af020a3 Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Mon, 20 Mar 2023 15:41:59 -0700 Subject: libpeas: remove python3 bits from loaders It's just python now and python2 support is dropped. --- libpeas/peas-utils.c | 11 +++++------ libpeas/peas-utils.h | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/libpeas/peas-utils.c b/libpeas/peas-utils.c index 292e8ec..d65e22c 100644 --- a/libpeas/peas-utils.c +++ b/libpeas/peas-utils.c @@ -31,18 +31,17 @@ #include "peas-utils.h" static const gchar *all_plugin_loaders[] = { - "c", "lua5.1", "python", "python3" + "c", "lua5.1", "python", }; static const gchar *all_plugin_loader_modules[] = { - "cloader", "lua51loader", "pythonloader", "python3loader" + "cloader", "lua51loader", "pythonloader", }; static const gint conflicting_plugin_loaders[PEAS_UTILS_N_LOADERS][2] = { - { -1, -1 }, /* c => {} */ - { -1, -1 }, /* lua5.1 => {} */ - { 3, -1 }, /* python => { python3 } */ - { 2, -1 } /* python3 => { python } */ + { -1, -1 }, /* c => {} */ + { -1, -1 }, /* lua5.1 => {} */ + { -1, -1 }, /* python => {} */ }; G_STATIC_ASSERT (G_N_ELEMENTS (all_plugin_loaders) == PEAS_UTILS_N_LOADERS); diff --git a/libpeas/peas-utils.h b/libpeas/peas-utils.h index 0ab7644..227f9cc 100644 --- a/libpeas/peas-utils.h +++ b/libpeas/peas-utils.h @@ -26,7 +26,7 @@ #include #define PEAS_UTILS_C_LOADER_ID 0 -#define PEAS_UTILS_N_LOADERS 4 +#define PEAS_UTILS_N_LOADERS 3 G_GNUC_BEGIN_IGNORE_DEPRECATIONS gboolean peas_utils_properties_array_to_parameter_list (GType exten_type, -- cgit v1.2.1