Permalink
Browse files

Jingle implementation is moved to experimental subdirectory

  • Loading branch information...
euroelessar committed Apr 12, 2012
1 parent d84592c commit 014118a533ad94f5d51f63e84bd8c9a71f7ef321
Showing with 196 additions and 173 deletions.
  1. +5 −5 3rdparty/icesupport/icecomponent_p.h
  2. +12 −8 CMakeLists.txt
  3. +2 −0 ChangeLog
  4. 0 {src → deffered}/gui/jidedit.cpp
  5. 0 {src → deffered}/gui/jidedit.h
  6. 0 {src → deffered}/gui/jidedit_p.h
  7. 0 {src → deffered}/gui/xmlconsole.cpp
  8. 0 {src → deffered}/gui/xmlconsole.h
  9. 0 {src → deffered}/gui/xmlconsole.ui
  10. +2 −0 src/client.cpp
  11. +1 −1 src/client_p.h
  12. +4 −4 src/{ → experimental}/iristransport.cpp
  13. +4 −4 src/{ → experimental}/iristransport.h
  14. +6 −6 src/{ → experimental}/jingle.cpp
  15. +7 −7 src/{ → experimental}/jingle_p.h
  16. +5 −5 src/{ → experimental}/jingleaudiocontent.cpp
  17. +5 −5 src/{ → experimental}/jingleaudiocontent.h
  18. +5 −5 src/{ → experimental}/jingleaudiocontent_p.h
  19. +5 −5 src/{ → experimental}/jingleaudiocontentfactory.cpp
  20. +5 −5 src/{ → experimental}/jingleaudiocontentfactory_p.h
  21. +5 −5 src/{ → experimental}/jingleaudiopayload.cpp
  22. +6 −6 src/{ → experimental}/jingleaudiopayload.h
  23. +5 −5 src/{ → experimental}/jingleaudiopayload_p.h
  24. +5 −5 src/{ → experimental}/jinglecontent.cpp
  25. +6 −6 src/{ → experimental}/jinglecontent.h
  26. +5 −5 src/{ → experimental}/jinglecontent_p.h
  27. +7 −7 src/{ → experimental}/jinglefactory.cpp
  28. +6 −6 src/{ → experimental}/jinglefactory_p.h
  29. +8 −6 src/{ → experimental}/jinglemanager.cpp
  30. +6 −6 src/{ → experimental}/jinglemanager.h
  31. +5 −5 src/{ → experimental}/jinglemanager_p.h
  32. +7 −7 src/{ → experimental}/jinglesession.cpp
  33. +6 −6 src/{ → experimental}/jinglesession.h
  34. +5 −5 src/{ → experimental}/jinglesession_p.h
  35. +5 −5 src/{ → experimental}/jinglespeexcodec.cpp
  36. +5 −5 src/{ → experimental}/jinglespeexcodec_p.h
  37. +5 −5 src/{ → experimental}/jingletransport.cpp
  38. +6 −6 src/{ → experimental}/jingletransport.h
  39. +13 −7 src/{ → experimental}/jingletransportice.cpp
  40. +10 −5 src/{ → experimental}/jingletransportice_p.h
  41. +2 −0 src/saslfeature.cpp
