Rework the code provided by Kadlcik Libor for loading/showing icons in Openbox menus.

[chaz/openbox] / openbox / config.h

diff --git a/openbox/config.h b/openbox/config.h
index 11796dcb0788b3b4e7ec5006a35ccad4b5f5eaa8..0e4ccb5cf0f0c80717aed2158f9b2e122caed00c 100644 (file)
--- a/openbox/config.h
+++ b/openbox/config.h
@@ -26,8 +26,8 @@
 #include "client.h"
 #include "geom.h"
 #include "moveresize.h"
-#include "render/render.h"
-#include "obt/parse.h"
+#include "obrender/render.h"
+#include "obt/xml.h"
 
 #include <glib.h>
 
@@ -191,16 +191,18 @@ extern guint    config_menu_hide_delay;
 extern gboolean config_menu_middle;
 /*! Delay before opening a submenu in milliseconds */
 extern guint    config_submenu_show_delay;
-/*! Show icons in client_list_menu */
-extern gboolean config_menu_client_list_icons;
+/*! Delay before closing a submenu in milliseconds */
+extern guint    config_submenu_hide_delay;
 /*! Show manage desktops in client_list_menu */
 extern gboolean config_menu_manage_desktops;
+/*! Load & show icons in user-defined menus */
+extern gboolean config_menu_show_icons;
 /*! User-specified menu files */
 extern GSList *config_menu_files;
 /*! Per app settings */
 extern GSList *config_per_app_settings;
 
-void config_startup(ObtParseInst *i);
+void config_startup(ObtXmlInst *i);
 void config_shutdown(void);
 
 /*! Create an ObAppSettings structure with the default values */