From f2a13fbd276d642b866cd8af3ff55f1509d25365 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Thu, 16 Aug 2012 22:02:20 +0200 Subject: [PATCH] Added separate invite strings for Google and generic XMPP. --- src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp | 6 ++++++ src/accounts/xmpp/googlewrapper/GoogleWrapper.h | 2 ++ src/accounts/xmpp/sip/XmppSip.cpp | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp b/src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp index 6dd45fcf4..222cafff0 100644 --- a/src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp +++ b/src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp @@ -53,6 +53,12 @@ GoogleWrapperSip::~GoogleWrapperSip() { } +QString +GoogleWrapperSip::inviteString() const +{ + return tr( "Enter Google Address" ); +} + void GoogleWrapperSip::showAddFriendDialog() diff --git a/src/accounts/xmpp/googlewrapper/GoogleWrapper.h b/src/accounts/xmpp/googlewrapper/GoogleWrapper.h index 2b1e25dd7..41f538b9b 100644 --- a/src/accounts/xmpp/googlewrapper/GoogleWrapper.h +++ b/src/accounts/xmpp/googlewrapper/GoogleWrapper.h @@ -51,6 +51,8 @@ public: GoogleWrapperSip( Tomahawk::Accounts::Account* account ); virtual ~GoogleWrapperSip(); + virtual QString inviteString() const; + public slots: void showAddFriendDialog(); diff --git a/src/accounts/xmpp/sip/XmppSip.cpp b/src/accounts/xmpp/sip/XmppSip.cpp index 9754de323..bbe4e7fe2 100644 --- a/src/accounts/xmpp/sip/XmppSip.cpp +++ b/src/accounts/xmpp/sip/XmppSip.cpp @@ -194,7 +194,7 @@ XmppSipPlugin::~XmppSipPlugin() QString XmppSipPlugin::inviteString() const { - return tr( "Enter Jabber or Google ID" ); + return tr( "Enter Jabber ID" ); }