forked from external/yambar
modules: rename module_info -> plugin_info
This is the same name used by particles.
This commit is contained in:
parent
307a1f5ec8
commit
ec4a47e5db
12 changed files with 12 additions and 12 deletions
|
@ -280,7 +280,7 @@ from_conf(const struct yml_node *node, const struct font *parent_font)
|
||||||
conf_to_particle(content, parent_font));
|
conf_to_particle(content, parent_font));
|
||||||
}
|
}
|
||||||
|
|
||||||
const struct module_info module_info = {
|
const struct module_info plugin_info = {
|
||||||
.from_conf = &from_conf,
|
.from_conf = &from_conf,
|
||||||
.attr_count = 4,
|
.attr_count = 4,
|
||||||
.attrs = {
|
.attrs = {
|
||||||
|
|
|
@ -224,7 +224,7 @@ from_conf(const struct yml_node *node, const struct font *parent_font)
|
||||||
yml_value_as_string(name), conf_to_particle(c, parent_font));
|
yml_value_as_string(name), conf_to_particle(c, parent_font));
|
||||||
}
|
}
|
||||||
|
|
||||||
const struct module_info module_info = {
|
const struct module_info plugin_info = {
|
||||||
.from_conf = &from_conf,
|
.from_conf = &from_conf,
|
||||||
.attr_count = 3,
|
.attr_count = 3,
|
||||||
.attrs = {
|
.attrs = {
|
||||||
|
|
|
@ -356,7 +356,7 @@ from_conf(const struct yml_node *node, const struct font *parent_font)
|
||||||
poll_interval != NULL ? yml_value_as_int(poll_interval) : 60);
|
poll_interval != NULL ? yml_value_as_int(poll_interval) : 60);
|
||||||
}
|
}
|
||||||
|
|
||||||
const struct module_info module_info = {
|
const struct module_info plugin_info = {
|
||||||
.from_conf = &from_conf,
|
.from_conf = &from_conf,
|
||||||
.attr_count = 4,
|
.attr_count = 4,
|
||||||
.attrs = {
|
.attrs = {
|
||||||
|
|
|
@ -107,7 +107,7 @@ from_conf(const struct yml_node *node, const struct font *parent_font)
|
||||||
time_format != NULL ? yml_value_as_string(time_format) : "%H:%M");
|
time_format != NULL ? yml_value_as_string(time_format) : "%H:%M");
|
||||||
}
|
}
|
||||||
|
|
||||||
const struct module_info module_info = {
|
const struct module_info plugin_info = {
|
||||||
.from_conf = &from_conf,
|
.from_conf = &from_conf,
|
||||||
.attr_count = 4,
|
.attr_count = 4,
|
||||||
.attrs = {
|
.attrs = {
|
||||||
|
|
|
@ -701,7 +701,7 @@ verify_content(keychain_t *chain, const struct yml_node *node)
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
const struct module_info module_info = {
|
const struct module_info plugin_info = {
|
||||||
.from_conf = &from_conf,
|
.from_conf = &from_conf,
|
||||||
.attr_count = 5,
|
.attr_count = 5,
|
||||||
.attrs = {
|
.attrs = {
|
||||||
|
|
|
@ -53,7 +53,7 @@ from_conf(const struct yml_node *node, const struct font *parent_font)
|
||||||
return label_new(conf_to_particle(c, parent_font));
|
return label_new(conf_to_particle(c, parent_font));
|
||||||
}
|
}
|
||||||
|
|
||||||
const struct module_info module_info = {
|
const struct module_info plugin_info = {
|
||||||
.from_conf = &from_conf,
|
.from_conf = &from_conf,
|
||||||
.attr_count = 2,
|
.attr_count = 2,
|
||||||
.attrs = {
|
.attrs = {
|
||||||
|
|
|
@ -491,7 +491,7 @@ from_conf(const struct yml_node *node, const struct font *parent_font)
|
||||||
conf_to_particle(c, parent_font));
|
conf_to_particle(c, parent_font));
|
||||||
}
|
}
|
||||||
|
|
||||||
const struct module_info module_info = {
|
const struct module_info plugin_info = {
|
||||||
.from_conf = &from_conf,
|
.from_conf = &from_conf,
|
||||||
.attr_count = 4,
|
.attr_count = 4,
|
||||||
.attrs = {
|
.attrs = {
|
||||||
|
|
|
@ -543,7 +543,7 @@ from_conf(const struct yml_node *node, const struct font *parent_font)
|
||||||
yml_value_as_string(name), conf_to_particle(content, parent_font));
|
yml_value_as_string(name), conf_to_particle(content, parent_font));
|
||||||
}
|
}
|
||||||
|
|
||||||
const struct module_info module_info = {
|
const struct module_info plugin_info = {
|
||||||
.from_conf = &from_conf,
|
.from_conf = &from_conf,
|
||||||
.attr_count = 3,
|
.attr_count = 3,
|
||||||
.attrs = {
|
.attrs = {
|
||||||
|
|
|
@ -577,7 +577,7 @@ from_conf(const struct yml_node *node, const struct font *parent_font)
|
||||||
conf_to_particle(content, parent_font), left, right);
|
conf_to_particle(content, parent_font), left, right);
|
||||||
}
|
}
|
||||||
|
|
||||||
const struct module_info module_info = {
|
const struct module_info plugin_info = {
|
||||||
.from_conf = &from_conf,
|
.from_conf = &from_conf,
|
||||||
.attr_count = 5,
|
.attr_count = 5,
|
||||||
.attrs = {
|
.attrs = {
|
||||||
|
|
|
@ -459,7 +459,7 @@ from_conf(const struct yml_node *node, const struct font *parent_font)
|
||||||
return xkb_new(conf_to_particle(c, parent_font));
|
return xkb_new(conf_to_particle(c, parent_font));
|
||||||
}
|
}
|
||||||
|
|
||||||
const struct module_info module_info = {
|
const struct module_info plugin_info = {
|
||||||
.from_conf = &from_conf,
|
.from_conf = &from_conf,
|
||||||
.attr_count = 2,
|
.attr_count = 2,
|
||||||
.attrs = {
|
.attrs = {
|
||||||
|
|
|
@ -321,7 +321,7 @@ from_conf(const struct yml_node *node, const struct font *parent_font)
|
||||||
return xwindow_new(conf_to_particle(c, parent_font));
|
return xwindow_new(conf_to_particle(c, parent_font));
|
||||||
}
|
}
|
||||||
|
|
||||||
const struct module_info module_info = {
|
const struct module_info plugin_info = {
|
||||||
.from_conf = &from_conf,
|
.from_conf = &from_conf,
|
||||||
.attr_count = 2,
|
.attr_count = 2,
|
||||||
.attrs = {
|
.attrs = {
|
||||||
|
|
2
plugin.c
2
plugin.c
|
@ -69,7 +69,7 @@ plugin_load(const char *name, enum plugin_type type)
|
||||||
|
|
||||||
/* TODO: rename to plugin_info or so, in both modules and particles */
|
/* TODO: rename to plugin_info or so, in both modules and particles */
|
||||||
dlerror(); /* Clear previous error */
|
dlerror(); /* Clear previous error */
|
||||||
plug->sym = dlsym(lib, type == PLUGIN_MODULE ? "module_info" : "plugin_info");
|
plug->sym = dlsym(lib, "plugin_info");
|
||||||
|
|
||||||
const char *dlsym_error = dlerror();
|
const char *dlsym_error = dlerror();
|
||||||
if (dlsym_error != NULL) {
|
if (dlsym_error != NULL) {
|
||||||
|
|
Loading…
Add table
Reference in a new issue