diff options
| author | Ted Gould <ted@gould.cx> | 2011-02-23 11:21:45 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-02-23 11:21:45 -0600 |
| commit | 0bc8065bd39920071bfd7df65b5d42807c7fbbd6 (patch) | |
| tree | 43c72d8795e29a4fb2ba8c1dac3256eea12f6f63 | |
| parent | 5da1cb455109b7138c7b13ff4214569f0fa0cc40 (diff) | |
| parent | 3887a48a9c3557c396b472f7a8bb95101a025d0d (diff) | |
| download | libdbusmenu-0bc8065bd39920071bfd7df65b5d42807c7fbbd6.tar.gz libdbusmenu-0bc8065bd39920071bfd7df65b5d42807c7fbbd6.tar.bz2 libdbusmenu-0bc8065bd39920071bfd7df65b5d42807c7fbbd6.zip | |
* Upstream merge
* Handle the case of a single NULL entry as well.
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | libdbusmenu-glib/menuitem.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 974f607..b23023d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.3.98-0ubuntu2~ppa5) UNRELEASED; urgency=low + + * Upstream merge + * Handle the case of a single NULL entry as well. + + -- Ted Gould <ted@ubuntu.com> Wed, 23 Feb 2011 11:21:25 -0600 + libdbusmenu (0.3.98-0ubuntu2~ppa4) natty; urgency=low * Upstream merge diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c index 0e9aae4..ed863bd 100644 --- a/libdbusmenu-glib/menuitem.c +++ b/libdbusmenu-glib/menuitem.c @@ -1363,7 +1363,7 @@ dbusmenu_menuitem_properties_variant (DbusmenuMenuitem * mi, const gchar ** prop GVariant * final_variant = NULL; - if (properties == NULL && g_hash_table_size(priv->properties) > 0) { + if ((properties == NULL || properties[0] == NULL) && g_hash_table_size(priv->properties) > 0) { GVariantBuilder builder; g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY); |