summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-03-15Explicitly convert between nullable and non-nullable on OS XTobias Markmann
Clang was complaining about implicit conversions between nullable and non-nullable NSString pointers. Adjusted our std::string -> NSString* conversion utilities to check for nil and return an empty std::string in that case. Replaced uses of [NSString stringWithUTF8String] with our STD2NSSTRING macro. Turned std::string <-> NSString* conversion macros into functions. Test-Information: Builds without the warning on OS X 10.11.3 and Swift runs without issues. Change-Id: I949f2f3332018391aead58ef362764f4b7955b01
2015-10-30Remove Boost workaround for OS X headersTobias Markmann
Older versions of OS X define the same symbol as Boost does. The workaround, defining __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES as 0 worked around this issue, however __ prefixed defines are considered private and cause the warning "macro name is a reserved identifier [-Wreserved-id-macro]". Test-Information: Builds and unit tests pass on OS X 10.10.5. Change-Id: I489ec201dc31fb4e43336da690c7d348a7d0d9ca
2015-05-19Consolidate Python and SCons files to tab based indentationTobias Markmann
Test-Information: Verified that SCons still runs on OS X. Change-Id: I7e9b97f90ee5581a691a959b6f2c999d93e0be53
2015-04-28Add Qt flags detection using pkg-config on Linux platformsTobias Markmann
Fix qt4.py SCons module to use the specific tools of the correct Qt verison. On non-Windows and non-Darwin platforms SCons will try to detect the correct Qt compiler and linker flags from pkg-config. Added the ability to build Slimber with Qt5. Fixed Qt5 support on Linux when using prebuilt Qt distribution from Qt. This patch adds support for building Swift on Arch Linux, with Qt4 and Qt5. Test-Information: Tested under Mac OS X 10.9.5 and Manjaor Linux (Arch Linux) in Qt4 and Qt5 configuration, and tested Qt5 Linux binary from their website on Arch Linux with the qt variable set in config.py. Change-Id: I2e19ab4aa7a26fdd989e2a12faa51a0f3f89c3ce
2014-12-15Update Copyright In SlimberKevin Smith
Change-Id: I927ac2ed7be0153bb0e3d9f33c3001734ee9f65c
2014-10-01Port many of Isode's local fixes upstreamKevin Smith
Includes fixes to: Build with new Visual Studio and Boost Avoid error caused when Avahi is present but Qt is not Make declaration of XMPPRosterImpl::addContact consistent with implementation Includes enhancements to: Allow user-configurable mt.exe Allow splitting openssl paths Allow disabling gconf lookup Make idn support optional Allow disabling various library detections Remove use of non-Python2.4 features in sconscripts Test-Information: Builds Change-Id: Iee91ee80291a8bdf87cc169c915e4dad1cc1055b
2014-08-10Fix invalid characters being allowed in JID domainsRichard Maudsley
Test-Information: Prepare valid and invalid JIDs and make sure that isValid() is reported correctly. Added unit tests. Change-Id: Ic4d86f8b6ea9defc517ada2f8e3cc54979237cf4
2014-04-28Create ToplevelElement to replace Element.Richard Maudsley
Change-Id: I3460f6f4a2ffa9b795080664f49d9138440de72d
2014-01-25Fix images which caused libpng to issue warningsPavol Babincak
Warnings were seen in console while running Swift. Used ImageMagick to do identity reconversion: $ convert file.png file.png Following warnings were seen during reconversion on Fedora 20 with libpng-devel-1.6.3-3.fc20.x86_64 and ImageMagick-6.8.6.4-4.fc20.x86_64: convert: cHRM: invalid chromaticities `./Swift/resources/icons/certificate.png' convert: iCCP: known incorrect sRGB profile `./Slimber/Resources/Offline.png' @ warning/png.c/MagickPNGWarningHandler/1830. convert: iCCP: known incorrect sRGB profile `./Swift/resources/icons/certificate.png' @ warning/png.c/MagickPNGWarningHandler/1830. convert: cHRM: invalid chromaticities `./Swift/resources/icons/certificate.png' @ warning/png.c/MagickPNGWarningHandler/1830. convert: iCCP: known incorrect sRGB profile `./Swift/resources/themes/Default/Incoming/buddy_icon.png' @ warning/png.c/MagickPNGWarningHandler/1830. convert: iCCP: known incorrect sRGB profile `./Swift/resources/themes/Default/Outgoing/buddy_icon.png' @ warning/png.c/MagickPNGWarningHandler/1830. convert: iCCP: profile 'Photoshop ICC profile': 'RGB ': RGB color space not permitted on grayscale PNG `./Swift/resources/logo/logo-chat-100.png' @ warning/png.c/MagickPNGWarningHandler/1830. convert: iCCP: profile 'Photoshop ICC profile': 'RGB ': RGB color space not permitted on grayscale PNG `./Swift/resources/logo/logo-chat-16.png' @ warning/png.c/MagickPNGWarningHandler/1830. And following on Ubuntu 13.10 with libpng12-dev 1.2.49-4ubuntu1 and imagemagick 8:6.7.7.10-5ubuntu3: convert.im6: Ignoring attempt to set cHRM RGB triangle with zero area `./Swift/resources/icons/certificate.png' @ warning/png.c/MagickPNGWarningHandler/1754. Change-Id: Ic8689f220c1863ec9b3dfa7686633e707d253317 License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
2013-08-15Getting rid of "-Wobjc-interface-ivars" warnings from clang.Tobias Markmann
Move instance variables to implementation because they are deprecated to have in the interface. Requires 'Modern' obj-c runtime. Change-Id: I60d693b7966e08ccc003818ab51ea3633c90ae17 License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
2013-01-13Fix more warnings.Remko Tronçon
Fix sign conversion warnings. Removing heavy unnecessary includes. Change-Id: I992f43065498823098a875badb020c7c84fc4797
2013-01-01Fix Objective-C memory leaks.Remko Tronçon
Change-Id: I62206d3813e8873f027ff46e525a30bcb2e945c9
2012-12-23Fix Cocoa-Boost conflict.Remko Tronçon
This one only seems to appear when using CLang. Change-Id: Ib12fbeb3da0dfb54aef0613c7b9eba577654cd6a
2012-06-17Remove some unused private variables.Remko Tronçon
2012-06-05Added ICU support.Remko Tronçon
2012-03-20boost::shared_ptr<?>(new ?(...)) -> boost::make_shared<?>(...) ↵Tobias Markmann
transformation where possible. License: This patch is BSD-licensed, see http://www.opensource.org/licenses/bsd-license.php
2011-10-07Hoist XML parser factory creation out of Swiften.Remko Tronçon
2011-07-03Implement TableRoster with roster diff.Remko Tronçon
2011-06-18Merge branch 'swift-1.x'Remko Tronçon
* swift-1.x: Fixed compilation of Slimber/Qt. Fixed flag order in Slimber. MergeFlags->UseFlags in Slimber. Use UseFlags for compiling the unit test.
2011-06-18Fixed compilation of Slimber/Qt.Remko Tronçon
2011-06-18Fixed flag order in Slimber.Remko Tronçon
2011-06-18MergeFlags->UseFlags in Slimber.Remko Tronçon
2011-06-18Merge branch 'swift-1.x'Remko Tronçon
* swift-1.x: Moving unused server code out of Swiften into Limber. Conflicts: Limber/Server/ServerFromClientSession.cpp Limber/Server/ServerSession.cpp Limber/Server/ServerStanzaRouter.cpp Limber/Server/SimpleUserRegistry.cpp Limber/Server/SimpleUserRegistry.h Limber/Server/UnitTest/ServerStanzaRouterTest.cpp Limber/Server/UserRegistry.cpp Limber/main.cpp Slimber/Server.cpp Slimber/Server.h
2011-06-18Moving unused server code out of Swiften into Limber.Remko Tronçon
2011-06-13Added CppCheck script.Remko Tronçon
Tweaked the sources to satisfy cppcheck.
2011-05-18Introduce safe containers for storing passwords.Remko Tronçon
2011-05-10Fix buildKevin Smith
2011-05-05Replace ByteArray by typedef.Remko Tronçon
2011-05-02Replace auto_ptr by shared_ptr.Remko Tronçon
2011-04-30Replace #include "" by #include <> in SwifTools, Swiftob, Slimber and Limber.Remko Tronçon
2011-04-18Added RFC5122 XMPP URI parsing and basic handling.Remko Tronçon
URI Handling currently only works on Mac OS X.
2011-04-18Cleaned up includes.swift-2.0alphaRemko Tronçon
2011-03-12Make ByteArray an std::vector<unsigned char>.Remko Tronçon
2011-02-19Make Swift translatable.Remko Tronçon
2011-02-16Fixed slimber compilation.Remko Tronçon
2011-02-14Removed Swift::String.Remko Tronçon
2011-01-26Make boost io_service a shared object.Remko Tronçon
This should avoid problems when destroying an event loop containing timer or network events, after the network factory (and io_service object) has disappeared (i.e. at shutdown).
2010-10-27Fixed Linux compilation.Remko Tronçon
2010-10-27Remove MainEventLoop singleton.Remko Tronçon
The event loop now needs to be explicitly passed to clients using it.
2010-10-24Added more missing platform link libraries.Remko Tronçon
2010-10-24Added missing platform link flags.Remko Tronçon
2010-10-09Moved Application from Swiften into SwifTools.Remko Tronçon
2010-09-06Partial VCard support without losing unknown data.Remko Tronçon
2010-08-20Comply to FreeDesktop.org standard for storing data files.Remko Tronçon
Resolves: #526
2010-08-20Fix Slimber build.Remko Tronçon
2010-08-19Fixed compilation on OS X.Remko Tronçon
2010-06-18Fix crash on reconnect.Remko Tronçon
BoostTimer isn't supposed to be constructed as a non-shared-ptr. Making constructor private to avoid this error in the future.
2010-06-09Fixed compilation warningns for Linux build.Remko Tronçon
2010-06-09Enabled & fixed some more C++ warnings.Remko Tronçon
2010-06-03Use SASL EXTERNAL for authenticating in Slimber.Remko Tronçon