diff options
| author | Ted Gould <ted@gould.cx> | 2010-02-18 10:51:09 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-02-18 10:51:09 -0600 |
| commit | ff2c72c5ce197fc17c58ef6546fd51215f930226 (patch) | |
| tree | f6f5a7b784442cf41d1010dfb8193ff8b179afdb | |
| parent | 74052e601e19a2ce169ddd8529874f85497c909c (diff) | |
| parent | d1abfffd1770a22420f08851453b93cc72f31e29 (diff) | |
| download | libdbusmenu-ff2c72c5ce197fc17c58ef6546fd51215f930226.tar.gz libdbusmenu-ff2c72c5ce197fc17c58ef6546fd51215f930226.tar.bz2 libdbusmenu-ff2c72c5ce197fc17c58ef6546fd51215f930226.zip | |
* Upstream merge
* Adding ID to default <menu> item.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | libdbusmenu-glib/server.c | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 747b90b..c99525b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,3 @@ - +EXTRA_DIST = COPYING.2.1 COPYING-GPL3 SUBDIRS = libdbusmenu-glib libdbusmenu-gtk tools tests po diff --git a/debian/changelog b/debian/changelog index 675a934..bb68bab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.2.4-0ubuntu2~ppa1) UNRELEASED; urgency=low + + * Upstream merge + * Adding ID to default <menu> item. + + -- Ted Gould <ted@ubuntu.com> Thu, 18 Feb 2010 10:50:40 -0600 + libdbusmenu (0.2.4-0ubuntu1) lucid; urgency=low * Upstream release 0.2.4 diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c index 44ee911..55d339f 100644 --- a/libdbusmenu-glib/server.c +++ b/libdbusmenu-glib/server.c @@ -378,7 +378,7 @@ _dbusmenu_server_get_layout (DbusmenuServer * server, gint parent, guint * revis if (parent == 0) { if (priv->root == NULL) { /* g_debug("Getting layout without root node!"); */ - g_ptr_array_add(xmlarray, g_strdup("<menu/>")); + g_ptr_array_add(xmlarray, g_strdup("<menu id=\"0\"/>")); } else { dbusmenu_menuitem_buildxml(priv->root, xmlarray); } |