make ob_state a function so it cant be changed outside of openbox.c

[chaz/openbox] / openbox / plugin.c

diff --git a/openbox/plugin.c b/openbox/plugin.c
index a5055de9a1088a27dd2a227219b277d605d6000f..747bde6f1ab47a18f0ffa9f4b277ac93c008e568 100644 (file)
--- a/openbox/plugin.c
+++ b/openbox/plugin.c
@@ -1,12 +1,8 @@
+#include "plugins/interface.h"
+
 #include <glib.h>
 #include <gmodule.h>
 
-typedef void (*PluginSetupConfig)();
-typedef void (*PluginStartup)();
-typedef void (*PluginShutdown)();
-typedef void *(*PluginCreate)(/* TODO */);
-typedef void (*PluginDestroy)(void *);
-
 typedef struct {
     GModule *module;
     char *name;
@@ -164,6 +160,9 @@ void plugin_loadall()
         plugin_open("mouse");
         plugin_open("placement");
         plugin_open("resistance");
+
+        /* XXX rm me when the parser loads me magically */
+        plugin_open("client_menu");
     } else {
         /* load the plugins in the rc file */
         while (g_io_channel_read_line(io, &name, NULL, NULL, &err) ==