[telepathy-mission-control/master] src, libmcclient: follow recommendations of telepathy-glib 0.7.6 NEWS

Simon McVittie simon.mcvittie at collabora.co.uk
Wed Jun 10 08:32:45 PDT 2009


This uses newer TpProxy API to avoid some possible assertion failures.
---
 libmcclient/Makefile.am             |    1 +
 libmcclient/mc-account-manager.c    |    1 +
 libmcclient/mc-account.c            |    1 +
 libmcclient/mc-dispatch-operation.c |    1 +
 src/Makefile.am                     |    1 +
 src/mcd-connection.c                |    1 +
 src/mcd-dispatcher.c                |    1 +
 7 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/libmcclient/Makefile.am b/libmcclient/Makefile.am
index 9fc1308..60fef06 100644
--- a/libmcclient/Makefile.am
+++ b/libmcclient/Makefile.am
@@ -181,6 +181,7 @@ _gen/cli-%-body.h _gen/cli-%.h: _gen/%.xml \
 	$(PYTHON) $(tools_dir)/glib-client-gen.py \
 		--group=`echo $* | tr x- x_` \
 		--iface-quark-prefix=MC_IFACE_QUARK \
+		--tp-proxy-api=0.7.6 \
 		$< Mc_Cli _gen/cli-$*
 
 _gen/svc-%.c _gen/svc-%.h: _gen/%.xml \
diff --git a/libmcclient/mc-account-manager.c b/libmcclient/mc-account-manager.c
index 183f120..abe6d03 100644
--- a/libmcclient/mc-account-manager.c
+++ b/libmcclient/mc-account-manager.c
@@ -309,6 +309,7 @@ mc_account_manager_class_init (McAccountManagerClass *klass)
     _mc_ext_register_dbus_glib_marshallers ();
 
     proxy_class->interface = MC_IFACE_QUARK_ACCOUNT_MANAGER;
+    tp_proxy_init_known_interfaces ();
     tp_proxy_or_subclass_hook_on_interface_add (type, mc_cli_account_manager_add_signals);
 
     tp_proxy_subclass_add_error_mapping (type, TP_ERROR_PREFIX, TP_ERRORS,
diff --git a/libmcclient/mc-account.c b/libmcclient/mc-account.c
index 0f17881..74afaf6 100644
--- a/libmcclient/mc-account.c
+++ b/libmcclient/mc-account.c
@@ -242,6 +242,7 @@ mc_account_class_init (McAccountClass *klass)
     _mc_ext_register_dbus_glib_marshallers ();
 
     proxy_class->interface = MC_IFACE_QUARK_ACCOUNT;
+    tp_proxy_init_known_interfaces ();
     tp_proxy_or_subclass_hook_on_interface_add (type, mc_cli_account_add_signals);
 
     tp_proxy_subclass_add_error_mapping (type, TP_ERROR_PREFIX, TP_ERRORS,
diff --git a/libmcclient/mc-dispatch-operation.c b/libmcclient/mc-dispatch-operation.c
index 79ff902..2f86198 100644
--- a/libmcclient/mc-dispatch-operation.c
+++ b/libmcclient/mc-dispatch-operation.c
@@ -301,6 +301,7 @@ mc_dispatch_operation_class_init (McDispatchOperationClass *klass)
     _mc_ext_register_dbus_glib_marshallers ();
 
     proxy_class->interface = MC_IFACE_QUARK_CHANNEL_DISPATCH_OPERATION;
+    tp_proxy_init_known_interfaces ();
     tp_proxy_or_subclass_hook_on_interface_add (type, mc_cli_dispatch_operation_add_signals);
 
     tp_proxy_subclass_add_error_mapping (type, TP_ERROR_PREFIX, TP_ERRORS,
diff --git a/src/Makefile.am b/src/Makefile.am
index 20e199c..dca8c7d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -292,6 +292,7 @@ _gen/cli-%-body.h _gen/cli-%.h: _gen/%.xml \
 	$(PYTHON) $(tools_dir)/glib-client-gen.py \
 		--group=`echo $* | tr x- x_` \
 		--iface-quark-prefix=MC_IFACE_QUARK \
+		--tp-proxy-api=0.7.6 \
 		$< Mc_Cli _gen/cli-$*
 
 _gen/svc-%.c _gen/svc-%.h: _gen/%.xml \
diff --git a/src/mcd-connection.c b/src/mcd-connection.c
index a082cbd..94db802 100644
--- a/src/mcd-connection.c
+++ b/src/mcd-connection.c
@@ -1755,6 +1755,7 @@ mcd_connection_class_init (McdConnectionClass * klass)
 
     _mc_ext_register_dbus_glib_marshallers ();
 
+    tp_connection_init_known_interfaces ();
     tp_proxy_or_subclass_hook_on_interface_add
         (TP_TYPE_CONNECTION,
          mc_cli_Connection_Interface_Contact_Capabilities_add_signals);
diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index d9539a5..bdc0fb5 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -2701,6 +2701,7 @@ mcd_dispatcher_class_init (McdDispatcherClass * klass)
     object_class->finalize = _mcd_dispatcher_finalize;
     object_class->dispose = _mcd_dispatcher_dispose;
 
+    tp_proxy_init_known_interfaces ();
     tp_proxy_or_subclass_hook_on_interface_add
         (TP_TYPE_PROXY, mc_cli_client_add_signals);
 
-- 
1.5.6.5



More information about the telepathy-commits mailing list