diff options
| author | Ted Gould <ted@gould.cx> | 2011-03-03 13:42:49 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-03-03 13:42:49 -0600 |
| commit | bf0ec7cdc8c37f4ec7668f18b0be10942564957b (patch) | |
| tree | 55f81b7667a7734b0a74a5312306a5fc99d15727 /debian/patches/lp726678.patch | |
| parent | 8a14b520be730c1ae725f72043298f550c94a2cf (diff) | |
| parent | 86cabf670968df8056246d2f6c3b2c4f6b19399a (diff) | |
| download | libdbusmenu-bf0ec7cdc8c37f4ec7668f18b0be10942564957b.tar.gz libdbusmenu-bf0ec7cdc8c37f4ec7668f18b0be10942564957b.tar.bz2 libdbusmenu-bf0ec7cdc8c37f4ec7668f18b0be10942564957b.zip | |
Merge from U. Desktop
Diffstat (limited to 'debian/patches/lp726678.patch')
| -rw-r--r-- | debian/patches/lp726678.patch | 17 |
1 files changed, 17 insertions, 0 deletions
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? */ + |