Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 22:13:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3409 from AndrewMeadows/inertia

Browse source 
fix build for no XMPP
This commit is contained in:
Brad Hefta-Gaub 2014-09-12 18:57:20 -07:00
commit 6bc4275809
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/scripting/GlobalServicesScriptingInterface.cpp
View file

@ -104,10 +104,12 @@ void GlobalServicesScriptingInterface::loggedOut() {
emit GlobalServicesScriptingInterface::disconnected(QString("logout")); emit GlobalServicesScriptingInterface::disconnected(QString("logout"));
} }
#ifdef HAVE_QXMPP
void GlobalServicesScriptingInterface::messageReceived(const QXmppMessage& message) { void GlobalServicesScriptingInterface::messageReceived(const QXmppMessage& message) {
if (message.type() != QXmppMessage::GroupChat) { if (message.type() != QXmppMessage::GroupChat) {
return; return;
} }
const QXmppMucRoom* publicChatRoom = XmppClient::getInstance().getPublicChatRoom(); const QXmppMucRoom* publicChatRoom = XmppClient::getInstance().getPublicChatRoom();
emit GlobalServicesScriptingInterface::incomingMessage(message.from().right(message.from().count() - 1 - publicChatRoom->jid().count()), message.body()); emit GlobalServicesScriptingInterface::incomingMessage(message.from().right(message.from().count() - 1 - publicChatRoom->jid().count()), message.body());
} }
#endif // HAVE_QXMPP

4
interface/src/scripting/GlobalServicesScriptingInterface.h
View file

@ -24,7 +24,7 @@
#include <QXmppClient.h> #include <QXmppClient.h>
#include <QXmppMessage.h> #include <QXmppMessage.h>
#endif #endif // HAVE_QXMPP
class GlobalServicesScriptingInterface : public QObject { class GlobalServicesScriptingInterface : public QObject {
Q_OBJECT Q_OBJECT
@ -47,7 +47,9 @@ private slots:
void loggedOut(); void loggedOut();
void onConnected(); void onConnected();
void participantsChanged(); void participantsChanged();
#ifdef HAVE_QXMPP
void messageReceived(const QXmppMessage& message); void messageReceived(const QXmppMessage& message);
#endif // HAVE_QXMPP
signals: signals:
void connected(); void connected();