summaryrefslogtreecommitdiff
path: root/openbox/engine.c
diff options
context:
space:
mode:
Diffstat (limited to 'openbox/engine.c')
-rw-r--r--openbox/engine.c14
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)) {