diff options
| author | Ted Gould <ted@gould.cx> | 2011-01-25 16:54:38 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-01-25 16:54:38 -0600 |
| commit | b5521493b3479f48b76fee4b0a3bbf415cbf7153 (patch) | |
| tree | f30bbd744541f5b681c7c15e230884f9d8449e9e /libdbusmenu-glib | |
| parent | e53fadaf3142d03bcec14b1dd00673c5fc2a7121 (diff) | |
| parent | 275bd0eec2e28b708ff6cda14531f63a8aa16e8e (diff) | |
| download | libdbusmenu-b5521493b3479f48b76fee4b0a3bbf415cbf7153.tar.gz libdbusmenu-b5521493b3479f48b76fee4b0a3bbf415cbf7153.tar.bz2 libdbusmenu-b5521493b3479f48b76fee4b0a3bbf415cbf7153.zip | |
* Upstream Merge
* Look for the serializable menuitems and use their
build functions
* Fix critical message from being printed
Diffstat (limited to 'libdbusmenu-glib')
| -rw-r--r-- | libdbusmenu-glib/client.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index ea0f0f7..a25ad79 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -1451,7 +1451,7 @@ parse_layout_xml(DbusmenuClient * client, xmlNodePtr node, DbusmenuMenuitem * it /* We've got everything built up at this node and reconcilled */ /* Flush the properties requests if this is the first level */ - if (dbusmenu_menuitem_get_id(parent) == 0) { + if (parent != NULL && dbusmenu_menuitem_get_id(parent) == 0) { get_properties_flush(client); } |