diff options
| author | Gary Kramlich <grim@reaperworld.com> | 2022-05-23 20:27:22 -0500 |
|---|---|---|
| committer | Gary Kramlich <grim@reaperworld.com> | 2022-05-23 20:27:22 -0500 |
| commit | a7b5195b55b404f9d2026dd3dd509b2cdb702485 (patch) | |
| tree | cded830c642eb6f46fa0a7d0a741594926b4eb02 /libpurple/purpleplugininfo.c | |
| parent | e6944ca11b5a59212772fd2d18c3fc9b96c169ce (diff) | |
| download | pidgin-a7b5195b55b404f9d2026dd3dd509b2cdb702485.tar.gz | |
Remove the ui-requirement property on PurplePluginInfo
This never worked right, even before gplugin. To read the value we had to have
already opened the library, which means all of its symbols were resolved. So
all this really did was stop a plugin for loading under a different UI. As we
move towards separate config directories for each UI this problem goes away.
Testing Done:
Ran and verified that plugins looked alright.
Reviewed at https://reviews.imfreedom.org/r/1462/
Diffstat (limited to 'libpurple/purpleplugininfo.c')
| -rw-r--r-- | libpurple/purpleplugininfo.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/libpurple/purpleplugininfo.c b/libpurple/purpleplugininfo.c index eecc43b8a8..0732822c8c 100644 --- a/libpurple/purpleplugininfo.c +++ b/libpurple/purpleplugininfo.c @@ -27,7 +27,6 @@ #include "purpleplugininfo.h" typedef struct { - gchar *ui_requirement; /* ID of UI that is required to load the plugin */ gchar *error; /* Why a plugin is not loadable */ PurplePluginInfoFlags flags; /* Flags for the plugin */ @@ -51,7 +50,6 @@ typedef struct { enum { PROP_0, - PROP_UI_REQUIREMENT, PROP_ACTIONS_CB, PROP_EXTRA_CB, PROP_PREF_FRAME_CB, @@ -81,9 +79,6 @@ purple_plugin_info_set_property(GObject *obj, guint param_id, priv = purple_plugin_info_get_instance_private(info); switch (param_id) { - case PROP_UI_REQUIREMENT: - priv->ui_requirement = g_value_dup_string(value); - break; case PROP_ACTIONS_CB: priv->actions_cb = g_value_get_pointer(value); break; @@ -153,21 +148,6 @@ purple_plugin_info_constructed(GObject *object) { priv->error = g_strdup(_("This plugin has not defined an ID.")); } - if(priv->ui_requirement != NULL) { - PurpleUiInfo *ui_info = purple_core_get_ui_info(); - const gchar *ui_id = purple_ui_info_get_id(ui_info); - if(!purple_strequal(priv->ui_requirement, ui_id)) { - priv->error = g_strdup_printf(_("You are using %s, but this plugin " - "requires %s."), - ui_id, - priv->ui_requirement); - purple_debug_error("plugins", - "%s is not loadable: The UI requirement is not " - "met. (%s)\n", - id, priv->error); - } - } - version = gplugin_plugin_info_get_abi_version(ginfo); if (PURPLE_PLUGIN_ABI_MAJOR_VERSION(version) != PURPLE_MAJOR_VERSION || PURPLE_PLUGIN_ABI_MINOR_VERSION(version) > PURPLE_MINOR_VERSION) @@ -193,7 +173,6 @@ purple_plugin_info_finalize(GObject *object) { priv = purple_plugin_info_get_instance_private(PURPLE_PLUGIN_INFO(object)); - g_free(priv->ui_requirement); g_free(priv->error); G_OBJECT_CLASS(purple_plugin_info_parent_class)->finalize(object); @@ -209,12 +188,6 @@ purple_plugin_info_class_init(PurplePluginInfoClass *klass) { obj_class->get_property = purple_plugin_info_get_property; obj_class->set_property = purple_plugin_info_set_property; - properties[PROP_UI_REQUIREMENT] = g_param_spec_string( - "ui-requirement", "UI Requirement", - "ID of UI that is required by this plugin", - NULL, - G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS); - properties[PROP_ACTIONS_CB] = g_param_spec_pointer( "actions-cb", "Plugin actions", "Callback that returns list of plugin's actions", |