qulogic/gplugin

Remove the old GPluginVersionCompareFunc as it doesn't work well for other languages
feature/version-checking
2020-02-03, Gary Kramlich
8deed64dfede
Parents 3b15dbac0ab1
Children e8a5c06b6004
Remove the old GPluginVersionCompareFunc as it doesn't work well for other languages
3 files changed, 0 insertions(+), 82 deletions(-)
  • +0 -29
    gplugin/gplugin-plugin-info.c
  • +0 -1
    gplugin/gplugin-plugin-info.h
  • +0 -52
    gplugin/tests/test-plugin-info.c
    • --- a/gplugin/gplugin-plugin-info.c Fri Jan 10 23:18:08 2020 -0600
    +++ b/gplugin/gplugin-plugin-info.c Mon Feb 03 22:27:45 2020 -0600
    @@ -93,7 +93,6 @@
    PROP_BIND_LOCAL,
    PROP_NAME,
    PROP_VERSION,
    - PROP_VERSION_FUNC,
    PROP_LICENSE_ID,
    PROP_LICENSE_TEXT,
    PROP_LICENSE_URL,
    @@ -173,15 +172,6 @@
    }
    static void
    -gplugin_plugin_info_set_version_func(GPluginPluginInfo *info,
    - GPluginVersionCompareFunc func)
    -{
    - GPluginPluginInfoPrivate *priv = gplugin_plugin_info_get_instance_private(info);
    -
    - priv->version_func = func;
    -}
    -
    -static void
    gplugin_plugin_info_set_license_id(GPluginPluginInfo *info,
    const gchar *license_id)
    {
    @@ -324,10 +314,6 @@
    case PROP_VERSION:
    g_value_set_string(value, gplugin_plugin_info_get_version(info));
    break;
    - case PROP_VERSION_FUNC:
    - g_value_set_pointer(value,
    - gplugin_plugin_info_get_version_func(info));
    - break;
    case PROP_LICENSE_ID:
    g_value_set_string(value,
    gplugin_plugin_info_get_license_id(info));
    @@ -402,10 +388,6 @@
    case PROP_VERSION:
    gplugin_plugin_info_set_version(info, g_value_get_string(value));
    break;
    - case PROP_VERSION_FUNC:
    - gplugin_plugin_info_set_version_func(info,
    - g_value_get_pointer(value));
    - break;
    case PROP_LICENSE_ID:
    gplugin_plugin_info_set_license_id(info,
    g_value_get_string(value));
    @@ -597,17 +579,6 @@
    );
    /**
    - * GPluginPluginInfo:version-func:
    - *
    - * The function to use to compare versions of this plugin.
    - */
    - properties[PROP_VERSION_FUNC] = g_param_spec_pointer(
    - "version-func", "version-func",
    - "The function that can compare versions of this plugin",
    - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY
    - );
    -
    - /**
    * GPluginPluginInfo:license-id:
    *
    * The short name of the license.
    --- a/gplugin/gplugin-plugin-info.h Fri Jan 10 23:18:08 2020 -0600
    +++ b/gplugin/gplugin-plugin-info.h Mon Feb 03 22:27:45 2020 -0600
    @@ -64,7 +64,6 @@
    const gchar * const *gplugin_plugin_info_get_authors(GPluginPluginInfo *info);
    const gchar *gplugin_plugin_info_get_website(GPluginPluginInfo *info);
    const gchar * const *gplugin_plugin_info_get_dependencies(GPluginPluginInfo *info);
    -GPluginVersionCompareFunc gplugin_plugin_info_get_version_func(GPluginPluginInfo *info);
    const gchar *gplugin_plugin_info_get_help(GPluginPluginInfo *info);
    G_END_DECLS
    --- a/gplugin/tests/test-plugin-info.c Fri Jan 10 23:18:08 2020 -0600
    +++ b/gplugin/tests/test-plugin-info.c Mon Feb 03 22:27:45 2020 -0600
    @@ -337,51 +337,6 @@
    }
    /******************************************************************************
    - * version_func tests
    - *****************************************************************************/
    -static void
    -test_gplugin_plugin_info_version_func(GPluginVersionCompareFunc func) {
    - GPluginPluginInfo *info = NULL;
    - GPluginVersionCompareFunc got = NULL;
    -
    - info = gplugin_plugin_info_new(
    - "test/version-func",
    - GPLUGIN_NATIVE_PLUGIN_ABI_VERSION,
    - "version-func", func,
    - NULL);
    -
    - got = gplugin_plugin_info_get_version_func(info);
    - g_assert_true(func == got);
    -}
    -
    -static gint
    -test_gplugin_version_compare(G_GNUC_UNUSED const gchar *v1,
    - G_GNUC_UNUSED const gchar *v2,
    - G_GNUC_UNUSED GError *error)
    -{
    - return 0;
    -}
    -
    -static void
    -test_gplugin_plugin_info_version_func_null(void) {
    - test_gplugin_plugin_info_version_func(NULL);
    -}
    -
    -static void
    -test_gplugin_plugin_info_version_func_default(void) {
    - test_gplugin_plugin_info_version_func(
    - (GPluginVersionCompareFunc)gplugin_version_compare
    - );
    -}
    -
    -static void
    -test_gplugin_plugin_info_version_func_custom(void) {
    - test_gplugin_plugin_info_version_func(
    - (GPluginVersionCompareFunc)test_gplugin_version_compare
    - );
    -}
    -
    -/******************************************************************************
    * Main
    *****************************************************************************/
    gint
    @@ -408,13 +363,6 @@
    g_test_add_func("/plugin-info/dependencies/multiple",
    test_gplugin_plugin_info_dependencies_multiple);
    - g_test_add_func("/plugin-info/version-func/null",
    - test_gplugin_plugin_info_version_func_null);
    - g_test_add_func("/plugin-info/version-func/default",
    - test_gplugin_plugin_info_version_func_default);
    - g_test_add_func("/plugin-info/version-func/custom",
    - test_gplugin_plugin_info_version_func_custom);
    -
    return g_test_run();
    }