diff options
| author | Cody Russell <crussell@canonical.com> | 2010-06-21 14:47:08 -0500 |
|---|---|---|
| committer | Cody Russell <crussell@canonical.com> | 2010-06-21 14:47:08 -0500 |
| commit | c4eb1c83cb2bc10c1cfb2346a83182f09e159e53 (patch) | |
| tree | 5e640a3f32b597dd406cbd425d1ced9b5e5ab3ff /libdbusmenu-glib/menuitem.h | |
| parent | cfdd33a19758224cb835efa705a410d3d4d0db91 (diff) | |
| parent | 3d800bf9b0133a613d28c31957c081d157a89af8 (diff) | |
| download | libdbusmenu-c4eb1c83cb2bc10c1cfb2346a83182f09e159e53.tar.gz libdbusmenu-c4eb1c83cb2bc10c1cfb2346a83182f09e159e53.tar.bz2 libdbusmenu-c4eb1c83cb2bc10c1cfb2346a83182f09e159e53.zip | |
Mainline merge, resolve conflicts.
Diffstat (limited to 'libdbusmenu-glib/menuitem.h')
| -rw-r--r-- | libdbusmenu-glib/menuitem.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libdbusmenu-glib/menuitem.h b/libdbusmenu-glib/menuitem.h index 77997ba..e17d851 100644 --- a/libdbusmenu-glib/menuitem.h +++ b/libdbusmenu-glib/menuitem.h @@ -59,6 +59,7 @@ G_BEGIN_DECLS #define DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE "toggle-type" #define DBUSMENU_MENUITEM_PROP_TOGGLE_STATE "toggle-state" #define DBUSMENU_MENUITEM_PROP_SHORTCUT "shortcut" +#define DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY "children-display" #define DBUSMENU_MENUITEM_TOGGLE_CHECK "checkmark" #define DBUSMENU_MENUITEM_TOGGLE_RADIO "radio" @@ -74,6 +75,7 @@ G_BEGIN_DECLS #define DBUSMENU_MENUITEM_SHORTCUT_SHIFT "Shift" #define DBUSMENU_MENUITEM_SHORTCUT_SUPER "Super" +#define DBUSMENU_MENUITEM_CHILD_DISPLAY_SUBMENU "submenu" /** * DbusmenuMenuitem: |