Merge branch 'backport' into work

[chaz/openbox] / openbox / config.h

diff --git a/openbox/config.h b/openbox/config.h
index 89c4c6f6807ab79ac0423b2a17dce49bcf35ff47..818dcc760ea3e1deee9ef4e2013787a31e8e6833 100644 (file)
--- a/openbox/config.h
+++ b/openbox/config.h
@@ -38,6 +38,7 @@ struct _ObAppSettings
     GPatternSpec *class;
     GPatternSpec *name;
     GPatternSpec *role;
+    GPatternSpec *title;
     ObClientType  type;
 
     GravityPoint position;
@@ -193,10 +194,10 @@ extern gboolean config_menu_middle;
 extern guint    config_submenu_show_delay;
 /*! Delay before closing a submenu in milliseconds */
 extern guint    config_submenu_hide_delay;
-/*! Show icons in client_list_menu */
-extern gboolean config_menu_client_list_icons;
 /*! 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 */