diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2011-03-01 12:26:20 -0500 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2011-03-01 12:26:20 -0500 |
| commit | 86cabf670968df8056246d2f6c3b2c4f6b19399a (patch) | |
| tree | 55f81b7667a7734b0a74a5312306a5fc99d15727 /debian | |
| parent | 333935cdc35607f5c357226db2060100cba332c6 (diff) | |
| download | libdbusmenu-86cabf670968df8056246d2f6c3b2c4f6b19399a.tar.gz libdbusmenu-86cabf670968df8056246d2f6c3b2c4f6b19399a.tar.bz2 libdbusmenu-86cabf670968df8056246d2f6c3b2c4f6b19399a.zip | |
releasing version 0.3.99-0ubuntu5
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/lp726678.patch | 17 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 25 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 9029486..3216091 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.3.99-0ubuntu5) natty; urgency=low + + * debian/patches/lp726678.patch + - GTK application menus are not correctly displayed (LP: #726678) + + -- Ken VanDine <ken.vandine@canonical.com> Tue, 01 Mar 2011 12:14:35 -0500 + libdbusmenu (0.3.99-0ubuntu4) natty; urgency=low * Fix a warning in gedit diff --git a/debian/patches/lp726678.patch b/debian/patches/lp726678.patch new file mode 100644 index 0000000..e784b60 --- /dev/null +++ b/debian/patches/lp726678.patch @@ -0,0 +1,17 @@ +=== modified file 'libdbusmenu-glib/server.c' +--- a/libdbusmenu-glib/server.c 2011-02-24 19:52:01 +0000 ++++ b/libdbusmenu-glib/server.c 2011-03-01 16:51:50 +0000 +@@ -1180,7 +1180,11 @@ + GVariant * items = NULL; + + if (priv->root != NULL) { +- items = dbusmenu_menuitem_build_variant(priv->root, props, recurse); ++ DbusmenuMenuitem * mi = dbusmenu_menuitem_find_id(priv->root, parent); ++ ++ if (mi != NULL) { ++ items = dbusmenu_menuitem_build_variant(mi, props, recurse); ++ } + } + + /* What happens if we don't have anything? */ + diff --git a/debian/patches/series b/debian/patches/series index 6be76c6..3467a18 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ disconnect-more-signals.patch fix-defaults-in-client.patch bluetooth-applet-fix.patch +lp726678.patch |