Mercurial > pidgin
diff src/signals.c @ 11146:1c5398ccbeb0
[gaim-migrate @ 13217]
Gaim-DBUS signal export works with DBUS >= 0.35
Various gaim API functions available through DBUS
committer: Tailor Script <tailor@pidgin.im>
| author | Piotr Zielinski <zielaj> |
|---|---|
| date | Fri, 22 Jul 2005 19:47:29 +0000 |
| parents | f54740547c95 |
| children | ebb02ea3c789 |
line wrap: on
line diff
--- a/src/signals.c Fri Jul 22 07:11:08 2005 +0000 +++ b/src/signals.c Fri Jul 22 19:47:29 2005 +0000 @@ -57,8 +57,6 @@ size_t handler_count; gulong next_handler_id; - - int dbus_id; } GaimSignalData; typedef struct @@ -169,15 +167,6 @@ instance_data->next_signal_id++; instance_data->signal_count++; -#ifdef HAVE_DBUS - /* DBus messages are sent directly to the bus so the - marshalling function is never called. */ - signal_data->dbus_id = - gaim_dbus_signal_register_gaim(gaim_dbus_object, signal, - gaim_dbus_invalid_marshaller, - num_values, signal_data->values); -#endif /* HAVE_DBUS */ - return signal_data->id; } @@ -500,7 +489,7 @@ } #ifdef HAVE_DBUS - gaim_dbus_signal_emit_gaim(gaim_dbus_object, signal_data->dbus_id, + gaim_dbus_signal_emit_gaim(gaim_dbus_object, signal, signal_data->num_values, signal_data->values, args); #endif /* HAVE_DBUS */ @@ -552,7 +541,7 @@ } #ifdef HAVE_DBUS - gaim_dbus_signal_emit_gaim(gaim_dbus_object, signal_data->dbus_id, + gaim_dbus_signal_emit_gaim(gaim_dbus_object, signal, signal_data->num_values, signal_data->values, args); #endif /* HAVE_DBUS */