Merge branch 'backport' into work

[chaz/openbox] / openbox / menuframe.h

diff --git a/openbox/menuframe.h b/openbox/menuframe.h
index 1d5dd0cb11b3d13b1ebe7e0a04de388ddf0d9103..f6a7b30eb89adf147db6bac11d5246275adb4e0c 100644 (file)
--- a/openbox/menuframe.h
+++ b/openbox/menuframe.h
@@ -53,6 +53,9 @@ struct _ObMenuFrame
 
     GList *entries;
     ObMenuEntryFrame *selected;
+    /* if a submenu was selected, then this holds the entry for that submenu
+       until it is closed */
+    ObMenuEntryFrame *open_submenu;
 
     /* show entries from the menu starting at this index */
     guint show_from;