diff options
author | Ted Gould <ted@gould.cx> | 2010-04-14 14:41:03 -0500 |
---|---|---|
committer | Ted Gould <ted@gould.cx> | 2010-04-14 14:41:03 -0500 |
commit | 911ecc7b79dbbf4c2e031e85bdac55079de49aa4 (patch) | |
tree | 9c9ff43034a93055151862e3ee7fe196af286a80 /libdbusmenu-glib | |
parent | addd35e86d7126f9d0d374f1507425941869d240 (diff) | |
parent | 3dbca0954d9f02df4c9a45a2d4573000d5b4a622 (diff) | |
download | libdbusmenu-911ecc7b79dbbf4c2e031e85bdac55079de49aa4.tar.gz libdbusmenu-911ecc7b79dbbf4c2e031e85bdac55079de49aa4.tar.bz2 libdbusmenu-911ecc7b79dbbf4c2e031e85bdac55079de49aa4.zip |
* Upstream Merge
* Adding in visible property to docs
* Helpful comments in the code
Diffstat (limited to 'libdbusmenu-glib')
-rw-r--r-- | libdbusmenu-glib/client.c | 2 | ||||
-rw-r--r-- | libdbusmenu-glib/dbus-menu.xml | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index f5546a2..3ce0ccb 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -748,6 +748,7 @@ parse_layout_xml(DbusmenuClient * client, xmlNodePtr node, DbusmenuMenuitem * it if (parent != NULL) { dbusmenu_menuitem_child_delete(parent, item); } + /* XXX: Should this be an unref? Who's reffing this that it exists without a parent? */ g_object_unref(G_OBJECT(item)); item = NULL; } @@ -773,6 +774,7 @@ parse_layout_xml(DbusmenuClient * client, xmlNodePtr node, DbusmenuMenuitem * it } } else { /* Refresh the properties */ + /* XXX: We shouldn't need to get the properties everytime we reuse an entry */ gchar * properties[1] = {NULL}; /* This gets them all */ org_ayatana_dbusmenu_get_properties_async(proxy, id, (const gchar **)properties, menuitem_get_properties_replace_cb, item); } diff --git a/libdbusmenu-glib/dbus-menu.xml b/libdbusmenu-glib/dbus-menu.xml index ad21f68..7937049 100644 --- a/libdbusmenu-glib/dbus-menu.xml +++ b/libdbusmenu-glib/dbus-menu.xml @@ -82,6 +82,12 @@ License version 3 and version 2.1 along with this program. If not, see <td>true</td> </tr> <tr> + <td>visible</td> + <td>boolean</td> + <td>True if the item is visible in the menu.</td> + <td>true</td> + </tr> + <tr> <td>icon-name</td> <td>string</td> <td>Icon name of the item, following the freedesktop.org icon spec.</td> |