diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2009-09-17 13:18:36 -0400 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2009-09-17 13:18:36 -0400 |
| commit | 6c75099b24d3f9c47a4a6035bf234b1fed42d200 (patch) | |
| tree | f5c97421e8491bdd41732fd197175eef7bc706bf | |
| parent | 3d9c30c450fd7b7af4a28ccc285bdc0e8fc59506 (diff) | |
| parent | d5e9c76356c26c7684771cba7613b3928b9b2c80 (diff) | |
| download | libdbusmenu-6c75099b24d3f9c47a4a6035bf234b1fed42d200.tar.gz libdbusmenu-6c75099b24d3f9c47a4a6035bf234b1fed42d200.tar.bz2 libdbusmenu-6c75099b24d3f9c47a4a6035bf234b1fed42d200.zip | |
Upstream release (LP: #432003)
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | libdbusmenu-glib/client.c | 6 |
3 files changed, 15 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 117fc90..fb73649 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(libdbusmenu, 0.1.3, ted@canonical.com) +AC_INIT(libdbusmenu, 0.1.4, ted@canonical.com) AC_COPYRIGHT([Copyright 2009 Canonical]) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libdbusmenu, 0.1.3) +AM_INIT_AUTOMAKE(libdbusmenu, 0.1.4) AM_MAINTAINER_MODE @@ -66,7 +66,7 @@ AC_SUBST(DBUSMENUTESTS_LIBS) ########################### LIBDBUSMENU_CURRENT=0 -LIBDBUSMENU_REVISION=1 +LIBDBUSMENU_REVISION=4 LIBDBUSMENU_AGE=0 AC_SUBST(LIBDBUSMENU_CURRENT) diff --git a/debian/changelog b/debian/changelog index 4af39f7..ebf05f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libdbusmenu (0.1.4-0ubuntu1) karmic; urgency=low + + * Upstream release (LP: #432003) + + -- Ted Gould <ted@ubuntu.com> Thu, 17 Sep 2009 11:29:40 -0500 + libdbusmenu (0.1.3-0ubuntu1) karmic; urgency=low * Upstream update 0.1.3 (LP: #427360) diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index dd2254e..4ae4f75 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -803,10 +803,16 @@ dbusmenu_client_get_root (DbusmenuClient * client) return NULL; } +#if 0 +/* Seems to be a bug in dbus-glib that assert here, I think because + multiple people try and grab it. We're going to comment this out + for now as everyone should be listening to the root changed signal + anyway. */ if (priv->layoutcall != NULL) { /* Will end the current call and block on it's completion */ update_layout_cb(priv->propproxy, priv->layoutcall, client); } +#endif return priv->root; } |