@@ -1,15 +1,15 @@
/****************************************************************************
**
-** qutIM instant messenger
+** Jreen
**
-** Copyright (C) 2011 Ruslan Nigmatullin <euroelessar@ya.ru>
+** Copyright © 2012 Ruslan Nigmatullin <euroelessar@yandex.ru>
**
*****************************************************************************
**
-** $QUTIM_BEGIN_LICENSE$
+** $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 3 of the License, or
+** 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,
@@ -19,7 +19,7 @@
**
** You should have received a copy of the GNU General Public License
** along with this program. If not, see http://www.gnu.org/licenses/.
-** $QUTIM_END_LICENSE$
+** $JREEN_END_LICENSE$
**
****************************************************************************/
View
@@ -9,8 +9,8 @@ set(CMAKE_JREEN_VERSION_PATCH 6 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)
-FILE(GLOB SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
-FILE(GLOB HDR "${CMAKE_CURRENT_SOURCE_DIR}/src/*.h")
+FILE(GLOB_RECURSE SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
+FILE(GLOB_RECURSE HDR "${CMAKE_CURRENT_SOURCE_DIR}/src/*.h")
# Require QT 4.6
SET(QT_MIN_VERSION "4.6.0")
@@ -85,12 +85,16 @@ LIST(APPEND SRC ${3RD_PARTY_SRC})
LIST(APPEND HDR ${3RD_PARTY_HDR})
# Ice support
-file(GLOB_RECURSE ICESUPPORT_SRC "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/icesupport/*.cpp")
-file(GLOB_RECURSE ICESUPPORT_SRC_C "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/icesupport/*.c")
-file(GLOB_RECURSE ICESUPPORT_HDR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/icesupport/*.h")
-list(APPEND SRC ${ICESUPPORT_SRC})
-list(APPEND SRC ${ICESUPPORT_SRC_C})
-list(APPEND HDR ${ICESUPPORT_HDR})
+option(JREEN_USE_IRISICE "Use ICE from IRIS" OFF)
+if (JREEN_USE_IRISICE)
+ file(GLOB_RECURSE ICESUPPORT_SRC "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/icesupport/*.cpp")
+ file(GLOB_RECURSE ICESUPPORT_SRC_C "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/icesupport/*.c")
+ file(GLOB_RECURSE ICESUPPORT_HDR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/icesupport/*.h")
+ list(APPEND SRC ${ICESUPPORT_SRC})
+ list(APPEND SRC ${ICESUPPORT_SRC_C})
+ list(APPEND HDR ${ICESUPPORT_HDR})
+ add_definitions("-DHAVE_IRISICE")
+endif()
option(JREEN_USE_SIMPLESASL "Use SimpleSASL" ON)
if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/simplesasl")
View
@@ -1,8 +1,10 @@
Version ***
* Added PGP payloads
* Added support for Message Forwarding
+ * Added MetaContacts support
* Added experimental Jingle support
* Fixed authorization with SCRAM-SHA1
+ * Fixed sending of IQ's on connect
Version 1.0.6:
* Fixed parsing of PubSub payload
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
View
@@ -43,6 +43,7 @@
#include "pubsubmanager_p.h"
#include "tunefactory_p.h"
#include "bookmarkfactory_p.h"
+#include "metacontactsfactory_p.h"
#include "privacyqueryfactory_p.h"
#include "delayeddeliveryfactory_p.h"
#include "receiptfactory_p.h"
@@ -169,6 +170,7 @@ void ClientPrivate::init()
q_ptr->registerPayload(new MUCRoomOwnerQueryFactory);
q_ptr->registerPayload(new EntityTimeFactory);
q_ptr->registerPayload(new BookmarkFactory);
+ q_ptr->registerPayload(new MetaContactsFactory);
q_ptr->registerPayload(new PrivateXmlQueryFactory(q_ptr));
q_ptr->registerPayload(new PrivacyQueryFactory);
q_ptr->registerPayload(new RegistrationQueryFactory);
View
@@ -51,7 +51,7 @@
#include <QNetworkProxyFactory>
#include "stanza_p.h"
#include "streamprocessor.h"
-#include "jinglemanager.h"
+#include "experimental/jinglemanager.h"
namespace Jreen
{
@@ -1,15 +1,15 @@
/****************************************************************************
**
-** qutIM - instant messenger
+** Jreen
**
** Copyright © 2012 Ruslan Nigmatullin <euroelessar@yandex.ru>
**
*****************************************************************************
**
-** $QUTIM_BEGIN_LICENSE$
+** $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 3 of the License, or
+** 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,
@@ -19,7 +19,7 @@
**
** You should have received a copy of the GNU General Public License
** along with this program. If not, see http://www.gnu.org/licenses/.
-** $QUTIM_END_LICENSE$
+** $JREEN_END_LICENSE$
**
****************************************************************************/
@@ -1,15 +1,15 @@
/****************************************************************************
**
-** qutIM - instant messenger
+** Jreen
**
** Copyright © 2012 Ruslan Nigmatullin <euroelessar@yandex.ru>
**
*****************************************************************************
**
-** $QUTIM_BEGIN_LICENSE$
+** $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 3 of the License, or
+** 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,
@@ -19,7 +19,7 @@
**
** You should have received a copy of the GNU General Public License
** along with this program. If not, see http://www.gnu.org/licenses/.
-** $QUTIM_END_LICENSE$
+** $JREEN_END_LICENSE$
**
****************************************************************************/
@@ -1,15 +1,15 @@
/****************************************************************************
**
-** qutIM instant messenger
+** Jreen
**
-** Copyright (C) 2011 Ruslan Nigmatullin <euroelessar@ya.ru>
+** Copyright © 2012 Ruslan Nigmatullin <euroelessar@yandex.ru>
**
*****************************************************************************
**
-** $QUTIM_BEGIN_LICENSE$
+** $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 3 of the License, or
+** 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,
@@ -19,13 +19,13 @@
**
** You should have received a copy of the GNU General Public License
** along with this program. If not, see http://www.gnu.org/licenses/.
-** $QUTIM_END_LICENSE$
+** $JREEN_END_LICENSE$
**
****************************************************************************/
#include "jingle_p.h"
#include "jinglesession_p.h"
-#include "iqreply.h"
+#include "../iqreply.h"
namespace Jreen
{
@@ -1,15 +1,15 @@
/****************************************************************************
**
-** qutIM instant messenger
+** Jreen
**
-** Copyright (C) 2011 Ruslan Nigmatullin <euroelessar@ya.ru>
+** Copyright © 2012 Ruslan Nigmatullin <euroelessar@yandex.ru>
**
*****************************************************************************
**
-** $QUTIM_BEGIN_LICENSE$
+** $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 3 of the License, or
+** 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,
@@ -19,15 +19,15 @@
**
** You should have received a copy of the GNU General Public License
** along with this program. If not, see http://www.gnu.org/licenses/.
-** $QUTIM_END_LICENSE$
+** $JREEN_END_LICENSE$
**
****************************************************************************/
#ifndef JINGLE_H
#define JINGLE_H
-#include "stanzaextension.h"
-#include "jid.h"
+#include "../stanzaextension.h"
+#include "../jid.h"
#include "jingletransport.h"
#include "jinglecontent.h"
@@ -1,15 +1,15 @@
/****************************************************************************
**
-** qutIM instant messenger
+** Jreen
**
-** Copyright (C) 2011 Ruslan Nigmatullin <euroelessar@ya.ru>
+** Copyright © 2012 Ruslan Nigmatullin <euroelessar@yandex.ru>
**
*****************************************************************************
**
-** $QUTIM_BEGIN_LICENSE$
+** $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 3 of the License, or
+** 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,
@@ -19,7 +19,7 @@
**
** You should have received a copy of the GNU General Public License
** along with this program. If not, see http://www.gnu.org/licenses/.
-** $QUTIM_END_LICENSE$
+** $JREEN_END_LICENSE$
**
****************************************************************************/
@@ -1,15 +1,15 @@
/****************************************************************************
**
-** qutIM instant messenger
+** Jreen
**
-** Copyright (C) 2011 Ruslan Nigmatullin <euroelessar@ya.ru>
+** Copyright © 2012 Ruslan Nigmatullin <euroelessar@yandex.ru>
**
*****************************************************************************
**
-** $QUTIM_BEGIN_LICENSE$
+** $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 3 of the License, or
+** 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,
@@ -19,7 +19,7 @@
**
** You should have received a copy of the GNU General Public License
** along with this program. If not, see http://www.gnu.org/licenses/.
-** $QUTIM_END_LICENSE$
+** $JREEN_END_LICENSE$
**
****************************************************************************/
@@ -1,15 +1,15 @@
/****************************************************************************
**
-** qutIM instant messenger
+** Jreen
**
-** Copyright (C) 2011 Ruslan Nigmatullin <euroelessar@ya.ru>
+** Copyright © 2012 Ruslan Nigmatullin <euroelessar@yandex.ru>
**
*****************************************************************************
**
-** $QUTIM_BEGIN_LICENSE$
+** $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 3 of the License, or
+** 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,
@@ -19,7 +19,7 @@
**
** You should have received a copy of the GNU General Public License
** along with this program. If not, see http://www.gnu.org/licenses/.
-** $QUTIM_END_LICENSE$
+** $JREEN_END_LICENSE$
**
****************************************************************************/
@@ -1,15 +1,15 @@
/****************************************************************************
**
-** qutIM instant messenger
+** Jreen
**
-** Copyright (C) 2011 Ruslan Nigmatullin <euroelessar@ya.ru>
+** Copyright © 2012 Ruslan Nigmatullin <euroelessar@yandex.ru>
**
*****************************************************************************
**
-** $QUTIM_BEGIN_LICENSE$
+** $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 3 of the License, or
+** 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,
@@ -19,7 +19,7 @@
**
** You should have received a copy of the GNU General Public License
** along with this program. If not, see http://www.gnu.org/licenses/.
-** $QUTIM_END_LICENSE$
+** $JREEN_END_LICENSE$
**
****************************************************************************/
@@ -1,15 +1,15 @@
/****************************************************************************
**
-** qutIM instant messenger
+** Jreen
**
-** Copyright (C) 2011 Ruslan Nigmatullin <euroelessar@ya.ru>
+** Copyright © 2012 Ruslan Nigmatullin <euroelessar@yandex.ru>
**
*****************************************************************************
**
-** $QUTIM_BEGIN_LICENSE$
+** $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 3 of the License, or
+** 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,
@@ -19,7 +19,7 @@
**
** You should have received a copy of the GNU General Public License
** along with this program. If not, see http://www.gnu.org/licenses/.
-** $QUTIM_END_LICENSE$
+** $JREEN_END_LICENSE$
**
****************************************************************************/
Oops, something went wrong.

0 comments on commit 014118a

Please sign in to comment.