diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2009-12-09 11:42:12 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2009-12-14 17:52:58 +0000 |
| commit | 81fa4604def638387c9b1388afbfee27fa1df637 (patch) | |
| tree | 7120eed1f350a2e5d32b2ed8b109c25038f2aa3d /extensions | |
| parent | 2429342ebb41ddaa988183904cb844c12871d7c4 (diff) | |
extensions: generate client bindings for Content, Stream etc.
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/Makefile.am | 15 | ||||
| -rw-r--r-- | extensions/extensions-cli.c | 3 | ||||
| -rw-r--r-- | extensions/extensions.h | 1 |
3 files changed, 17 insertions, 2 deletions
diff --git a/extensions/Makefile.am b/extensions/Makefile.am index 8bf858005..34c9ed04a 100644 --- a/extensions/Makefile.am +++ b/extensions/Makefile.am @@ -41,6 +41,8 @@ nodist_libfuture_extensions_la_SOURCES = \ _gen/interfaces-body.h \ _gen/cli-channel.h \ _gen/cli-channel-body.h \ + _gen/cli-misc.h \ + _gen/cli-misc-body.h \ _gen/svc-channel.h \ _gen/svc-channel.c \ _gen/svc-misc.h \ @@ -112,8 +114,6 @@ _gen/svc-%.c _gen/svc-%.h: _gen/%.xml \ --allow-unstable \ $< Future_Svc_ -# not generating client bindings for Content, Stream etc. right now - _gen/cli-channel-body.h _gen/cli-channel.h: _gen/channel.xml \ $(tools_dir)/glib-client-gen.py Makefile.am $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-gen.py \ @@ -123,3 +123,14 @@ _gen/cli-channel-body.h _gen/cli-channel.h: _gen/channel.xml \ --iface-quark-prefix=FUTURE_IFACE_QUARK \ --tp-proxy-api=0.7.6 \ $< Future_Cli _gen/cli-channel + +# for now the Content, Stream etc. interfaces are on every TpProxy - when we +# have a TpCallContent, TpCallStream, etc., they should appear on that + +_gen/cli-misc-body.h _gen/cli-misc.h: _gen/misc.xml \ + $(tools_dir)/glib-client-gen.py Makefile.am + $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-gen.py \ + --group=misc \ + --iface-quark-prefix=FUTURE_IFACE_QUARK \ + --tp-proxy-api=0.7.6 \ + $< Future_Cli _gen/cli-misc diff --git a/extensions/extensions-cli.c b/extensions/extensions-cli.c index 0441f9241..d29c5ecbd 100644 --- a/extensions/extensions-cli.c +++ b/extensions/extensions-cli.c @@ -8,6 +8,7 @@ static void _future_ext_register_dbus_glib_marshallers (void); /* include auto-generated stubs for client-specific code */ #include "_gen/signals-marshal.h" #include "_gen/cli-channel-body.h" +#include "_gen/cli-misc-body.h" #include "_gen/register-dbus-glib-marshallers-body.h" static gpointer @@ -17,6 +18,8 @@ future_cli_once (gpointer data) tp_channel_init_known_interfaces (); + tp_proxy_or_subclass_hook_on_interface_add (TP_TYPE_PROXY, + future_cli_misc_add_signals); tp_proxy_or_subclass_hook_on_interface_add (TP_TYPE_CHANNEL, future_cli_channel_add_signals); diff --git a/extensions/extensions.h b/extensions/extensions.h index 95a5daf57..ee2ba1062 100644 --- a/extensions/extensions.h +++ b/extensions/extensions.h @@ -6,6 +6,7 @@ #include "extensions/_gen/enums.h" #include "extensions/_gen/cli-channel.h" +#include "extensions/_gen/cli-misc.h" #include "extensions/_gen/svc-channel.h" #include "extensions/_gen/svc-misc.h" |