diff options
| author | Dana Jansens <danakj@orodu.net> | 2003-03-22 22:45:05 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2003-03-22 22:45:05 +0000 |
| commit | 9f68b12062bfa5e68c00db8a74ca58998661a13b (patch) | |
| tree | 189a887bdcb4cc424be4176a87c5086b02cdab99 /openbox/engine.c | |
| parent | 93783c2a048574ffc99d329aae3f6ff50e31d8d7 (diff) | |
load the engine out of the config shit. tho the ordering is fucked atm
Diffstat (limited to 'openbox/engine.c')
| -rw-r--r-- | openbox/engine.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/openbox/engine.c b/openbox/engine.c index 23527739..c4e24a39 100644 --- a/openbox/engine.c +++ b/openbox/engine.c @@ -1,4 +1,5 @@ #include "engine.h" +#include "config.h" #include <glib.h> #include <gmodule.h> @@ -58,14 +59,17 @@ static gboolean load(char *name) return TRUE; } -void engine_startup(char *engine) +void engine_startup() { - module = NULL; + ConfigValue engine; - if (engine != NULL) { - if (load(engine)) + module = NULL; + g_message("ENGINE STARTUP"); + if (config_get("engine", Config_String, &engine)) { + g_warning("GOT ENGINE %s", engine.string); + if (load(engine.string)) return; - g_warning("Failed to load the engine '%s'", engine); + g_warning("Failed to load the engine '%s'", engine.string); g_message("Falling back to the default: '%s'", DEFAULT_ENGINE); } if (!load(DEFAULT_ENGINE)) { |
