Merge lp:~dbusmenu-team/libdbusmenu/ubuntu into lp:~ubuntu-desktop/libdbusmenu/ubuntu

[Ted Gould]

[Ken VanDine (ken-vandine)]

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2009-09-10 13:35:07 +0000
+++ configure.ac	2009-09-17 16:23:56 +0000
@@ -1,11 +1,11 @@
 
-AC_INIT(libdbusmenu, 0.1.3, [e-mail])
+AC_INIT(libdbusmenu, 0.1.4, [e-mail])
 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 @@
 ###########################
 
 LIBDBUSMENU_CURRENT=0
-LIBDBUSMENU_REVISION=1
+LIBDBUSMENU_REVISION=4
 LIBDBUSMENU_AGE=0
 
 AC_SUBST(LIBDBUSMENU_CURRENT)
 
=== modified file 'debian/changelog'
--- debian/changelog	2009-09-10 15:17:16 +0000
+++ debian/changelog	2009-09-17 16:29:44 +0000
@@ -1,3 +1,15 @@
+libdbusmenu (0.1.4-0ubuntu1~ppa1) karmic; urgency=low
+
+  * Upstream release 0.1.4
+
+ -- Ted Gould <[e-mail]>  Thu, 17 Sep 2009 11:29:40 -0500
+
+libdbusmenu (0.1.3-0ubuntu2~ppa1) karmic; urgency=low
+
+  * Fixing looking for the root while we're looking.
+
+ -- Ted Gould <[e-mail]>  Mon, 14 Sep 2009 15:23:32 -0500
+
 libdbusmenu (0.1.3-0ubuntu1) karmic; urgency=low
 
   * Upstream update 0.1.3 (LP: #427360)
 
=== modified file 'libdbusmenu-glib/client.c'
--- libdbusmenu-glib/client.c	2009-08-27 13:36:58 +0000
+++ libdbusmenu-glib/client.c	2009-09-11 16:56:07 +0000
@@ -803,10 +803,16 @@
 		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;
 }