Attachment 87602 Details for Bug 70434 – Rename IRC_Command interface to IRCCommand1

[patch] Rename IRC_Command interface to IRCCommand1

0002-Rename-IRC_Command-interface-to-IRCCommand1.patch (text/plain), 8.94 KB, created by Simon McVittie on 2013-10-14 14:11:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-10-14 14:11:36 UTC

Size: 8.94 KB

patch

obsolete

>From 4870711c91814c7f096f884819e7528a3b846ece Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Mon, 14 Oct 2013 15:08:55 +0100
>Subject: [PATCH 2/2] Rename IRC_Command interface to IRCCommand1
>
>---
> extensions/Connection_Interface_IRC_Command1.xml | 46 ++++++++++++++++++++++++
> extensions/Connection_Interface_Irc_Command.xml | 46 ------------------------
> extensions/Makefile.am | 2 +-
> extensions/all.xml | 2 +-
> src/idle-connection.c | 8 ++---
> tests/twisted/irc-command.py | 2 +-
> 6 files changed, 53 insertions(+), 53 deletions(-)
> create mode 100644 extensions/Connection_Interface_IRC_Command1.xml
> delete mode 100644 extensions/Connection_Interface_Irc_Command.xml
>
>diff --git a/extensions/Connection_Interface_IRC_Command1.xml b/extensions/Connection_Interface_IRC_Command1.xml
>new file mode 100644
>index 0000000..c46791b
>--- /dev/null
>+++ b/extensions/Connection_Interface_IRC_Command1.xml
>@@ -0,0 +1,46 @@
>+<?xml version="1.0" ?>
>+<node name="/Connection_Interface_IRC_Command1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
>+ <tp:copyright> Copyright (C) 2005, 2006 Collabora Limited </tp:copyright>
>+ <tp:copyright> Copyright (C) 2005, 2006 Nokia Corporation </tp:copyright>
>+ <tp:copyright> Copyright (C) 2006 INdT </tp:copyright>
>+ <tp:license xmlns="http://www.w3.org/1999/xhtml">
>+ 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.
>+ </tp:license>
>+ <interface name="org.freedesktop.Telepathy.Connection.Interface.IRCCommand1"
>+ tp:causes-havoc='not well-tested'>
>+ <tp:requires interface="org.freedesktop.Telepathy.Connection"/>
>+ <method name="Send" tp:name-for-bindings="Send">
>+ <arg direction="in" name="Command" type="s">
>+ <tp:docstring>
>+ The command followed by its arguments.
>+ </tp:docstring>
>+ </arg>
>+ <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
>+ Send an arbitrary IRC command to the server.
>+ </tp:docstring>
>+ <tp:possible-errors>
>+ <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/>
>+ <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/>
>+ <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"/>
>+ <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"/>
>+ <tp:error name="org.freedesktop.Telepathy.Error.PermissionDenied"/>
>+ </tp:possible-errors>
>+ </method>
>+ <tp:docstring>
>+ An interface to send arbitrary IRC commands to the server.
>+ </tp:docstring>
>+ </interface>
>+</node>
>+
>diff --git a/extensions/Connection_Interface_Irc_Command.xml b/extensions/Connection_Interface_Irc_Command.xml
>deleted file mode 100644
>index 625bd9f..0000000
>--- a/extensions/Connection_Interface_Irc_Command.xml
>+++ /dev/null
>@@ -1,46 +0,0 @@
>-<?xml version="1.0" ?>
>-<node name="/Connection_Interface_Irc_Command" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
>- <tp:copyright> Copyright (C) 2005, 2006 Collabora Limited </tp:copyright>
>- <tp:copyright> Copyright (C) 2005, 2006 Nokia Corporation </tp:copyright>
>- <tp:copyright> Copyright (C) 2006 INdT </tp:copyright>
>- <tp:license xmlns="http://www.w3.org/1999/xhtml">
>- 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.
>- </tp:license>
>- <interface name="org.freedesktop.Telepathy.Connection.Interface.IrcCommand1"
>- tp:causes-havoc='not well-tested'>
>- <tp:requires interface="org.freedesktop.Telepathy.Connection"/>
>- <method name="Send" tp:name-for-bindings="Send">
>- <arg direction="in" name="Command" type="s">
>- <tp:docstring>
>- The command followed by its arguments.
>- </tp:docstring>
>- </arg>
>- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
>- Send an arbitrary IRC command to the server.
>- </tp:docstring>
>- <tp:possible-errors>
>- <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/>
>- <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/>
>- <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"/>
>- <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"/>
>- <tp:error name="org.freedesktop.Telepathy.Error.PermissionDenied"/>
>- </tp:possible-errors>
>- </method>
>- <tp:docstring>
>- An interface to send arbitrary IRC commands to the server.
>- </tp:docstring>
>- </interface>
>-</node>
>-
>diff --git a/extensions/Makefile.am b/extensions/Makefile.am
>index 096dcb3..a9a4d3f 100644
>--- a/extensions/Makefile.am
>+++ b/extensions/Makefile.am
>@@ -2,7 +2,7 @@ tools_dir = $(top_srcdir)/tools
> 
> EXTRA_DIST = \
> all.xml \
>- Connection_Interface_Irc_Command.xml \
>+ Connection_Interface_IRC_Command1.xml \
> Connection_Interface_Renaming.xml \
> $(NULL)
> 
>diff --git a/extensions/all.xml b/extensions/all.xml
>index 7e846bb..d362c78 100644
>--- a/extensions/all.xml
>+++ b/extensions/all.xml
>@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
> </tp:license>
> 
> <xi:include href="Connection_Interface_Renaming.xml"/>
>-<xi:include href="Connection_Interface_Irc_Command.xml"/>
>+<xi:include href="Connection_Interface_IRC_Command1.xml"/>
> 
> <tp:generic-types>
> <tp:external-type name="Contact_Handle" type="u"
>diff --git a/src/idle-connection.c b/src/idle-connection.c
>index 7f0aad6..46fb3d6 100644
>--- a/src/idle-connection.c
>+++ b/src/idle-connection.c
>@@ -72,7 +72,7 @@ G_DEFINE_TYPE_WITH_CODE(IdleConnection, idle_connection, TP_TYPE_BASE_CONNECTION
> 		G_IMPLEMENT_INTERFACE(TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_INFO, idle_contact_info_iface_init);
> 		G_IMPLEMENT_INTERFACE(IDLE_TYPE_SVC_CONNECTION_INTERFACE_RENAMING, _renaming_iface_init);
> 		G_IMPLEMENT_INTERFACE(TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACTS, tp_contacts_mixin_iface_init);
>-		G_IMPLEMENT_INTERFACE(IDLE_TYPE_SVC_CONNECTION_INTERFACE_IRC_COMMAND, irc_command_iface_init);
>+		G_IMPLEMENT_INTERFACE(IDLE_TYPE_SVC_CONNECTION_INTERFACE_IRC_COMMAND1, irc_command_iface_init);
> );
> 
> typedef struct _IdleOutputPendingMsg IdleOutputPendingMsg;
>@@ -1572,7 +1572,7 @@ static void _renaming_iface_init(gpointer g_iface, gpointer iface_data) {
> }
> 
> static void
>-idle_connection_irc_command_send (IdleSvcConnectionInterfaceIrcCommand *iface,
>+idle_connection_irc_command_send (IdleSvcConnectionInterfaceIRCCommand1 *iface,
> const gchar *command,
> DBusGMethodInvocation *context)
> {
>@@ -1586,9 +1586,9 @@ idle_connection_irc_command_send (IdleSvcConnectionInterfaceIrcCommand *iface,
> static void irc_command_iface_init(gpointer g_iface,
> gpointer iface_data)
> {
>- IdleSvcConnectionInterfaceIrcCommandClass *klass = (IdleSvcConnectionInterfaceIrcCommandClass *) g_iface;
>+ IdleSvcConnectionInterfaceIRCCommand1Class *klass = g_iface;
> 
>-#define IMPLEMENT(x) idle_svc_connection_interface_irc_command_implement_##x (\
>+#define IMPLEMENT(x) idle_svc_connection_interface_irc_command1_implement_##x (\
> 		klass, idle_connection_irc_command_##x)
> 	IMPLEMENT(send);
> #undef IMPLEMENT
>diff --git a/tests/twisted/irc-command.py b/tests/twisted/irc-command.py
>index 1073b6a..f27dbb1 100644
>--- a/tests/twisted/irc-command.py
>+++ b/tests/twisted/irc-command.py
>@@ -12,7 +12,7 @@ def test(q, bus, conn, stream):
> q.expect('dbus-signal', signal='StatusChanged',
> args=[cs.CONN_STATUS_CONNECTED, cs.CSR_REQUESTED])
> 
>- irc_cmd = dbus.Interface(conn, cs.CONN + '.Interface.IrcCommand1')
>+ irc_cmd = dbus.Interface(conn, cs.CONN + '.Interface.IRCCommand1')
> 
> call_async(q, irc_cmd, 'Send', 'badger mushroom snake')
> 
>-- 
>1.8.4.rc3
>

Actions: View | Splinter Review

Attachments on bug 70434: 87568 | 87601 | 87602 | 87625 | 87626 | 87683 | 87684 | 87685 | 87686

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.