gplugin/gplugin

Merged in feature/rename-info-icon (pull request #64)
develop
2020-02-24, Gary Kramlich
7e3ba3c5fa91
Parents 8b7f670e59ca65c42a8248c3
Children 38052a6cb999
Merged in feature/rename-info-icon (pull request #64)

rename GPluginPluginInfo::icon to GPluginPluginInfo::icon-name.

Approved-by: Elliott Sales de Andrade
3 files changed, 33 insertions(+), 31 deletions(-)
  • +22 -20
    gplugin/gplugin-plugin-info.c
  • +1 -1
    gplugin/gplugin-plugin-info.h
  • +10 -10
    gplugin/tests/test-plugin-info.c
    • --- a/gplugin/gplugin-plugin-info.c Sun Feb 23 00:03:16 2020 -0600
    +++ b/gplugin/gplugin-plugin-info.c Mon Feb 24 01:30:29 2020 +0000
    @@ -62,7 +62,7 @@
    gchar *license_text;
    gchar *license_url;
    - gchar *icon;
    + gchar *icon_name;
    gchar *summary;
    gchar *description;
    @@ -94,7 +94,7 @@
    PROP_LICENSE_ID,
    PROP_LICENSE_TEXT,
    PROP_LICENSE_URL,
    - PROP_ICON,
    + PROP_ICON_NAME,
    PROP_SUMMARY,
    PROP_DESCRIPTION,
    PROP_CATEGORY,
    @@ -201,11 +201,13 @@
    }
    static void
    -gplugin_plugin_info_set_icon(GPluginPluginInfo *info, const gchar *icon) {
    +gplugin_plugin_info_set_icon_name(GPluginPluginInfo *info,
    + const gchar *icon_name)
    +{
    GPluginPluginInfoPrivate *priv = gplugin_plugin_info_get_instance_private(info);
    - g_free(priv->icon);
    - priv->icon = g_strdup(icon);
    + g_free(priv->icon_name);
    + priv->icon_name = g_strdup(icon_name);
    }
    static void
    @@ -314,8 +316,8 @@
    g_value_set_string(value,
    gplugin_plugin_info_get_license_url(info));
    break;
    - case PROP_ICON:
    - g_value_set_string(value, gplugin_plugin_info_get_icon(info));
    + case PROP_ICON_NAME:
    + g_value_set_string(value, gplugin_plugin_info_get_icon_name(info));
    break;
    case PROP_SUMMARY:
    g_value_set_string(value, gplugin_plugin_info_get_summary(info));
    @@ -385,8 +387,8 @@
    gplugin_plugin_info_set_license_url(info,
    g_value_get_string(value));
    break;
    - case PROP_ICON:
    - gplugin_plugin_info_set_icon(info, g_value_get_string(value));
    + case PROP_ICON_NAME:
    + gplugin_plugin_info_set_icon_name(info, g_value_get_string(value));
    break;
    case PROP_SUMMARY:
    gplugin_plugin_info_set_summary(info, g_value_get_string(value));
    @@ -424,7 +426,7 @@
    g_clear_pointer(&priv->license_id, g_free);
    g_clear_pointer(&priv->license_text, g_free);
    g_clear_pointer(&priv->license_url, g_free);
    - g_clear_pointer(&priv->icon, g_free);
    + g_clear_pointer(&priv->icon_name, g_free);
    g_clear_pointer(&priv->summary, g_free);
    g_clear_pointer(&priv->description, g_free);
    g_clear_pointer(&priv->authors, g_strfreev);
    @@ -608,14 +610,14 @@
    );
    /**
    - * GPluginPluginInfo:icon:
    + * GPluginPluginInfo:icon-name:
    *
    - * A string representing an icon for the plugin. The actual use of this
    - * is determined by the application/library using GPlugin.
    + * A XDG icon name for the plugin. The actual use of this is determined by
    + * the application/library using GPlugin.
    */
    - properties[PROP_ICON] = g_param_spec_string(
    - "icon", "icon",
    - "The file path of the icon for the plugin",
    + properties[PROP_ICON_NAME] = g_param_spec_string(
    + "icon-name", "icon-name",
    + "The XDG icon name for the plugin",
    NULL,
    G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY
    );
    @@ -898,22 +900,22 @@
    }
    /**
    - * gplugin_plugin_info_get_icon:
    + * gplugin_plugin_info_get_icon_name:
    * @info: The #GPluginPluginInfo instance.
    *
    * Returns the name of the icon for the plugin as specified in @info.
    *
    - * Returns: The icon from @info.
    + * Returns: The icon name from @info.
    */
    const gchar *
    -gplugin_plugin_info_get_icon(GPluginPluginInfo *info) {
    +gplugin_plugin_info_get_icon_name(GPluginPluginInfo *info) {
    GPluginPluginInfoPrivate *priv = NULL;
    g_return_val_if_fail(GPLUGIN_IS_PLUGIN_INFO(info), NULL);
    priv = gplugin_plugin_info_get_instance_private(info);
    - return priv->icon;
    + return priv->icon_name;
    }
    /**
    --- a/gplugin/gplugin-plugin-info.h Sun Feb 23 00:03:16 2020 -0600
    +++ b/gplugin/gplugin-plugin-info.h Mon Feb 24 01:30:29 2020 +0000
    @@ -57,7 +57,7 @@
    const gchar *gplugin_plugin_info_get_license_id(GPluginPluginInfo *info);
    const gchar *gplugin_plugin_info_get_license_text(GPluginPluginInfo *info);
    const gchar *gplugin_plugin_info_get_license_url(GPluginPluginInfo *info);
    -const gchar *gplugin_plugin_info_get_icon(GPluginPluginInfo *info);
    +const gchar *gplugin_plugin_info_get_icon_name(GPluginPluginInfo *info);
    const gchar *gplugin_plugin_info_get_summary(GPluginPluginInfo *info);
    const gchar *gplugin_plugin_info_get_description(GPluginPluginInfo *info);
    const gchar *gplugin_plugin_info_get_category(GPluginPluginInfo *info);
    --- a/gplugin/tests/test-plugin-info.c Sun Feb 23 00:03:16 2020 -0600
    +++ b/gplugin/tests/test-plugin-info.c Mon Feb 24 01:30:29 2020 +0000
    @@ -76,9 +76,9 @@
    static void
    test_gplugin_plugin_info_construction(void) {
    GPluginPluginInfo *info = NULL;
    - gchar *id = NULL, *name = NULL, *version = NULL;
    + gchar *id = NULL, *name = NULL, *version = NULL, *icon_name = NULL;
    gchar *license_id = NULL, *license_text = NULL, *license_url = NULL;
    - gchar *icon = NULL, *summary = NULL, *description = NULL, *category = NULL;
    + gchar *summary = NULL, *description = NULL, *category = NULL;
    gchar *website = NULL;
    gchar **authors = NULL, **dependencies = NULL;
    guint abi_version = 0;
    @@ -96,7 +96,7 @@
    "license-id", "license-id",
    "license-text", "license-text",
    "license-url", "license-url",
    - "icon", "icon",
    + "icon-name", "icon-name",
    "summary", "summary",
    "description", "description",
    "category", "category",
    @@ -118,7 +118,7 @@
    "license-id", &license_id,
    "license-text", &license_text,
    "license-url", &license_url,
    - "icon", &icon,
    + "icon-name", &icon_name,
    "summary", &summary,
    "description", &description,
    "category", &category,
    @@ -137,7 +137,7 @@
    test_string(license_id, "license-id");
    test_string(license_text, "license-text");
    test_string(license_url, "license-url");
    - test_string(icon, "icon");
    + test_string(icon_name, "icon-name");
    test_string(summary, "summary");
    test_string(description, "description");
    test_string(category, "category");
    @@ -172,9 +172,9 @@
    static void
    test_gplugin_plugin_info_new_full(void) {
    GPluginPluginInfo *info = NULL;
    - gchar *id = NULL, *name = NULL, *version = NULL;
    + gchar *id = NULL, *name = NULL, *version = NULL, *icon_name = NULL;
    gchar *license_id = NULL, *license_text = NULL, *license_url = NULL;
    - gchar *icon = NULL, *summary = NULL, *description = NULL, *category = NULL;
    + gchar *summary = NULL, *description = NULL, *category = NULL;
    gchar *website = NULL;
    gchar **authors = NULL, **dependencies = NULL;
    guint abi_version = 0;
    @@ -192,7 +192,7 @@
    "license-id", "license-id",
    "license-text", "license-text",
    "license-url", "license-url",
    - "icon", "icon",
    + "icon-name", "icon-name",
    "summary", "summary",
    "description", "description",
    "category", "category",
    @@ -214,7 +214,7 @@
    "license-id", &license_id,
    "license-text", &license_text,
    "license-url", &license_url,
    - "icon", &icon,
    + "icon-name", &icon_name,
    "summary", &summary,
    "description", &description,
    "category", &category,
    @@ -233,7 +233,7 @@
    test_string(license_id, "license-id");
    test_string(license_text, "license-text");
    test_string(license_url, "license-url");
    - test_string(icon, "icon");
    + test_string(icon_name, "icon-name");
    test_string(summary, "summary");
    test_string(description, "description");
    test_string(category, "category");