From 318866d37a7c80a10aa0f2c7459e8acd7ca98f76 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Thu, 12 Jul 2012 10:19:40 +0200 Subject: [PATCH] * Fixed broken merge. --- src/libtomahawk/sip/SipPlugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libtomahawk/sip/SipPlugin.h b/src/libtomahawk/sip/SipPlugin.h index ad2389443..16398dd83 100644 --- a/src/libtomahawk/sip/SipPlugin.h +++ b/src/libtomahawk/sip/SipPlugin.h @@ -67,7 +67,7 @@ public slots: virtual void configurationChanged() = 0; virtual void addContact( const QString &jid, const QString& msg = QString() ) = 0; - virtual void sendMsg( const QString& to, const QString& msg ) = 0; + virtual void sendMsg( const QString& to, const SipInfo& info ) = 0; signals: void peerOnline( const QString& );