diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2011-04-26 10:24:02 +0100 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2011-04-26 10:24:02 +0100 |
| commit | ec0180a129e8fa561f3f2309d35da9f4657491cb (patch) | |
| tree | 7d16f39212d91360c46f89049bead12bd485cf15 | |
| parent | a9d71a3e831bbdb165ded10d737a9a0737678a34 (diff) | |
client: generate dbus-glib marshaller registration code
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
| -rw-r--r-- | telepathy-ytstenut-glib/Makefile.am | 5 | ||||
| -rw-r--r-- | telepathy-ytstenut-glib/client.c | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/telepathy-ytstenut-glib/Makefile.am b/telepathy-ytstenut-glib/Makefile.am index 3897fe5..bdb8e71 100644 --- a/telepathy-ytstenut-glib/Makefile.am +++ b/telepathy-ytstenut-glib/Makefile.am @@ -28,6 +28,7 @@ nodist_libtelepathy_ytstenut_glib_la_SOURCES = \ _gen/signals-marshal.c \ _gen/signals-marshal.h \ _gen/signals-marshal.list \ + _gen/register-dbus-glib-marshallers-body.h \ _gen/enums.h \ _gen/gtypes.h \ _gen/gtypes-body.h \ @@ -162,3 +163,7 @@ _gen/gtypes.h _gen/gtypes-body.h: _gen/all.xml \ $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-gtypes-generator.py \ $< _gen/gtypes Tp_Yts +_gen/register-dbus-glib-marshallers-body.h: _gen/all.xml \ + $(tools_dir)/glib-client-marshaller-gen.py Makefile.am + $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-marshaller-gen.py $< _tp_yts > $@ + diff --git a/telepathy-ytstenut-glib/client.c b/telepathy-ytstenut-glib/client.c index 691fcc0..3b34143 100644 --- a/telepathy-ytstenut-glib/client.c +++ b/telepathy-ytstenut-glib/client.c @@ -30,6 +30,9 @@ #include <telepathy-glib/gtypes.h> #include <telepathy-glib/util.h> +#include "_gen/signals-marshal.h" +#include "_gen/register-dbus-glib-marshallers-body.h" + #define DEBUG(msg, ...) \ g_debug ("%s: " msg, G_STRFUNC, ##__VA_ARGS__) @@ -129,6 +132,8 @@ tp_yts_client_constructed (GObject *obj) /* chain up to TpBaseClient first */ G_OBJECT_CLASS (tp_yts_client_parent_class)->constructed (obj); + _tp_yts_register_dbus_glib_marshallers (); + tp_base_client_set_channel_factory (client, self->priv->factory); tp_base_client_set_handler_bypass_approval (client, FALSE); |