Merge branch 'backport' into work

[chaz/openbox] / openbox / config.h

diff --git a/openbox/config.h b/openbox/config.h
index 3fd1b879a61b5246f98ab8fc1f2fefd2c61e312b..248f97b36279fac14d73c5e8da65001039aab405 100644 (file)
--- a/openbox/config.h
+++ b/openbox/config.h
@@ -23,14 +23,14 @@
 #include "misc.h"
 #include "stacking.h"
 #include "place.h"
+#include "client.h"
 #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
@@ -38,6 +38,7 @@ struct _ObAppSettings
     GPatternSpec *class;
     GPatternSpec *name;
     GPatternSpec *role;
+    ObClientType  type;
 
     GravityPoint position;
     gboolean pos_given;
@@ -131,6 +132,8 @@ extern gboolean config_theme_keepborder;
 extern gchar *config_title_layout;
 /*! Animate windows iconifying and restoring */
 extern gboolean config_animate_iconify;
+/*! Size of icons in focus switching dialogs */
+extern guint config_theme_window_list_icon_size;
 
 /*! The font for the active window's title */
 extern RrFont *config_font_activewindow;
@@ -186,15 +189,14 @@ extern GSList *config_menu_files;
 /*! Per app settings */
 extern GSList *config_per_app_settings;
 
-void config_startup(struct _ObParseInst *i);
-void config_shutdown();
+void config_startup(ObtParseInst *i);
+void config_shutdown(void);
 
 /*! Create an ObAppSettings structure with the default values */
-ObAppSettings* config_create_app_settings();
+ObAppSettings* config_create_app_settings(void);
 /*! Copies any settings in src to dest, if they are their default value in
   src. */
 void config_app_settings_copy_non_defaults(const ObAppSettings *src,
                                            ObAppSettings *dest);
 
-
 #endif