module/xkb: use module common constructor/destructor

This commit is contained in:
Daniel Eklöf 2018-12-19 18:59:33 +01:00
parent 20cb0f0de7
commit f8cb3acc35

View file

@ -48,7 +48,7 @@ destroy(struct module *mod)
m->label->destroy(m->label); m->label->destroy(m->label);
free_layouts(m->layouts); free_layouts(m->layouts);
free(m); free(m);
free(mod); module_default_destroy(mod);
} }
static struct exposable * static struct exposable *
@ -453,14 +453,10 @@ module_xkb(struct particle *label)
m->layouts.count = 0; m->layouts.count = 0;
m->layouts.layouts = NULL; m->layouts.layouts = NULL;
struct module *mod = malloc(sizeof(*mod)); struct module *mod = module_common_new();
mod->bar = NULL;
mod->private = m; mod->private = m;
mod->run = &run; mod->run = &run;
mod->destroy = &destroy; mod->destroy = &destroy;
mod->content = &content; mod->content = &content;
mod->begin_expose = &module_default_begin_expose;
mod->expose = &module_default_expose;
mod->end_expose = &module_default_end_expose;
return mod; return mod;
} }