Merge branch 'backport' into work

[chaz/openbox] / openbox / config.h

diff --git a/openbox/config.h b/openbox/config.h
index 50e7dfe3fdb938e7a3b7802e6b3fb7cc13f97461..1a60ee0f75b8e604d5c23f3027ee337752218cb4 100644 (file)
--- a/openbox/config.h
+++ b/openbox/config.h
@@ -26,11 +26,10 @@
 #include "geom.h"
 #include "moveresize.h"
 #include "render/render.h"
+#include "obt/parse.h"
 
 #include <glib.h>
 
-struct _ObParseInst;
-
 typedef struct _ObAppSettings ObAppSettings;
 
 struct _ObAppSettings
@@ -78,7 +77,7 @@ extern ObPlacePolicy config_place_policy;
 extern gboolean config_place_center;
 /*! Place windows on the active monitor (unless they are part of an application
   already on another monitor) */
-extern gboolean config_place_active;
+extern ObPlaceMonitor config_place_monitor;
 
 /*! User-specified margins around the edge of the screen(s) */
 extern StrutPartial config_margins;
@@ -183,7 +182,7 @@ extern GSList *config_menu_files;
 /*! Per app settings */
 extern GSList *config_per_app_settings;
 
-void config_startup(struct _ObParseInst *i);
+void config_startup(ObtParseInst *i);
 void config_shutdown();
 
 /*! Create an ObAppSettings structure with the default values */