diff options
-rw-r--r-- | extensions/Connection_Interface_IRC_Command1.xml (renamed from extensions/Connection_Interface_Irc_Command.xml) | 4 | ||||
-rw-r--r-- | extensions/Makefile.am | 2 | ||||
-rw-r--r-- | extensions/all.xml | 2 | ||||
-rw-r--r-- | src/idle-connection.c | 8 | ||||
-rw-r--r-- | tests/twisted/irc-command.py | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/extensions/Connection_Interface_Irc_Command.xml b/extensions/Connection_Interface_IRC_Command1.xml index 625bd9f..c46791b 100644 --- a/extensions/Connection_Interface_Irc_Command.xml +++ b/extensions/Connection_Interface_IRC_Command1.xml @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<node name="/Connection_Interface_Irc_Command" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"> +<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> @@ -18,7 +18,7 @@ Lesser General Public License for more details.</p> 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.Connection.Interface.IrcCommand1" + <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"> 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</p> </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') |