use a context enum instead of quarks

[chaz/openbox] / openbox / engine.c

diff --git a/openbox/engine.c b/openbox/engine.c
index 235277397ffddafaf287b3557401d6f3853f76a1..c654d26380d942a287543528163b7f1fcb64d547 100644 (file)
--- 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,16 @@ static gboolean load(char *name)
     return TRUE;
 }
 
-void engine_startup(char *engine)
+void engine_startup()
 {
+    ConfigValue engine;
+
     module = NULL;
 
-    if (engine != NULL) {
-       if (load(engine))
+    if (config_get("engine", Config_String, &engine)) {
+       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)) {