diff options
| author | Ted Gould <ted@gould.cx> | 2010-06-22 16:51:25 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-06-22 16:51:25 -0500 |
| commit | 6982a71a50a535f65ee4945b744189f4d707d26e (patch) | |
| tree | b8fa2555bc0665f898d08fcf8a964ed71cb7611a | |
| parent | b95497795ac8031074789ee3b6eee2be899ac909 (diff) | |
| parent | c94eb1cfe25551c528409fdcb9d56446a915ed0f (diff) | |
| download | libdbusmenu-6982a71a50a535f65ee4945b744189f4d707d26e.tar.gz libdbusmenu-6982a71a50a535f65ee4945b744189f4d707d26e.tar.bz2 libdbusmenu-6982a71a50a535f65ee4945b744189f4d707d26e.zip | |
* Upstream merge
* Lowering protection on type checking
| -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 b22ff71..0e1682f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.3.2-1ubuntu1~ppa5~qtish2) UNRELEASED; urgency=low + + * Upstream merge + * Lowering protection on type checking + + -- Ted Gould <ted@ubuntu.com> Tue, 22 Jun 2010 16:51:01 -0500 + libdbusmenu (0.3.2-1ubuntu1~ppa5~qtish1) lucid; urgency=low * Upstream Merge diff --git a/libdbusmenu-gtk/menuitem.c b/libdbusmenu-gtk/menuitem.c index 5d41934..44e78e1 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(wrapper, G_TYPE_PTR_ARRAY)) { + if (!G_VALUE_HOLDS(wrapper, G_TYPE_BOXED)) { g_warning("Unexpected shortcut structure. Wrapper is: %s", G_VALUE_TYPE_NAME(wrapper)); return; } @@ -310,7 +310,7 @@ dbusmenu_menuitem_property_get_shortcut (DbusmenuMenuitem * menuitem, guint * ke } GValue * ventryarray = g_ptr_array_index(wrapperarray, 0); - if (!G_VALUE_HOLDS(ventryarray, G_TYPE_STRV)) { + if (!G_VALUE_HOLDS(ventryarray, G_TYPE_BOXED)) { g_warning("Unexpected shortcut structure. Value array is: %s", G_VALUE_TYPE_NAME(ventryarray)); return; } |