use CurrentTime again?

[chaz/openbox] / openbox / engine.c

diff --git a/openbox/engine.c b/openbox/engine.c
index 3457da1838bd9c9f8e35ae0a5f7b4fb9fbfdd353..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>
@@ -23,13 +24,13 @@ static gboolean load(char *name)
     g_assert(module == NULL);
 
     path = g_build_filename(ENGINEDIR, name, NULL);
-    module = g_module_open(path, G_MODULE_BIND_LAZY);
+    module = g_module_open(path, 0);
     g_free(path);
 
     if (module == NULL) {
        path = g_build_filename(g_get_home_dir(), ".openbox", "engines", name,
                                NULL);
-       module = g_module_open(path, G_MODULE_BIND_LAZY);
+       module = g_module_open(path, 0);
        g_free(path);
     }
 
@@ -42,8 +43,7 @@ static gboolean load(char *name)
     LOADSYM(frame_new, engine_frame_new);
     LOADSYM(frame_grab_client, engine_frame_grab_client);
     LOADSYM(frame_release_client, engine_frame_release_client);
-    LOADSYM(frame_adjust_size, engine_frame_adjust_size);
-    LOADSYM(frame_adjust_position, engine_frame_adjust_position);
+    LOADSYM(frame_adjust_area, engine_frame_adjust_area);
     LOADSYM(frame_adjust_shape, engine_frame_adjust_shape);
     LOADSYM(frame_adjust_state, engine_frame_adjust_state);
     LOADSYM(frame_adjust_focus, engine_frame_adjust_focus);
@@ -59,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)) {