For some reason, if the dbus connection goes away during a call to
NotifyListenersSync, the DBusPendingCall is not notified. This may be a
libdbus bug. Working around the issue by adding a timeout that will
check for a disconnect and abort the call as needed.
typedef struct _SpiReentrantCallClosure
{
typedef struct _SpiReentrantCallClosure
{
GMainLoop *loop;
DBusMessage *reply;
GMainLoop *loop;
DBusMessage *reply;
} SpiReentrantCallClosure;
static void
} SpiReentrantCallClosure;
static void
g_main_loop_quit (closure->loop);
}
g_main_loop_quit (closure->loop);
}
+static gboolean
+timeout_reply (void *data)
+{
+ SpiReentrantCallClosure *closure = data;
+
+ if (!dbus_connection_get_is_connected (closure->bus))
+ g_main_loop_quit (closure->loop);
+ closure->timeout = -1;
+ return FALSE;
+}
+
static DBusMessage *
send_and_allow_reentry (DBusConnection * bus, DBusMessage * message)
{
static DBusMessage *
send_and_allow_reentry (DBusConnection * bus, DBusMessage * message)
{
main_context = (g_getenv ("AT_SPI_CLIENT") ? NULL :
spi_global_app_data->main_context);
main_context = (g_getenv ("AT_SPI_CLIENT") ? NULL :
spi_global_app_data->main_context);
closure.loop = g_main_loop_new (main_context, FALSE);
closure.loop = g_main_loop_new (main_context, FALSE);
switch_main_context (main_context);
switch_main_context (main_context);
- if (!dbus_connection_send_with_reply (bus, message, &pending, -1) || !pending)
+ if (!dbus_connection_send_with_reply (bus, message, &pending, 9000) || !pending)
{
switch_main_context (NULL);
return NULL;
}
dbus_pending_call_set_notify (pending, set_reply, (void *) &closure, NULL);
{
switch_main_context (NULL);
return NULL;
}
dbus_pending_call_set_notify (pending, set_reply, (void *) &closure, NULL);
+ closure.timeout = g_timeout_add (500, timeout_reply, &closure);
g_main_loop_run (closure.loop);
g_main_loop_run (closure.loop);
+ if (closure.timeout != -1)
+ g_source_remove (closure.timeout);
g_main_loop_unref (closure.loop);
return closure.reply;
g_main_loop_unref (closure.loop);
return closure.reply;