aboutsummaryrefslogtreecommitdiff
path: root/libdbusmenu-glib
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-03-29 09:56:35 -0500
committerTed Gould <ted@gould.cx>2011-03-29 09:56:35 -0500
commit3d5e747ea498f289f0f98474d628b9f18df3946c (patch)
tree247418b3b0e4015585b6a13dcc2e642ad9e27812 /libdbusmenu-glib
parente89388723962f7cdc6da15369da3af5c83e75c5b (diff)
parent6c9761c9c66a51d6a00a59f14048267beb7ca7f1 (diff)
downloadlibdbusmenu-3d5e747ea498f289f0f98474d628b9f18df3946c.tar.gz
libdbusmenu-3d5e747ea498f289f0f98474d628b9f18df3946c.tar.bz2
libdbusmenu-3d5e747ea498f289f0f98474d628b9f18df3946c.zip
* Upstream Merge
* Protections and keeping the child variant for the iterator around longer.
Diffstat (limited to 'libdbusmenu-glib')
-rw-r--r--libdbusmenu-glib/defaults.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libdbusmenu-glib/defaults.c b/libdbusmenu-glib/defaults.c
index 9eaf9e5..ec70da6 100644
--- a/libdbusmenu-glib/defaults.c
+++ b/libdbusmenu-glib/defaults.c
@@ -85,7 +85,7 @@ dbusmenu_defaults_init (DbusmenuDefaults *self)
dbusmenu_defaults_default_set(self, DBUSMENU_CLIENT_TYPES_DEFAULT, DBUSMENU_MENUITEM_PROP_ICON_NAME, G_VARIANT_TYPE_STRING, NULL);
dbusmenu_defaults_default_set(self, DBUSMENU_CLIENT_TYPES_DEFAULT, DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE, G_VARIANT_TYPE_STRING, NULL);
dbusmenu_defaults_default_set(self, DBUSMENU_CLIENT_TYPES_DEFAULT, DBUSMENU_MENUITEM_PROP_TOGGLE_STATE, G_VARIANT_TYPE_INT32, NULL);
- dbusmenu_defaults_default_set(self, DBUSMENU_CLIENT_TYPES_DEFAULT, DBUSMENU_MENUITEM_PROP_SHORTCUT, G_VARIANT_TYPE_ARRAY, NULL);
+ dbusmenu_defaults_default_set(self, DBUSMENU_CLIENT_TYPES_DEFAULT, DBUSMENU_MENUITEM_PROP_SHORTCUT, G_VARIANT_TYPE("aas"), NULL);
dbusmenu_defaults_default_set(self, DBUSMENU_CLIENT_TYPES_DEFAULT, DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY, G_VARIANT_TYPE_STRING, NULL);
/* Separator defaults */