Hello community, here is the log from the commit of package libjreen for openSUSE:Factory checked in at 2013-01-13 14:28:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libjreen (Old) and /work/SRC/openSUSE:Factory/.libjreen.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libjreen", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libjreen/libjreen.changes 2012-04-19 08:50:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libjreen.new/libjreen.changes 2013-01-13 14:28:58.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Jan 7 21:57:11 UTC 2013 - [email protected] + +- Update to version 1.1.1 + * Added support for XEP-224: Attentions + * Fixed roster update receiving on some servers + +------------------------------------------------------------------- Old: ---- libjreen-1.1.0.tar.bz2 New: ---- libjreen-1.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libjreen.spec ++++++ --- /var/tmp/diff_new_pack.DazJsw/_old 2013-01-13 14:28:59.000000000 +0100 +++ /var/tmp/diff_new_pack.DazJsw/_new 2013-01-13 14:28:59.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libjreen # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define soname 1 Name: libjreen -Version: 1.1.0 +Version: 1.1.1 Release: 0 Summary: Qt Jabber/XMPP library License: GPL-2.0+ ++++++ libjreen-1.1.0.tar.bz2 -> libjreen-1.1.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libjreen-1.1.0/CMakeLists.txt new/libjreen-1.1.1/CMakeLists.txt --- old/libjreen-1.1.0/CMakeLists.txt 2012-04-13 18:17:32.000000000 +0200 +++ new/libjreen-1.1.1/CMakeLists.txt 2013-01-06 16:49:31.000000000 +0100 @@ -5,7 +5,7 @@ set(CMAKE_JREEN_VERSION_MAJOR 1 CACHE INT "Major Jreen version number" FORCE) set(CMAKE_JREEN_VERSION_MINOR 1 CACHE INT "Minor Jreen version number" FORCE) -set(CMAKE_JREEN_VERSION_PATCH 0 CACHE INT "Release Jreen version number" FORCE) +set(CMAKE_JREEN_VERSION_PATCH 1 CACHE INT "Release Jreen version number" FORCE) set(CMAKE_JREEN_VERSION_STRING "${CMAKE_JREEN_VERSION_MAJOR}.${CMAKE_JREEN_VERSION_MINOR}.${CMAKE_JREEN_VERSION_PATCH}" CACHE STRING "Jreen version string" FORCE) # Search for source and headers in source directory (non-recursive) @@ -170,7 +170,7 @@ ) file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/include/jreen" ) -file(GLOB JREEN_INCLUDE_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/src" "${CMAKE_CURRENT_SOURCE_DIR}/src/*.h") +file(GLOB_RECURSE JREEN_INCLUDE_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/src" "${CMAKE_CURRENT_SOURCE_DIR}/src/*.h") foreach(header ${JREEN_INCLUDE_HEADERS}) if(NOT ${header} MATCHES ".*_p\\.h") if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/include/jreen/${header}") @@ -179,7 +179,11 @@ " ) endif(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/include/jreen/${header}") - LIST(APPEND JREEN_INSTALL_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/src/${header}") + get_filename_component(headerPath ${header} PATH) + install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/${header}" + DESTINATION include/jreen/${headerPath} + COMPONENT jreenDevel + ) endif(NOT ${header} MATCHES ".*_p\\.h") endforeach(header) @@ -227,7 +231,3 @@ BUNDLE DESTINATION library ) -INSTALL(FILES ${JREEN_INSTALL_HEADERS} - DESTINATION include/jreen - COMPONENT jreenDevel -) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libjreen-1.1.0/ChangeLog new/libjreen-1.1.1/ChangeLog --- old/libjreen-1.1.0/ChangeLog 2012-04-13 18:17:32.000000000 +0200 +++ new/libjreen-1.1.1/ChangeLog 2013-01-06 16:49:31.000000000 +0100 @@ -1,3 +1,7 @@ +Version 1.1.1 + * Added support for XEP-224: Attentions + * Fixed roster update receiving on some servers + Version 1.1.0 * Added PGP payloads * Added support for Message Forwarding diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libjreen-1.1.0/cmake/FindQCA2.cmake new/libjreen-1.1.1/cmake/FindQCA2.cmake --- old/libjreen-1.1.0/cmake/FindQCA2.cmake 2012-04-13 18:17:32.000000000 +0200 +++ new/libjreen-1.1.1/cmake/FindQCA2.cmake 2013-01-06 16:49:31.000000000 +0100 @@ -38,7 +38,8 @@ find_path(QCA2_INCLUDE_DIR qca.h HINTS ${PC_QCA2_INCLUDEDIR} ${PC_QCA2_INCLUDE_DIRS} - PATH_SUFFIXES QtCrypto) + PATH_SUFFIXES QtCrypto + PATHS /usr/local/lib/qca.framework/Headers/) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(QCA2 DEFAULT_MSG QCA2_LIBRARIES QCA2_INCLUDE_DIR) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libjreen-1.1.0/jreen.qbs new/libjreen-1.1.1/jreen.qbs --- old/libjreen-1.1.0/jreen.qbs 1970-01-01 01:00:00.000000000 +0100 +++ new/libjreen-1.1.1/jreen.qbs 2013-01-06 16:49:31.000000000 +0100 @@ -0,0 +1,9 @@ +import qbs.base 1.0 + +Project { + + moduleSearchPaths: "qbs/modules" + + references: "src/src.qbs" +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libjreen-1.1.0/src/abstractroster.h new/libjreen-1.1.1/src/abstractroster.h --- old/libjreen-1.1.0/src/abstractroster.h 2012-04-13 18:17:32.000000000 +0200 +++ new/libjreen-1.1.1/src/abstractroster.h 2013-01-06 16:49:31.000000000 +0100 @@ -156,8 +156,8 @@ using AbstractRoster::add; using AbstractRoster::remove; signals: - void itemAdded(const RosterItem::Ptr &item); - void itemUpdated(const RosterItem::Ptr &item); + void itemAdded(const Jreen::RosterItem::Ptr &item); + void itemUpdated(const Jreen::RosterItem::Ptr &item); void itemRemoved(const QString &jid); void presenceReceived(const Jreen::RosterItem::Ptr &item, const Jreen::Presence &presence); void subscriptionReceived(const Jreen::RosterItem::Ptr &item, const Jreen::Presence &presence); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libjreen-1.1.0/src/attention.cpp new/libjreen-1.1.1/src/attention.cpp --- old/libjreen-1.1.0/src/attention.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/libjreen-1.1.1/src/attention.cpp 2013-01-06 16:49:31.000000000 +0100 @@ -0,0 +1,45 @@ +/**************************************************************************** +** +** Jreen +** +** Copyright © 2012 Nicolay Izoderov <[email protected]> +** +***************************************************************************** +** +** $JREEN_BEGIN_LICENSE$ +** This program is free software: you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation, either version 2 of the License, or +** (at your option) any later version. +** +** This program 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 General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program. If not, see http://www.gnu.org/licenses/. +** $JREEN_END_LICENSE$ +** +****************************************************************************/ + +#include "attention.h" + +namespace Jreen { + +class AttentionPrivate +{ +public: +}; + +Attention::Attention() + : d_ptr(new AttentionPrivate) +{ +} + +Attention::~Attention() +{ +} + +} + // namespace Jreen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libjreen-1.1.0/src/attention.h new/libjreen-1.1.1/src/attention.h --- old/libjreen-1.1.0/src/attention.h 1970-01-01 01:00:00.000000000 +0100 +++ new/libjreen-1.1.1/src/attention.h 2013-01-06 16:49:31.000000000 +0100 @@ -0,0 +1,48 @@ +/**************************************************************************** +** +** Jreen +** +** Copyright © 2012 Nicolay Izoderov <[email protected]> +** +***************************************************************************** +** +** $JREEN_BEGIN_LICENSE$ +** This program is free software: you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation, either version 2 of the License, or +** (at your option) any later version. +** +** This program 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 General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program. If not, see http://www.gnu.org/licenses/. +** $JREEN_END_LICENSE$ +** +****************************************************************************/ +#ifndef ATTENTION_H +#define ATTENTION_H +#include "stanzaextension.h" + +namespace Jreen { + +class AttentionPrivate; + +//XEP-0224 Attention +//http://xmpp.org/extensions/xep-0224.html +class JREEN_EXPORT Attention : public Payload +{ + Q_DECLARE_PRIVATE(Attention) + J_PAYLOAD(Jreen::Attention) +public: + Attention(); + ~Attention(); +private: + QScopedPointer<AttentionPrivate> d_ptr; +}; + +} // namespace Jreen + +#endif // ATTENTION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libjreen-1.1.0/src/attentionfactory.cpp new/libjreen-1.1.1/src/attentionfactory.cpp --- old/libjreen-1.1.0/src/attentionfactory.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/libjreen-1.1.1/src/attentionfactory.cpp 2013-01-06 16:49:31.000000000 +0100 @@ -0,0 +1,88 @@ +/**************************************************************************** +** +** Jreen +** +** Copyright © 2012 Nicolay Izoderov <[email protected]> +** +***************************************************************************** +** +** $JREEN_BEGIN_LICENSE$ +** This program is free software: you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation, either version 2 of the License, or +** (at your option) any later version. +** +** This program 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 General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program. If not, see http://www.gnu.org/licenses/. +** $JREEN_END_LICENSE$ +** +****************************************************************************/ + +#include "attentionfactory_p.h" +#include <QMap> +#include <QXmlStreamReader> +#include <QStringList> +#include "jstrings.h" + +#define NS_ATTENTION QLatin1String("urn:xmpp:attention:0") + +namespace Jreen { + +AttentionFactory::AttentionFactory() +{ + +} + +AttentionFactory::~AttentionFactory() +{ + +} + +QStringList AttentionFactory::features() const +{ + return QStringList(NS_ATTENTION); +} + +bool AttentionFactory::canParse(const QStringRef &name, + const QStringRef &uri, const QXmlStreamAttributes &attributes) +{ + Q_UNUSED(attributes); + return name == QLatin1String("attention") && uri == NS_ATTENTION; +} + +void AttentionFactory::handleStartElement(const QStringRef &name, const QStringRef &uri, const QXmlStreamAttributes &attributes) +{ + Q_UNUSED(uri); + Q_UNUSED(attributes); + Q_UNUSED(name); +} + +void AttentionFactory::handleEndElement(const QStringRef &name, const QStringRef &uri) +{ + Q_UNUSED(name); + Q_UNUSED(uri); +} + +void AttentionFactory::handleCharacterData(const QStringRef &text) +{ + Q_UNUSED(text); +} + +void AttentionFactory::serialize(Payload *extension, QXmlStreamWriter *writer) +{ + writer->writeStartElement(QLatin1String("attention")); + writer->writeDefaultNamespace(NS_ATTENTION); + writer->writeEndElement(); +} + +Payload::Ptr AttentionFactory::createPayload() +{ + return Payload::Ptr(new Attention()); +} + +} // namespace Jreen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libjreen-1.1.0/src/attentionfactory_p.h new/libjreen-1.1.1/src/attentionfactory_p.h --- old/libjreen-1.1.0/src/attentionfactory_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/libjreen-1.1.1/src/attentionfactory_p.h 2013-01-06 16:49:31.000000000 +0100 @@ -0,0 +1,49 @@ +/**************************************************************************** +** +** Jreen +** +** Copyright © 2012 Nicolay Izoderov <[email protected]> +** +***************************************************************************** +** +** $JREEN_BEGIN_LICENSE$ +** This program is free software: you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation, either version 2 of the License, or +** (at your option) any later version. +** +** This program 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 General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program. If not, see http://www.gnu.org/licenses/. +** $JREEN_END_LICENSE$ +** +****************************************************************************/ + +#ifndef ATTENTIONFACTORY_P_H +#define ATTENTIONFACTORY_P_H +#include "stanzaextension.h" +#include "attention.h" + +namespace Jreen { + +class JREEN_AUTOTEST_EXPORT AttentionFactory : public PayloadFactory<Attention> +{ +public: + AttentionFactory(); + virtual ~AttentionFactory(); + QStringList features() const; + bool canParse(const QStringRef &name, const QStringRef &uri, const QXmlStreamAttributes &attributes); + void handleStartElement(const QStringRef &name, const QStringRef &uri, const QXmlStreamAttributes &attributes); + void handleEndElement(const QStringRef &name, const QStringRef &uri); + void handleCharacterData(const QStringRef &text); + void serialize(Payload *extension, QXmlStreamWriter *writer); + Payload::Ptr createPayload(); +}; + +} // namespace Jreen + +#endif // ATTENTIONFACTORY_P_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libjreen-1.1.0/src/buffereddatastream.cpp new/libjreen-1.1.1/src/buffereddatastream.cpp --- old/libjreen-1.1.0/src/buffereddatastream.cpp 2012-04-13 18:17:32.000000000 +0200 +++ new/libjreen-1.1.1/src/buffereddatastream.cpp 2013-01-06 16:49:31.000000000 +0100 @@ -93,7 +93,7 @@ int bytes = device()->bytesAvailable(); d->ensureSize(bytes); device()->read(d->buffer.data() + d->offset + d->len, bytes); -// qDebug("< \"%s\"", QByteArray(d->buffer.constData() + d->offset + d->len, bytes).constData()); +// Logger::debug("< \"%s\"", QByteArray(d->buffer.constData() + d->offset + d->len, bytes).constData()); d->len += bytes; emit readyRead(); } @@ -115,7 +115,7 @@ foreach (XmlStreamHandler *handler, *d->handlers) handler->handleOutgoingData(d->outBuffer.constData(), d->outBuffer.size()); device()->write(d->outBuffer.constData(), d->outBuffer.size()); -// qDebug("> \"%s\"", d->outBuffer.constData()); +// Logger::debug("> \"%s\"", d->outBuffer.constData()); d->outBuffer.clear(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libjreen-1.1.0/src/client.cpp new/libjreen-1.1.1/src/client.cpp --- old/libjreen-1.1.0/src/client.cpp 2012-04-13 18:17:32.000000000 +0200 +++ new/libjreen-1.1.1/src/client.cpp 2013-01-06 16:49:31.000000000 +0100 @@ -64,6 +64,7 @@ #include "captchafactory_p.h" #include "pgpfactory_p.h" #include "forwardedfactory_p.h" +#include "attentionfactory_p.h" // Features #include "nonsaslauth_p.h" @@ -97,6 +98,7 @@ } } else if (iq->subtype() == IQ::Get || iq->subtype() == IQ::Set) { bool ok = iq->from().isDomain() + || !iq->from().isValid() || !roster || rooms.contains(iq->from().bare()) || iq->from().bare() == jid.bare(); @@ -179,6 +181,7 @@ q_ptr->registerPayload(new PGPSignedFactory); q_ptr->registerPayload(new PGPEncryptedFactory); q_ptr->registerPayload(new ForwardedFactory(q_ptr)); + q_ptr->registerPayload(new AttentionFactory); q_ptr->registerStreamFeature(new NonSaslAuth); q_ptr->registerStreamFeature(new SASLFeature); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libjreen-1.1.0/src/client.h new/libjreen-1.1.1/src/client.h --- old/libjreen-1.1.0/src/client.h 2012-04-13 18:17:32.000000000 +0200 +++ new/libjreen-1.1.1/src/client.h 2013-01-06 16:49:31.000000000 +0100 @@ -67,6 +67,7 @@ Q_OBJECT Q_PROPERTY(QSet<QString> serverFeatures READ serverFeatures NOTIFY serverFeaturesReceived) Q_PROPERTY(Jreen::Disco::IdentityList serverIdentities READ serverIdentities NOTIFY serverIdentitiesReceived) + Q_ENUMS(DisconnectReason Feature FeatureConfig) Q_DECLARE_PRIVATE(Client) public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libjreen-1.1.0/src/directconnection.cpp new/libjreen-1.1.1/src/directconnection.cpp --- old/libjreen-1.1.0/src/directconnection.cpp 2012-04-13 18:17:32.000000000 +0200 +++ new/libjreen-1.1.1/src/directconnection.cpp 2013-01-06 16:49:31.000000000 +0100 @@ -109,7 +109,8 @@ switch(ss) { case QAbstractSocket::ConnectedState: { -#ifdef Q_OS_LINUX + // It's known that KeepAlive breaks connections on Maemo 5 and MeeGo Harmattan +#if defined(Q_OS_LINUX) && !defined(Q_WS_MAEMO_5) && !defined(MEEGO_EDITION_HARMATTAN) if (qobject_cast<QTcpSocket*>(socket)) { int fd = socket->socketDescriptor(); Q_ASSERT(fd != -1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libjreen-1.1.0/src/experimental/jingleaudiocontent.cpp new/libjreen-1.1.1/src/experimental/jingleaudiocontent.cpp --- old/libjreen-1.1.0/src/experimental/jingleaudiocontent.cpp 2012-04-13 18:17:32.000000000 +0200 +++ new/libjreen-1.1.1/src/experimental/jingleaudiocontent.cpp 2013-01-06 16:49:31.000000000 +0100 @@ -30,6 +30,7 @@ #include <QDateTime> #include <QDebug> #include <qmath.h> +#include "../logger.h" namespace Jreen { @@ -138,7 +139,7 @@ qint64 size = qMin<qint64>(m_outputBuffer.size(), maxSize); qMemCopy(data, m_outputBuffer.data(), size); m_outputBuffer.remove(0, size); - return maxSize; + return size; } qint64 JingleAudioDevice::writeData(const char *data, qint64 len) @@ -259,7 +260,7 @@ void JingleAudioContent::receive(int component, const QByteArray &receivedData) { if (component == JingleRTCP) { - qDebug() << Q_FUNC_INFO << receivedData.toHex(); + Logger::debug() << Q_FUNC_INFO << receivedData.toHex(); } if (component != JingleRTP) return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libjreen-1.1.0/src/experimental/jinglecontent.cpp new/libjreen-1.1.1/src/experimental/jinglecontent.cpp --- old/libjreen-1.1.0/src/experimental/jinglecontent.cpp 2012-04-13 18:17:32.000000000 +0200 +++ new/libjreen-1.1.1/src/experimental/jinglecontent.cpp 2013-01-06 16:49:31.000000000 +0100 @@ -26,7 +26,7 @@ #include "jinglecontent_p.h" #include "jingletransport.h" #include "jinglesession_p.h" -#include <QDebug> +#include "../logger.h" namespace Jreen { @@ -73,7 +73,7 @@ void JingleContentPrivate::setTransport(JingleTransport *trueTransport) { transport = trueTransport; - qDebug() << Q_FUNC_INFO << transport; + Logger::debug() << Q_FUNC_INFO << transport; QObject::connect(transport, SIGNAL(received(int,QByteArray)), q_func(), SLOT(_q_received(int,QByteArray))); QObject::connect(transport, SIGNAL(stateChanged(Jreen::JingleTransport::State)), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libjreen-1.1.0/src/experimental/jinglefactory.cpp new/libjreen-1.1.1/src/experimental/jinglefactory.cpp --- old/libjreen-1.1.0/src/experimental/jinglefactory.cpp 2012-04-13 18:17:32.000000000 +0200 +++ new/libjreen-1.1.1/src/experimental/jinglefactory.cpp 2013-01-06 16:49:31.000000000 +0100 @@ -26,6 +26,7 @@ #include "jinglefactory_p.h" #include "../jstrings.h" #include "../client_p.h" +#include "../logger.h" #define NS_JINGLE QLatin1String("urn:xmpp:jingle:1") #define NS_JINGLE_RTP QLatin1String("urn:xmpp:jingle:apps:rtp:1") @@ -101,7 +102,7 @@ m_content->senders = Jingle::Both; } else if (m_depth == 3 && m_state == AtContent) { foreach (m_factory, m_client->factoriesByUri.values(uri.toString())) { - qDebug() << uri << Payload::payloadName(m_factory->payloadType()) + Logger::debug() << uri << Payload::payloadName(m_factory->payloadType()) << m_factory->canParse(name, uri, attributes); if (m_factory->canParse(name, uri, attributes)) break; @@ -114,7 +115,7 @@ m_state = AtDescription; else m_factory = 0; - qDebug() << name << uri << m_factory; + Logger::debug() << name << uri << m_factory; } if (m_factory) m_factory->handleStartElement(name, uri, attributes); @@ -173,7 +174,7 @@ if (factory) factory->serialize(content.description.data(), writer); } else { - qDebug("No description"); + Logger::debug() << "No description"; } for (int j = 0; j < content.transports.size(); ++j) { Payload *payload = content.transports.at(j).data(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libjreen-1.1.0/src/experimental/jinglemanager.cpp new/libjreen-1.1.1/src/experimental/jinglemanager.cpp --- old/libjreen-1.1.0/src/experimental/jinglemanager.cpp 2012-04-13 18:17:32.000000000 +0200 +++ new/libjreen-1.1.1/src/experimental/jinglemanager.cpp 2013-01-06 16:49:31.000000000 +0100 @@ -28,6 +28,7 @@ #include "jinglesession_p.h" #include "jingletransportice_p.h" #include "jingleaudiocontentfactory_p.h" +#include "../logger.h" namespace Jreen { @@ -64,7 +65,7 @@ Jingle::Ptr jingle = iq.payload<Jingle>(); if (!jingle) return; - qDebug() << Q_FUNC_INFO; + Logger::debug() << Q_FUNC_INFO; iq.accept(); JingleSession *session = sessions.value(jingle->sid); if (session) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libjreen-1.1.0/src/experimental/jinglesession.cpp new/libjreen-1.1.1/src/experimental/jinglesession.cpp --- old/libjreen-1.1.0/src/experimental/jinglesession.cpp 2012-04-13 18:17:32.000000000 +0200 +++ new/libjreen-1.1.1/src/experimental/jinglesession.cpp 2013-01-06 16:49:31.000000000 +0100 @@ -26,6 +26,7 @@ #include "jinglesession_p.h" #include "../client.h" #include "../util.h" +#include "../logger.h" namespace Jreen { @@ -50,7 +51,7 @@ void JingleSessionPrivate::handle(const Jingle::Ptr &jingle) { - qDebug() << Q_FUNC_INFO; + Logger::debug() << Q_FUNC_INFO; if (jingle->action == Jingle::SessionAccept) { foreach (const Jingle::Content &remoteContent, jingle->contents) { JingleSessionContent *content = findContent(remoteContent.name); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libjreen-1.1.0/src/experimental/jingletransportice.cpp new/libjreen-1.1.1/src/experimental/jingletransportice.cpp --- old/libjreen-1.1.0/src/experimental/jingletransportice.cpp 2012-04-13 18:17:32.000000000 +0200 +++ new/libjreen-1.1.1/src/experimental/jingletransportice.cpp 2013-01-06 16:49:31.000000000 +0100 @@ -33,6 +33,7 @@ #include "jinglesession.h" #include "../jstrings.h" #include "../util.h" +#include "../logger.h" #define NS_ICE_UDP QLatin1String("urn:xmpp:jingle:transports:ice-udp:1") @@ -129,7 +130,7 @@ void Transport::setRemoteInfo(const JingleTransportInfo::Ptr &genericInfo, bool final) { Q_UNUSED(final); - qDebug() << Q_FUNC_INFO; + Logger::debug() << Q_FUNC_INFO; TransportInfo::Ptr info = genericInfo.staticCast<TransportInfo>(); if (!info->ufrag.isEmpty()) m_ice->setPeerUfrag(info->ufrag); @@ -141,18 +142,18 @@ void Transport::onIceStarted() { - qDebug() << Q_FUNC_INFO; + Logger::debug() << Q_FUNC_INFO; } void Transport::onIceError(XMPP::Ice176::Error error) { - qDebug() << Q_FUNC_INFO << error; + Logger::debug() << Q_FUNC_INFO << error; setState(Failed); } void Transport::onIceLocalCandidatesReady(const QList<XMPP::Ice176::Candidate> &candidates) { - qDebug() << Q_FUNC_INFO; + Logger::debug() << Q_FUNC_INFO; TransportInfo::Ptr info = TransportInfo::Ptr::create(); info->candidates = candidates; info->ufrag = m_ice->localUfrag(); @@ -163,7 +164,7 @@ void Transport::onIceComponentReady(int component) { m_ready.remove(component); - qDebug() << Q_FUNC_INFO << component; + Logger::debug() << Q_FUNC_INFO << component; if (m_ready.isEmpty()) setState(Connected); } @@ -260,8 +261,8 @@ Payload::Ptr TransportFactory::createPayload() { - qDebug() << Q_FUNC_INFO << m_info->pwd << m_info->ufrag; - qDebug() << Q_FUNC_INFO << m_info->candidates.size(); + Logger::debug() << Q_FUNC_INFO << m_info->pwd << m_info->ufrag; + Logger::debug() << Q_FUNC_INFO << m_info->candidates.size(); Payload::Ptr result = m_info; m_info.clear(); return result; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libjreen-1.1.0/src/metacontactstorage.h new/libjreen-1.1.1/src/metacontactstorage.h --- old/libjreen-1.1.0/src/metacontactstorage.h 2012-04-13 18:17:32.000000000 +0200 +++ new/libjreen-1.1.1/src/metacontactstorage.h 2013-01-06 16:49:31.000000000 +0100 @@ -41,7 +41,7 @@ Q_DECLARE_PRIVATE(MetaContactStorage) public: class ItemData; - class Item + class JREEN_EXPORT Item { public: Item(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libjreen-1.1.0/src/sjdns.cpp new/libjreen-1.1.1/src/sjdns.cpp --- old/libjreen-1.1.0/src/sjdns.cpp 2012-04-13 18:17:32.000000000 +0200 +++ new/libjreen-1.1.1/src/sjdns.cpp 2013-01-06 16:49:31.000000000 +0100 @@ -81,7 +81,7 @@ const QJDns::Response *SJDns::servers(const QString &host) { Q_ASSERT(m_valid); - QHash<QString, QJDns::Response>::const_iterator iter = m_results.find(host); + QHash<QString, QJDns::Response>::const_iterator iter = m_results.constFind(host); if(iter == m_results.constEnd()) return 0; return &iter.value(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libjreen-1.1.0/src/src.qbs new/libjreen-1.1.1/src/src.qbs --- old/libjreen-1.1.0/src/src.qbs 1970-01-01 01:00:00.000000000 +0100 +++ new/libjreen-1.1.1/src/src.qbs 2013-01-06 16:49:31.000000000 +0100 @@ -0,0 +1,110 @@ +Product { + name: "jreen" + + property bool useSimpleSasl: true + property string versionMajor: '1' + property string versionMinor: '1' + property string versionRelease: '1' + property string version: versionMajor+'.'+versionMinor+'.'+versionRelease + + destination: { + if (qbs.targetOS === 'windows') + return "bin"; + else + return "lib"; + } + type: ["dynamiclibrary", "installed_content"] + + Depends { name: "cpp" } + //Depends { name: "headers" } + Depends { name: "Qt.core" } + Depends { name: "Qt.network" } + Depends { name: "qca" } + Depends { name: "zlib" } + Depends { name: "speex"; required: false } + Depends { name: "windows.ws2_32"; condition: qbs.targetOS === 'windows' } + Depends { name: "windows.advapi32"; condition: qbs.targetOS === 'windows' } + + //cpp.warningLevel: "all" + cpp.includePaths: [ + "..", + "../3rdparty", + "../3rdparty/jdns", + "../3rdparty/simplesasl", + "../3rdparty/icesupport", + ".", + "experimental" + ] + cpp.defines: ["J_BUILD_LIBRARY"] + cpp.positionIndependentCode: true + cpp.visibility: ["hidden"] + + Properties { + condition: useSimpleSasl + cpp.defines: outer.concat("HAVE_SIMPLESASL") + } + Properties { + condition: false //speex.found + cpp.defines: outer.concat("JREEN_HAVE_SPEEX=1") + } + + files: [ + "*.cpp" + ] + + Group { + //jdns files + prefix: "../3rdparty/jdns/" + files: [ + "*.h", + "*.c", + "*.cpp", + ] + } + Group { + //ice files + prefix: "../3rdparty/icesupport/" + files: [ + "*.h", + "*.c", + "*.cpp", + ] + } + Group { + //simple sasl files + condition: useSimpleSasl + prefix: "../3rdparty/simplesasl/" + files: [ + "*.h", + "*.cpp", + ] + } + Group { + //experimental jingle support + prefix: "experimental/" + files: [ + "*.h", + "*.cpp", + ] + } + + Group { + //public headers + qbs.installDir: "include/jreen" + overrideTags: false + fileTags: ["install"] + files: [ + "*[^_][a-z].h", + ] + } + + Group { + //private headers + files: "*_p.h" + } + + ProductModule { + Depends { name: "cpp" } + cpp.includePaths: product.buildDirectory + "/include/vreen" + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libjreen-1.1.0/src/vcardmanager.cpp new/libjreen-1.1.1/src/vcardmanager.cpp --- old/libjreen-1.1.0/src/vcardmanager.cpp 2012-04-13 18:17:32.000000000 +0200 +++ new/libjreen-1.1.1/src/vcardmanager.cpp 2013-01-06 16:49:31.000000000 +0100 @@ -113,7 +113,7 @@ if (iq.error()) { error = iq.error(); emit q_ptr->error(error); - } else if (vcard = iq.payload<Jreen::VCard>()) { + } else if ((vcard = iq.payload<Jreen::VCard>())) { emit q_ptr->vCardFetched(vcard, jid); } emit q_ptr->finished(); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
