diff options
| author | Ted Gould <ted@gould.cx> | 2010-06-22 14:38:01 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-06-22 14:38:01 -0500 |
| commit | 6f450c387b237805a38aec95fb9bd610ecd093ab (patch) | |
| tree | e5c2f8476f0044bdd3b97b73402ce0521c0e2465 | |
| parent | d80fb4eb8fc807b1b29b58aa179eb3e1798f37a3 (diff) | |
| parent | 2412ce9b02272a0928157b91a15d67b8f1b805a5 (diff) | |
| download | libdbusmenu-6f450c387b237805a38aec95fb9bd610ecd093ab.tar.gz libdbusmenu-6f450c387b237805a38aec95fb9bd610ecd093ab.tar.bz2 libdbusmenu-6f450c387b237805a38aec95fb9bd610ecd093ab.zip | |
* Upstream Merge
* Looking further inside the boxes
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | libdbusmenu-gtk/menuitem.c | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index f0819eb..f806527 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.3.2-1ubuntu1~ppa4~value2) UNRELEASED; urgency=low + + * Upstream Merge + * Looking further inside the boxes + + -- Ted Gould <ted@ubuntu.com> Tue, 22 Jun 2010 14:37:39 -0500 + libdbusmenu (0.3.2-1ubuntu1~ppa4~value1) lucid; urgency=low * Upstream Merge diff --git a/libdbusmenu-gtk/menuitem.c b/libdbusmenu-gtk/menuitem.c index e1e1e30..0eb0758 100644 --- a/libdbusmenu-gtk/menuitem.c +++ b/libdbusmenu-gtk/menuitem.c @@ -295,7 +295,7 @@ dbusmenu_menuitem_property_get_shortcut (DbusmenuMenuitem * menuitem, guint * ke if (wrapper == NULL) { return; } - if (!G_VALUE_HOLDS_BOXED(wrapper)) { + if (!G_VALUE_HOLDS(wrapper, G_TYPE_VALUE_ARRAY)) { return; } @@ -309,7 +309,7 @@ dbusmenu_menuitem_property_get_shortcut (DbusmenuMenuitem * menuitem, guint * ke } GValue * ventryarray = g_value_array_get_nth(wrapperarray, 0); - if (!G_VALUE_HOLDS_BOXED(ventryarray)) { + if (!G_VALUE_HOLDS(ventryarray, G_TYPE_VALUE_ARRAY)) { return; } |