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(+) 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(-) 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(+) 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(-) 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(-) 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 From 5c4c4143a5ea25ec408304fdc7463709163ff9a7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 7 Jan 2010 08:55:35 -0600 Subject: Removing the half second timeout as it's no longer needed. --- tests/test-glib-layout-client.c | 4 +--- tests/test-glib-layout-server.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/tests/test-glib-layout-client.c b/tests/test-glib-layout-client.c index a7dd683..bb2d13a 100644 --- a/tests/test-glib-layout-client.c +++ b/tests/test-glib-layout-client.c @@ -109,9 +109,7 @@ main (int argc, char ** argv) { g_type_init(); - g_usleep(500000); - - DbusmenuClient * client = dbusmenu_client_new(":1.0", "/org/test"); + DbusmenuClient * client = dbusmenu_client_new("org.dbusmenu.test", "/org/test"); g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL); g_timeout_add_seconds(10, timer_func, client); diff --git a/tests/test-glib-layout-server.c b/tests/test-glib-layout-server.c index cc9b8e7..40dd048 100644 --- a/tests/test-glib-layout-server.c +++ b/tests/test-glib-layout-server.c @@ -24,6 +24,7 @@ with this program. If not, see . #include #include #include +#include #include #include @@ -74,10 +75,26 @@ timer_func (gpointer data) int main (int argc, char ** argv) { + GError * error = NULL; + g_type_init(); + DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL); g_debug("DBus ID: %s", dbus_connection_get_server_id(dbus_g_connection_get_connection(dbus_g_bus_get(DBUS_BUS_SESSION, NULL)))); + DBusGProxy * bus_proxy = dbus_g_proxy_new_for_name(connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS); + guint nameret = 0; + + if (!org_freedesktop_DBus_request_name(bus_proxy, "org.dbusmenu.test", 0, &nameret, &error)) { + g_error("Unable to call to request name"); + return 1; + } + + if (nameret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) { + g_error("Unable to get name"); + return 1; + } + server = dbusmenu_server_new("/org/test"); timer_func(NULL); -- cgit v1.2.3