diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | libdbusmenu-glib/client.c | 10 |
2 files changed, 16 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 3979ac0..fc72d48 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.2.8-0ubuntu1~ppa2~crash1) UNRELEASED; urgency=low + + * Upstream Merge + * Trying to fix stuff. + + -- Ted Gould <ted@ubuntu.com> Wed, 31 Mar 2010 01:04:04 -0500 + libdbusmenu (0.2.8-0ubuntu1~ppa1) lucid; urgency=low * Upstream release 0.2.8 diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index 309a11c..ae4b2f9 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -337,7 +337,12 @@ id_prop_update (DBusGProxy * proxy, gint id, gchar * property, GValue * value, D g_return_if_fail(priv->root != NULL); DbusmenuMenuitem * menuitem = dbusmenu_menuitem_find_id(priv->root, id); - g_return_if_fail(menuitem != NULL); + if (menuitem == NULL) { + #ifdef MASSIVEDEBUGGING + g_debug("Property update '%s' on id %d which couldn't be found", property, id); + #endif + return; + } dbusmenu_menuitem_property_set_value(menuitem, property, value); @@ -444,6 +449,9 @@ proxy_destroyed (GObject * gobj_proxy, gpointer userdata) priv->layoutcall = NULL; } + priv->current_revision = 0; + priv->my_revision = 0; + build_dbus_proxy(DBUSMENU_CLIENT(userdata)); return; } |