From c9ccc70fcbbe6631248e74d0361aa92dc9c1ea30 Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Sat, 11 Aug 2012 22:01:08 +0200 Subject: main: move conf_global to kmscon_conf in new header main.h The main configuration is now limited to kmscon and thus should not use the conf_* prefix. Move all code to use the new name and introduce the new main.h header mainly for kmscon. Signed-off-by: David Herrmann --- src/terminal.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/terminal.c') diff --git a/src/terminal.c b/src/terminal.c index 39e397d..118ad96 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -33,10 +33,10 @@ #include #include #include -#include "conf.h" #include "console.h" #include "eloop.h" #include "log.h" +#include "main.h" #include "pty.h" #include "static_misc.h" #include "terminal.h" @@ -172,7 +172,7 @@ static int add_display(struct kmscon_terminal *term, struct uterm_display *disp) goto err_free; } - ret = kmscon_font_find(&scr->font, &attr, conf_global.font_engine); + ret = kmscon_font_find(&scr->font, &attr, kmscon_conf.font_engine); if (ret) { log_error("cannot create font"); goto err_screen; -- cgit v1.2.3