From 8795c1497d1f9979076ef510a5d6c34ee288f242 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 6 Jan 2010 22:12:30 -0600 Subject: Building the dbus proxies if the guy we're trying to connect to doesn't exist. --- libdbusmenu-glib/client.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libdbusmenu-glib/client.c') 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); -- cgit v1.2.3 From e2a1a14db73dfd136747f11eb6c9727a9752b8d4 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 6 Jan 2010 22:36:49 -0600 Subject: Let's watch the name, we don't care about the ID as much. --- libdbusmenu-glib/client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libdbusmenu-glib/client.c') diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index c60af84..dc25571 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -376,7 +376,7 @@ dbus_owner_change (DBusGProxy * proxy, const gchar * name, const gchar * prev, c return; } - if (g_strcmp0(new, priv->dbus_name)) { + if (g_strcmp0(name, priv->dbus_name)) { /* Again, someone else's service. */ return; } -- cgit v1.2.3 From 679a4e15178874f21c655a3fdcaa581d0f83fbc0 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 6 Jan 2010 23:18:09 -0600 Subject: Debug message --- libdbusmenu-glib/client.c | 1 + 1 file changed, 1 insertion(+) (limited to 'libdbusmenu-glib/client.c') diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index dc25571..dc1da4e 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -367,6 +367,7 @@ static void dbus_owner_change (DBusGProxy * proxy, const gchar * name, const gchar * prev, const gchar * new, DbusmenuClient * client) { DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client); + g_debug("Owner change: %s %s %s", name, prev, new); if (!(new != NULL && prev == NULL)) { /* If it's not someone new getting on the bus, sorry we -- cgit v1.2.3 From 2e2d1894a25c8d49a9cec7c0295f43c930a175cf Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 6 Jan 2010 23:23:08 -0600 Subject: Look for NULL strings instead of NULL itself --- libdbusmenu-glib/client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libdbusmenu-glib/client.c') diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index dc1da4e..675a01d 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -369,7 +369,7 @@ dbus_owner_change (DBusGProxy * proxy, const gchar * name, const gchar * prev, c DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client); g_debug("Owner change: %s %s %s", name, prev, new); - if (!(new != NULL && prev == NULL)) { + if (!(new[0] != '\0' && prev[0] == '\0')) { /* If it's not someone new getting on the bus, sorry we simply just don't care. It's not that your service isn't important to someone, just not us. You'll find the right -- cgit v1.2.3 From 5b6e880757549a514b90b74767716a7849191281 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 6 Jan 2010 23:27:49 -0600 Subject: Removing debug message --- libdbusmenu-glib/client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libdbusmenu-glib/client.c') diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index 675a01d..01dfed7 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -367,7 +367,7 @@ static void dbus_owner_change (DBusGProxy * proxy, const gchar * name, const gchar * prev, const gchar * new, DbusmenuClient * client) { DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client); - g_debug("Owner change: %s %s %s", name, prev, new); + /* g_debug("Owner change: %s %s %s", name, prev, new); */ if (!(new[0] != '\0' && prev[0] == '\0')) { /* If it's not someone new getting on the bus, sorry we -- cgit v1.2.3