diff options
author | Ted Gould <ted@gould.cx> | 2010-01-06 22:22:10 -0600 |
---|---|---|
committer | Ted Gould <ted@gould.cx> | 2010-01-06 22:22:10 -0600 |
commit | e9f8b172eda835975106c39af756b075745714e2 (patch) | |
tree | 3b6d783d5d1abbf6320d1a11b0ee8fa44099cd59 | |
parent | 7f60e7bc2dbe55b1234702028e4b509b70b404bb (diff) | |
parent | 8795c1497d1f9979076ef510a5d6c34ee288f242 (diff) | |
download | libdbusmenu-e9f8b172eda835975106c39af756b075745714e2.tar.gz libdbusmenu-e9f8b172eda835975106c39af756b075745714e2.tar.bz2 libdbusmenu-e9f8b172eda835975106c39af756b075745714e2.zip |
* Upstream update:
* Starting to watch DBus if the proxy builds fail.
-rw-r--r-- | debian/changelog | 7 | ||||
-rw-r--r-- | libdbusmenu-glib/client.c | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index ae1ccbb..7cab0e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.2.0~dev-0ubuntu1~ppa8~light1) UNRELEASED; urgency=low + + * Upstream update: + * Starting to watch DBus if the proxy builds fail. + + -- Ted Gould <ted@ubuntu.com> Wed, 06 Jan 2010 22:21:28 -0600 + libdbusmenu (0.2.0~dev-0ubuntu1~ppa7) karmic; urgency=low * Upstream update: diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index 59494a3..c60af84 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -471,6 +471,7 @@ build_proxies (DbusmenuClient * client) if (error != NULL) { g_warning("Unable to get property proxy for %s on %s: %s", priv->dbus_name, priv->dbus_object, error->message); g_error_free(error); + build_dbus_proxy(client); return; } g_object_add_weak_pointer(G_OBJECT(priv->propproxy), (gpointer *)&priv->propproxy); @@ -484,6 +485,7 @@ build_proxies (DbusmenuClient * client) if (error != NULL) { g_warning("Unable to get dbusmenu proxy for %s on %s: %s", priv->dbus_name, priv->dbus_object, error->message); g_error_free(error); + build_dbus_proxy(client); return; } g_object_add_weak_pointer(G_OBJECT(priv->menuproxy), (gpointer *)&priv->menuproxy); |