From c9af096ec81002c51004160239dea651d0823b63 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 11 Sep 2009 11:56:07 -0500 Subject: Commenting out the blocking on root waiting for an update. --- libdbusmenu-glib/client.c | 6 ++++++ 1 file changed, 6 insertions(+) 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; } -- cgit v1.2.3 From cb73c16284385f98c5906075b806a686944062fd Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 14 Sep 2009 15:23:36 -0500 Subject: releasing version 0.1.3-0ubuntu2~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 543d860..fe41520 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libdbusmenu (0.1.3-0ubuntu2~ppa1) UNRELEASED; urgency=low +libdbusmenu (0.1.3-0ubuntu2~ppa1) karmic; urgency=low * Fixing looking for the root while we're looking. - -- Ted Gould Mon, 14 Sep 2009 15:21:45 -0500 + -- Ted Gould Mon, 14 Sep 2009 15:23:32 -0500 libdbusmenu (0.1.3-0ubuntu1) karmic; urgency=low -- cgit v1.2.3 From c699131fa96f6f48bf2509b46beb256cf04b2d82 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 17 Sep 2009 11:23:56 -0500 Subject: Setting version to 0.1.4 --- configure.ac | 6 +++--- 1 file changed, 3 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) -- cgit v1.2.3 From d5e9c76356c26c7684771cba7613b3928b9b2c80 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 17 Sep 2009 11:29:44 -0500 Subject: releasing version 0.1.4-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 80db57d..6394f1d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libdbusmenu (0.1.4-0ubuntu1~ppa1) UNRELEASED; urgency=low +libdbusmenu (0.1.4-0ubuntu1~ppa1) karmic; urgency=low * Upstream release 0.1.4 - -- Ted Gould Thu, 17 Sep 2009 11:25:58 -0500 + -- Ted Gould Thu, 17 Sep 2009 11:29:40 -0500 libdbusmenu (0.1.3-0ubuntu2~ppa1) karmic; urgency=low -- cgit v1.2.3