mirror of
https://github.com/weechat/weechat.git
synced 2026-07-05 01:03:14 +02:00
Remove variable with "WeeChat required version" in plugins, do not compare version any more (API comparison is enough)
This commit is contained in:
@@ -32,7 +32,6 @@ WEECHAT_PLUGIN_NAME(ALIAS_PLUGIN_NAME);
|
||||
WEECHAT_PLUGIN_DESCRIPTION("Alias plugin for WeeChat");
|
||||
WEECHAT_PLUGIN_AUTHOR("FlashCode <flashcode@flashtux.org>");
|
||||
WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
|
||||
WEECHAT_PLUGIN_WEECHAT_VERSION(WEECHAT_VERSION);
|
||||
WEECHAT_PLUGIN_LICENSE("GPL3");
|
||||
|
||||
struct t_weechat_plugin *weechat_alias_plugin = NULL;
|
||||
|
||||
@@ -35,7 +35,6 @@ WEECHAT_PLUGIN_NAME(ASPELL_PLUGIN_NAME);
|
||||
WEECHAT_PLUGIN_DESCRIPTION("Aspell plugin for WeeChat");
|
||||
WEECHAT_PLUGIN_AUTHOR("FlashCode <flashcode@flashtux.org>");
|
||||
WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
|
||||
WEECHAT_PLUGIN_WEECHAT_VERSION(WEECHAT_VERSION);
|
||||
WEECHAT_PLUGIN_LICENSE("GPL3");
|
||||
|
||||
struct t_weechat_plugin *weechat_aspell_plugin = NULL;
|
||||
|
||||
@@ -36,7 +36,6 @@ WEECHAT_PLUGIN_NAME(CHARSET_PLUGIN_NAME);
|
||||
WEECHAT_PLUGIN_DESCRIPTION("Charset plugin for WeeChat");
|
||||
WEECHAT_PLUGIN_AUTHOR("FlashCode <flashcode@flashtux.org>");
|
||||
WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
|
||||
WEECHAT_PLUGIN_WEECHAT_VERSION(WEECHAT_VERSION);
|
||||
WEECHAT_PLUGIN_LICENSE("GPL3");
|
||||
|
||||
#define CHARSET_CONFIG_NAME "charset"
|
||||
|
||||
@@ -37,7 +37,6 @@ WEECHAT_PLUGIN_NAME(DEMO_PLUGIN_NAME);
|
||||
WEECHAT_PLUGIN_DESCRIPTION("Demo plugin for WeeChat");
|
||||
WEECHAT_PLUGIN_AUTHOR("FlashCode <flashcode@flashtux.org>");
|
||||
WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
|
||||
WEECHAT_PLUGIN_WEECHAT_VERSION(WEECHAT_VERSION);
|
||||
WEECHAT_PLUGIN_LICENSE("GPL3");
|
||||
|
||||
struct t_weechat_plugin *weechat_demo_plugin = NULL;
|
||||
|
||||
@@ -36,7 +36,6 @@ WEECHAT_PLUGIN_NAME(FIFO_PLUGIN_NAME);
|
||||
WEECHAT_PLUGIN_DESCRIPTION("Fifo plugin for WeeChat");
|
||||
WEECHAT_PLUGIN_AUTHOR("FlashCode <flashcode@flashtux.org>");
|
||||
WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
|
||||
WEECHAT_PLUGIN_WEECHAT_VERSION(WEECHAT_VERSION);
|
||||
WEECHAT_PLUGIN_LICENSE("GPL3");
|
||||
|
||||
struct t_weechat_plugin *weechat_fifo_plugin = NULL;
|
||||
|
||||
@@ -43,7 +43,6 @@ WEECHAT_PLUGIN_NAME(IRC_PLUGIN_NAME);
|
||||
WEECHAT_PLUGIN_DESCRIPTION("IRC (Internet Relay Chat) plugin for WeeChat");
|
||||
WEECHAT_PLUGIN_AUTHOR("FlashCode <flashcode@flashtux.org>");
|
||||
WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
|
||||
WEECHAT_PLUGIN_WEECHAT_VERSION(WEECHAT_VERSION);
|
||||
WEECHAT_PLUGIN_LICENSE("GPL3");
|
||||
|
||||
struct t_weechat_plugin *weechat_irc_plugin = NULL;
|
||||
|
||||
@@ -38,7 +38,6 @@ WEECHAT_PLUGIN_NAME(JABBER_PLUGIN_NAME);
|
||||
WEECHAT_PLUGIN_DESCRIPTION("Jabber plugin for WeeChat");
|
||||
WEECHAT_PLUGIN_AUTHOR("FlashCode <flashcode@flashtux.org>");
|
||||
WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
|
||||
WEECHAT_PLUGIN_WEECHAT_VERSION(WEECHAT_VERSION);
|
||||
WEECHAT_PLUGIN_LICENSE("GPL3");
|
||||
|
||||
struct t_weechat_plugin *weechat_jabber_plugin = NULL;
|
||||
|
||||
@@ -47,7 +47,6 @@ WEECHAT_PLUGIN_NAME(LOGGER_PLUGIN_NAME);
|
||||
WEECHAT_PLUGIN_DESCRIPTION("Logger plugin for WeeChat");
|
||||
WEECHAT_PLUGIN_AUTHOR("FlashCode <flashcode@flashtux.org>");
|
||||
WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
|
||||
WEECHAT_PLUGIN_WEECHAT_VERSION(WEECHAT_VERSION);
|
||||
WEECHAT_PLUGIN_LICENSE("GPL3");
|
||||
|
||||
struct t_weechat_plugin *weechat_logger_plugin = NULL;
|
||||
|
||||
+1
-34
@@ -156,7 +156,7 @@ plugin_load (const char *filename)
|
||||
char *ptr_home, *full_name, *full_name2;
|
||||
void *handle;
|
||||
char *name, *api_version, *author, *description, *version;
|
||||
char *weechat_version, *license, *charset;
|
||||
char *license, *charset;
|
||||
t_weechat_init_func *init_func;
|
||||
int rc, i, argc;
|
||||
char **argv;
|
||||
@@ -302,34 +302,6 @@ plugin_load (const char *filename)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* look for WeeChat version required for plugin */
|
||||
weechat_version = dlsym (handle, "weechat_plugin_weechat_version");
|
||||
if (!weechat_version)
|
||||
{
|
||||
gui_chat_printf (NULL,
|
||||
_("%sError: symbol \"%s\" not found in "
|
||||
"plugin \"%s\", failed to load"),
|
||||
gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
|
||||
"weechat_plugin_weechat_version",
|
||||
full_name);
|
||||
dlclose (handle);
|
||||
free (full_name);
|
||||
return NULL;
|
||||
}
|
||||
if (util_weechat_version_cmp (PACKAGE_VERSION, weechat_version) != 0)
|
||||
{
|
||||
gui_chat_printf (NULL,
|
||||
_("%sError: plugin \"%s\" is compiled for WeeChat "
|
||||
"%s and you are running version %s, failed to "
|
||||
"load"),
|
||||
gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
|
||||
full_name,
|
||||
weechat_version, PACKAGE_VERSION);
|
||||
dlclose (handle);
|
||||
free (full_name);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* look for plugin license */
|
||||
license = dlsym (handle, "weechat_plugin_license");
|
||||
if (!license)
|
||||
@@ -374,7 +346,6 @@ plugin_load (const char *filename)
|
||||
new_plugin->description = strdup (description);
|
||||
new_plugin->author = strdup (author);
|
||||
new_plugin->version = strdup (version);
|
||||
new_plugin->weechat_version = strdup (weechat_version);
|
||||
new_plugin->license = strdup (license);
|
||||
new_plugin->charset = (charset) ? strdup (charset) : NULL;
|
||||
ptr_option = config_weechat_debug_get (name);
|
||||
@@ -825,8 +796,6 @@ plugin_remove (struct t_weechat_plugin *plugin)
|
||||
free (plugin->author);
|
||||
if (plugin->version)
|
||||
free (plugin->version);
|
||||
if (plugin->weechat_version)
|
||||
free (plugin->weechat_version);
|
||||
if (plugin->license)
|
||||
free (plugin->license);
|
||||
if (plugin->charset)
|
||||
@@ -1057,8 +1026,6 @@ plugin_add_to_infolist (struct t_infolist *infolist,
|
||||
return 0;
|
||||
if (!infolist_new_var_string (ptr_item, "version", plugin->version))
|
||||
return 0;
|
||||
if (!infolist_new_var_string (ptr_item, "weechat_version", plugin->weechat_version))
|
||||
return 0;
|
||||
if (!infolist_new_var_string (ptr_item, "license", plugin->license))
|
||||
return 0;
|
||||
if (!infolist_new_var_string (ptr_item, "charset", plugin->charset))
|
||||
|
||||
@@ -36,7 +36,6 @@ WEECHAT_PLUGIN_DESCRIPTION("Network communication between WeeChat and "
|
||||
"remote application");
|
||||
WEECHAT_PLUGIN_AUTHOR("FlashCode <flashcode@flashtux.org>");
|
||||
WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
|
||||
WEECHAT_PLUGIN_WEECHAT_VERSION(WEECHAT_VERSION);
|
||||
WEECHAT_PLUGIN_LICENSE("GPL3");
|
||||
|
||||
struct t_weechat_plugin *weechat_relay_plugin = NULL;
|
||||
|
||||
@@ -37,7 +37,6 @@ WEECHAT_PLUGIN_NAME(LUA_PLUGIN_NAME);
|
||||
WEECHAT_PLUGIN_DESCRIPTION("Lua plugin for WeeChat");
|
||||
WEECHAT_PLUGIN_AUTHOR("FlashCode <flashcode@flashtux.org>");
|
||||
WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
|
||||
WEECHAT_PLUGIN_WEECHAT_VERSION(WEECHAT_VERSION);
|
||||
WEECHAT_PLUGIN_LICENSE("GPL3");
|
||||
|
||||
struct t_weechat_plugin *weechat_lua_plugin;
|
||||
|
||||
@@ -35,7 +35,6 @@ WEECHAT_PLUGIN_NAME(PERL_PLUGIN_NAME);
|
||||
WEECHAT_PLUGIN_DESCRIPTION("Perl plugin for WeeChat");
|
||||
WEECHAT_PLUGIN_AUTHOR("FlashCode <flashcode@flashtux.org>");
|
||||
WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
|
||||
WEECHAT_PLUGIN_WEECHAT_VERSION(WEECHAT_VERSION);
|
||||
WEECHAT_PLUGIN_LICENSE("GPL3");
|
||||
|
||||
struct t_weechat_plugin *weechat_perl_plugin = NULL;
|
||||
|
||||
@@ -33,7 +33,6 @@ WEECHAT_PLUGIN_NAME(PYTHON_PLUGIN_NAME);
|
||||
WEECHAT_PLUGIN_DESCRIPTION("Python plugin for WeeChat");
|
||||
WEECHAT_PLUGIN_AUTHOR("FlashCode <flashcode@flashtux.org>");
|
||||
WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
|
||||
WEECHAT_PLUGIN_WEECHAT_VERSION(WEECHAT_VERSION);
|
||||
WEECHAT_PLUGIN_LICENSE("GPL3");
|
||||
|
||||
struct t_weechat_plugin *weechat_python_plugin = NULL;
|
||||
|
||||
@@ -36,7 +36,6 @@ WEECHAT_PLUGIN_NAME(RUBY_PLUGIN_NAME);
|
||||
WEECHAT_PLUGIN_DESCRIPTION("Ruby plugin for WeeChat");
|
||||
WEECHAT_PLUGIN_AUTHOR("FlashCode <flashcode@flashtux.org>");
|
||||
WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
|
||||
WEECHAT_PLUGIN_WEECHAT_VERSION(WEECHAT_VERSION);
|
||||
WEECHAT_PLUGIN_LICENSE("GPL3");
|
||||
|
||||
struct t_weechat_plugin *weechat_ruby_plugin = NULL;
|
||||
|
||||
@@ -38,7 +38,6 @@ WEECHAT_PLUGIN_NAME(TCL_PLUGIN_NAME);
|
||||
WEECHAT_PLUGIN_DESCRIPTION("Tcl plugin for WeeChat");
|
||||
WEECHAT_PLUGIN_AUTHOR("Dmitry Kobylin <fnfal@academ.tsc.ru>");
|
||||
WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
|
||||
WEECHAT_PLUGIN_WEECHAT_VERSION(WEECHAT_VERSION);
|
||||
WEECHAT_PLUGIN_LICENSE("GPL3");
|
||||
|
||||
struct t_weechat_plugin *weechat_tcl_plugin = NULL;
|
||||
|
||||
@@ -33,7 +33,6 @@ WEECHAT_PLUGIN_NAME("trigger");
|
||||
WEECHAT_PLUGIN_DESCRIPTION("Trigger plugin for WeeChat");
|
||||
WEECHAT_PLUGIN_AUTHOR("FlashCode <flashcode@flashtux.org>");
|
||||
WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
|
||||
WEECHAT_PLUGIN_WEECHAT_VERSION(WEECHAT_VERSION);
|
||||
WEECHAT_PLUGIN_LICENSE("GPL3");
|
||||
|
||||
t_weechat_trigger *weechat_trigger_list = NULL;
|
||||
|
||||
@@ -33,7 +33,7 @@ struct t_infolist;
|
||||
struct t_weelist;
|
||||
|
||||
/* API version (used to check that plugin has same API and can be loaded) */
|
||||
#define WEECHAT_PLUGIN_API_VERSION "20090608-01"
|
||||
#define WEECHAT_PLUGIN_API_VERSION "20090612-01"
|
||||
|
||||
/* macros for defining plugin infos */
|
||||
#define WEECHAT_PLUGIN_NAME(__name) \
|
||||
@@ -45,8 +45,6 @@ struct t_weelist;
|
||||
char weechat_plugin_description[] = __desc;
|
||||
#define WEECHAT_PLUGIN_VERSION(__version) \
|
||||
char weechat_plugin_version[] = __version;
|
||||
#define WEECHAT_PLUGIN_WEECHAT_VERSION(__version) \
|
||||
char weechat_plugin_weechat_version[] = __version;
|
||||
#define WEECHAT_PLUGIN_LICENSE(__license) \
|
||||
char weechat_plugin_license[] = __license;
|
||||
|
||||
@@ -123,7 +121,6 @@ struct t_weechat_plugin
|
||||
char *description; /* description */
|
||||
char *author; /* author */
|
||||
char *version; /* plugin version */
|
||||
char *weechat_version; /* weechat version required */
|
||||
char *license; /* license */
|
||||
char *charset; /* charset used by plugin */
|
||||
int debug; /* debug level for plugin (0=off) */
|
||||
|
||||
@@ -47,7 +47,6 @@ WEECHAT_PLUGIN_DESCRIPTION("Xfer (file transfer and direct chat) plugin for "
|
||||
"WeeChat");
|
||||
WEECHAT_PLUGIN_AUTHOR("FlashCode <flashcode@flashtux.org>");
|
||||
WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
|
||||
WEECHAT_PLUGIN_WEECHAT_VERSION(WEECHAT_VERSION);
|
||||
WEECHAT_PLUGIN_LICENSE("GPL3");
|
||||
|
||||
struct t_weechat_plugin *weechat_xfer_plugin = NULL;
|
||||
|
||||
Reference in New Issue
Block a user