*/
#include <string.h>
+#include <ctype.h>
#include <atk/atk.h>
#include <droute/droute.h>
#include "accessible-register.h"
#include "common/spi-dbus.h"
+#include "event.h"
+#include "object.h"
+#include "dbus/dbus-glib-lowlevel.h"
static GArray *listener_ids = NULL;
static void
switch_main_context (GMainContext *cnx)
{
+/* This code won't work on dbus-glib earlier than 0.9.0 because of FDO#30574 */
+ if (spi_global_app_data->app_bus_addr [0] == '\0')
+ return;
+
GList *list;
dbus_server_setup_with_g_main (spi_global_app_data->server, cnx);
SpiReentrantCallClosure* closure = (SpiReentrantCallClosure *) user_data;
closure->reply = dbus_pending_call_steal_reply (pending);
+ dbus_pending_call_unref (pending);
switch_main_context (NULL);
g_main_loop_quit (closure->loop);
}
closure.loop = g_main_loop_new (main_context, FALSE);
switch_main_context (main_context);
- if (!dbus_connection_send_with_reply (bus, message, &pending, -1))
+ if (!dbus_connection_send_with_reply (bus, message, &pending, -1) || !pending)
{
switch_main_context (NULL);
return NULL;
void (*append_variant) (DBusMessageIter *, const char *, const void *))
{
DBusConnection *bus = spi_global_app_data->bus;
- const char *path = spi_register_object_to_path (spi_global_register,
- G_OBJECT (obj));
+ const char *path;
gchar *cname, *t;
DBusMessage *sig;
if (!signal_is_needed (klass, major, minor))
return;
+ path = spi_register_object_to_path (spi_global_register, G_OBJECT (obj));
+
/*
* This is very annoying, but as '-' isn't a legal signal
* name in D-Bus (Why not??!?) The names need converting
*/
cname = signal_name_to_dbus (major);
sig = dbus_message_new_signal(path, klass, cname);
- g_free(cname);
dbus_message_iter_init_append(sig, &iter);
if (g_strcmp0 (cname, "ChildrenChanged") != 0)
spi_object_lease_if_needed (G_OBJECT (obj));
+
+ g_free(cname);
+ g_free (path);
}
/*---------------------------------------------------------------------------*/