From b579f97db7832543aad6a6a5beab44e58b52d1e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Wed, 19 Dec 2018 19:00:29 +0100 Subject: [PATCH] module/xwindow: use module common constructor/destructor --- modules/xwindow/xwindow.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/modules/xwindow/xwindow.c b/modules/xwindow/xwindow.c index c92221f..9a16d92 100644 --- a/modules/xwindow/xwindow.c +++ b/modules/xwindow/xwindow.c @@ -283,7 +283,7 @@ destroy(struct module *mod) free(m->application); free(m->title); free(m); - free(mod); + module_default_destroy(mod); } struct module * @@ -293,14 +293,10 @@ module_xwindow(struct particle *label) m->label = label; mtx_init(&m->lock, mtx_plain); - struct module *mod = malloc(sizeof(*mod)); - mod->bar = NULL; + struct module *mod = module_common_new(); mod->private = m; mod->run = &run; mod->destroy = &destroy; mod->content = &content; - mod->begin_expose = &module_default_begin_expose; - mod->expose = &module_default_expose; - mod->end_expose = &module_default_end_expose; return mod; }