From: Mark Doffman Date: Thu, 22 Jan 2009 14:38:17 +0000 (+0000) Subject: Merge branch 'master' of git+ssh://doffm@git.freedesktop.org/git/at-spi2/at-spi2... X-Git-Tag: AT_SPI2_ATK_2_12_0~554 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git;a=commitdiff_plain;h=dfc071dcf2f98f282616911cb0eb1636c93f3e77 Merge branch 'master' of git+ssh://doffm@git.freedesktop.org/git/at-spi2/at-spi2-core Conflicts: atk-adaptor/atk-dbus.c atk-adaptor/tree.c registryd/deviceeventcontroller.c --- dfc071dcf2f98f282616911cb0eb1636c93f3e77 diff --cc registryd/deviceeventcontroller.c index 3f87a4e,f61e69d..bdc5816 --- a/registryd/deviceeventcontroller.c +++ b/registryd/deviceeventcontroller.c @@@ -341,14 -342,25 +341,14 @@@ spi_dec_clear_unlatch_pending (SpiDECon g_object_get_qdata (G_OBJECT (controller), spi_dec_private_quark); priv->xkb_latch_mask = 0; } -- -static void emit(SpiDEController *controller, const char *interface, const char *name, const char *detail, int detail1, int detail2) -{ - DBusMessage *sig; - DBusMessageIter iter, iter_variant; - - sig = dbus_message_new_signal(SPI_DBUS_PATH_DEC, interface, name); - if (!sig) return; - dbus_message_iter_init_append (sig, &iter); - if (!detail) detail = ""; - dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &detail); - dbus_message_iter_append_basic (&iter, DBUS_TYPE_UINT32, &detail1); - dbus_message_iter_append_basic (&iter, DBUS_TYPE_UINT32, &detail2); - dbus_message_iter_open_container (&iter, DBUS_TYPE_VARIANT, "u", &iter_variant); - /* append dummy value */ - dbus_message_iter_append_basic (&iter_variant, DBUS_TYPE_UINT32, &detail1); - dbus_message_iter_close_container (&iter, &iter_variant); - dbus_connection_send(controller->droute->bus, sig, NULL); - dbus_message_unref(sig); ++ +static void emit(SpiDEController *controller, const char *name, int first_type, ...) +{ + va_list arg; + + va_start(arg, first_type); + spi_dbus_emit_valist(controller->bus, SPI_DBUS_PATH_DEC, SPI_DBUS_INTERFACE_DEC, name, first_type, arg); + va_end(arg); } static gboolean