From 325a28bbe844525c0177ffb5b68b359436244b1b Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 11 Oct 2013 12:19:49 +0100 Subject: [PATCH 1/4] Undraft CD.I.Messages1 --- src/Makefile.am | 5 +- src/dispatcher.xml | 7 --- src/mcd-dispatcher.c | 10 ++-- src/mcd.xml | 2 - ...Channel_Dispatcher_Interface_Messages_DRAFT.xml | 57 ---------------------- xml/Makefile.am | 2 +- 6 files changed, 6 insertions(+), 77 deletions(-) delete mode 100644 src/dispatcher.xml delete mode 100644 xml/Channel_Dispatcher_Interface_Messages_DRAFT.xml diff --git a/src/Makefile.am b/src/Makefile.am index c237518..e00e033 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -50,7 +50,7 @@ mc_gen_headers = \ _gen/svc-Account_Interface_External_Password_Storage.h \ _gen/svc-Account_Interface_Hidden.h \ _gen/svc-Account_Manager_Interface_Hidden.h \ - _gen/svc-dispatcher.h + $(NULL) nodist_libmcd_convenience_la_SOURCES = \ _gen/cli-Connection_Manager_Interface_Account_Storage-body.h \ @@ -64,7 +64,6 @@ nodist_libmcd_convenience_la_SOURCES = \ _gen/svc-Account_Interface_External_Password_Storage.c \ _gen/svc-Account_Interface_Hidden.c \ _gen/svc-Account_Manager_Interface_Hidden.c \ - _gen/svc-dispatcher.c \ mcd-enum-types.c \ mcd-enum-types.h \ $(mc_gen_headers) @@ -77,7 +76,6 @@ BUILT_SOURCES = \ CLEANFILES = \ $(BUILT_SOURCES) \ _gen/cli-Connection_Manager_Interface_Account_Storage-gtk-doc.h \ - _gen/svc-dispatcher-gtk-doc.h \ _gen/svc-Account_Interface_Hidden-gtk-doc.h \ _gen/svc-Account_Interface_External_Password_Storage-gtk-doc.h \ _gen/svc-Account_Interface_Conditions-gtk-doc.h \ @@ -206,7 +204,6 @@ mcd-enum-types.c: Makefile $(mc_headers) EXTRA_DIST = \ mcd.xml \ - dispatcher.xml \ stamp-mcd-enum-types.h Android.mk: Makefile.am $(nodist_libmcd_convenience_la_SOURCES) diff --git a/src/dispatcher.xml b/src/dispatcher.xml deleted file mode 100644 index 19535a6..0000000 --- a/src/dispatcher.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c index 36fbe26..d7dfc4a 100644 --- a/src/mcd-dispatcher.c +++ b/src/mcd-dispatcher.c @@ -59,8 +59,6 @@ #include "mcd-misc.h" #include "plugin-loader.h" -#include "_gen/svc-dispatcher.h" - #include #include @@ -84,7 +82,7 @@ static void messages_iface_init (gpointer, gpointer); G_DEFINE_TYPE_WITH_CODE (McdDispatcher, mcd_dispatcher, G_TYPE_OBJECT, G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_DISPATCHER, dispatcher_iface_init); - G_IMPLEMENT_INTERFACE (MC_TYPE_SVC_CHANNEL_DISPATCHER_INTERFACE_MESSAGES_DRAFT, + G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_DISPATCHER_INTERFACE_MESSAGES1, messages_iface_init); G_IMPLEMENT_INTERFACE ( TP_TYPE_SVC_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST, @@ -1549,7 +1547,7 @@ send_message_submitted (TpChannel *proxy, /* this frees the dbus context, so clear it from our cache afterwards */ if (error == NULL) { - mc_svc_channel_dispatcher_interface_messages_draft_return_from_send_message (context, token); + tp_svc_channel_dispatcher_interface_messages1_return_from_send_message (context, token); message_context_set_return_context (message, NULL); } else @@ -1709,7 +1707,7 @@ finished: } static void -messages_send_message (McSvcChannelDispatcherInterfaceMessagesDraft *iface, +messages_send_message (TpSvcChannelDispatcherInterfaceMessages1 *iface, const gchar *account_path, const gchar *target_id, const GPtrArray *payload, @@ -1727,7 +1725,7 @@ static void messages_iface_init (gpointer iface, gpointer data G_GNUC_UNUSED) { #define IMPLEMENT(x) \ - mc_svc_channel_dispatcher_interface_messages_draft_implement_##x (iface, messages_##x) + tp_svc_channel_dispatcher_interface_messages1_implement_##x (iface, messages_##x) IMPLEMENT (send_message); #undef IMPLEMENT } diff --git a/src/mcd.xml b/src/mcd.xml index 27ae8d6..b4bb2de 100644 --- a/src/mcd.xml +++ b/src/mcd.xml @@ -12,6 +12,4 @@ - - diff --git a/xml/Channel_Dispatcher_Interface_Messages_DRAFT.xml b/xml/Channel_Dispatcher_Interface_Messages_DRAFT.xml deleted file mode 100644 index 61a398b..0000000 --- a/xml/Channel_Dispatcher_Interface_Messages_DRAFT.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - Copyright (C) 2011 Collabora Ltd. - Copyright (C) 2011 Nokia Corporation - -

This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version.

- -

This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details.

- -

You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - USA.

- - - - - - - -

- This interface allows DBus clients to use the ChannelDispatcher to - send one-off text messages to a contact, identified by account and - target ID, without requiring the caller to handle channels or be - the primary message UI. -

- - -

- This enables entities other than the main UI to send messages - to contacts. -

- - - - - - - - - - - - - - diff --git a/xml/Makefile.am b/xml/Makefile.am index 50ef1d5..998bd2d 100644 --- a/xml/Makefile.am +++ b/xml/Makefile.am @@ -10,7 +10,7 @@ SPECS = \ Account_Interface_External_Password_Storage.xml \ Account_Interface_Hidden.xml \ Connection_Manager_Interface_Account_Storage.xml \ - Channel_Dispatcher_Interface_Messages_DRAFT.xml + $(NULL) SPECS_GEN = ${SPECS:%.xml=_gen/introspect-%.xml} -- 1.8.4.rc3