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 | |
| 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
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | libdbusmenu-glib/client.c | 2 | ||||
| -rw-r--r-- | libdbusmenu-glib/dbus-menu.xml | 6 |
3 files changed, 16 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 5089e38..4783d80 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering1) UNRELEASED; urgency=low + + * Upstream Merge + * Adding in visible property to docs + * Helpful comments in the code + + -- Ted Gould <ted@ubuntu.com> Wed, 14 Apr 2010 14:40:26 -0500 + libdbusmenu (0.2.9-0ubuntu1~ppa1) lucid; urgency=low * New upstream release. 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> |