[Pkg-telepathy-commits] [telepathy-mission-control-6] 100/280: Undraft CD.I.Messages1
Simon McVittie
smcv at debian.org
Thu Mar 27 20:07:10 UTC 2014
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian
in repository telepathy-mission-control-6.
commit ba72fef52e9769e3da6b7f4dddbb8ffdc1cecdde
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date: Tue Oct 15 13:33:59 2013 +0100
Undraft CD.I.Messages1
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37380
Reviewed-by: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
---
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(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 4f5ed6d..3963932 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -38,7 +38,7 @@ mc_gen_headers = \
_gen/gtypes.h \
_gen/interfaces.h \
_gen/svc-Account_Interface_External_Password_Storage.h \
- _gen/svc-dispatcher.h
+ $(NULL)
nodist_libmcd_convenience_la_SOURCES = \
_gen/cli-Connection_Manager_Interface_Account_Storage-body.h \
@@ -49,7 +49,6 @@ nodist_libmcd_convenience_la_SOURCES = \
_gen/signals-marshal.h \
_gen/signals-marshal.list \
_gen/svc-Account_Interface_External_Password_Storage.c \
- _gen/svc-dispatcher.c \
mcd-enum-types.c \
mcd-enum-types.h \
$(mc_gen_headers)
@@ -62,7 +61,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_External_Password_Storage-gtk-doc.h \
_gen/gtypes-gtk-doc.h \
$(NULL)
@@ -179,7 +177,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 @@
-<tp:spec
- xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
- xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<xi:include href="../xml/Channel_Dispatcher_Interface_Messages_DRAFT.xml"/>
-
-</tp:spec>
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 <telepathy-glib/telepathy-glib.h>
#include <telepathy-glib/telepathy-glib-dbus.h>
@@ -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 ba0f8d5..87a8fbb 100644
--- a/src/mcd.xml
+++ b/src/mcd.xml
@@ -8,6 +8,4 @@
<xi:include href="../xml/Account_Interface_External_Password_Storage.xml"/>
-<xi:include href="dispatcher.xml"/>
-
</tp:spec>
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 @@
-<?xml version="1.0" ?>
-<node name="/Channel_Dispatcher_Interface_Messages_Draft"
- xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-
- <tp:copyright>Copyright (C) 2011 Collabora Ltd.</tp:copyright>
- <tp:copyright>Copyright (C) 2011 Nokia Corporation</tp:copyright>
- <tp:license xmlns="http://www.w3.org/1999/xhtml">
- <p>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.</p>
-
- <p>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.</p>
-
- <p>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.</p>
- </tp:license>
-
- <interface
- name="org.freedesktop.Telepathy.ChannelDispatcher.Interface.Messages.DRAFT"
- tp:causes-havoc="not yet final">
-
- <tp:requires interface="org.freedesktop.Telepathy.ChannelDispatcher"/>
-
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>
- 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.
- </p>
-
- <tp:rationale>
- <p>
- This enables entities other than the main UI to send messages
- to contacts.
- </p>
- </tp:rationale>
- </tp:docstring>
-
- <method name="SendMessage" tp:name-for-bindings="Send_Message">
- <arg direction="in" name="Account" type="o"/>
- <arg direction="in" name="TargetID" type="s"/>
- <arg direction="in" name="Message" type="aa{sv}"
- tp:type="Message_Part[]"/>
- <arg direction="in" name="Flags" type="u"/>
- <arg direction="out" name="Token" type="s"/>
- </method>
-
- </interface>
-</node>
-
diff --git a/xml/Makefile.am b/xml/Makefile.am
index f1320fb..9c6ae2f 100644
--- a/xml/Makefile.am
+++ b/xml/Makefile.am
@@ -7,7 +7,7 @@ DROP_TPTYPE = sed -e 's at tp:type="[^"]*"@@g'
SPECS = \
Account_Interface_External_Password_Storage.xml \
Connection_Manager_Interface_Account_Storage.xml \
- Channel_Dispatcher_Interface_Messages_DRAFT.xml
+ $(NULL)
SPECS_GEN = ${SPECS:%.xml=_gen/introspect-%.xml}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-mission-control-6.git
More information about the Pkg-telepathy-commits
mailing list