diff -Nru kadu-3.0/ChangeLog kadu-4.1/ChangeLog --- kadu-3.0/ChangeLog 2016-02-12 22:49:34.000000000 +0000 +++ kadu-4.1/ChangeLog 2016-10-30 22:53:55.000000000 +0000 @@ -1,3 +1,47 @@ ++++ version 4.1: +* pcspeaker: #3111 fixed: usage of __useconds_t type removed (Vogel) +* gui: #3109 fixed: crash in confiuguration window when selecting advanced chat options (Vogel) +* chat: #3108 fixed: invisible messasge when using Kadu chat renderer (Vogel) +* windows: #3112 fixed: open-chat-with may not work, depending on Windows GPU drivers (Vogel) +* notify: #3113 fixed: silent mode configuration option is lost after close (Vogel) + ++++ version 4.0: +* jabber: #3106 fixed: adding existing gtalk account results in crash (Vogel) +* windows: #3070 fixed: Open Chat With work on Windows (Vogel) + ++++ version 4.0-rc1: +* tabs: #3046 fixed: crash when switching between tabs and single_window (Vogel) +* translations: #3069 fixed: issues with menu translations (Vogel) +* history: #3092 fixed: crash in history window (Vogel) +* chat: #3091 fixed: keep indentation in messages (Vogel) +* gadu: #3101 fixed: save URL of received files in history (Vogel) +* chat: #3100 fixed: copying emoticons from chat view now works (Vogel) + ++++ version 4.0-beta2 +* gadu: #3072 fixed: always use encryption when available (Vogel) +* gadu: #2747 implemented: synchronize multi-session statuses (Vogel) +* sms: #3067 fixed: sending SMS messages to Orange (Vogel) +* windows: #2966 implemented: add recent conversation to task items of taskbar for Windows (Vogel) + ++++ version 4.0-beta1 +* chat: #3081 fixed: properly load conferences from configuration (Vogel) +* jabber: #3082 fixed: do not crash when accepting SSL certificate after some time (Vogel) +* windows: #2967 implemented: add status buttons to windows thumbnail toolbar (Vogel) + ++++ version 4.0-alpha1 +* amarok1_mediaplayer: plugin removed (Vogel) +* encryption_ng: plugin removed (Vogel) +* encryption_ng_simlite: plugin removed (Vogel) +* growl_notify: plugin removed (Vogel) +* history_migration: plugin removed (Vogel) +* itunes_mediaplayer: plugin removed (Vogel) +* profiles_import: plugin removed (Vogel) +* phonon_sound: plugin removed (Vogel) +* falf_mediaplayer: plugin removed (Vogel) +* hints: plugin simplified (Vogel) +* configuration: removed compatibility with 0.6.5 configuration files (Vogel) +* gadu: #3068 fixed: send gift action removed (Vogel) + +++ version 3.0 * chat-style: #3057 fixed: all chat styles work again (Vogel) * jabber: #3064 fixed: re-enable legacy SSL connection option (Vogel) diff -Nru kadu-3.0/cmake/KaduMacros.cmake kadu-4.1/cmake/KaduMacros.cmake --- kadu-3.0/cmake/KaduMacros.cmake 2016-02-12 22:49:34.000000000 +0000 +++ kadu-4.1/cmake/KaduMacros.cmake 2016-10-30 22:53:55.000000000 +0000 @@ -23,18 +23,27 @@ # libraries # TODO: support cmake parameters for this find_package (Qt5Core 5.2 REQUIRED) +find_package (Qt5Gui REQUIRED) find_package (Qt5LinguistTools REQUIRED) +find_package (Qt5Network REQUIRED) +find_package (Qt5Qml REQUIRED) +find_package (Qt5Quick REQUIRED) +find_package (Qt5QuickWidgets REQUIRED) +find_package (Qt5WebKit REQUIRED) +find_package (Qt5WebKitWidgets REQUIRED) +find_package (Qt5Widgets REQUIRED) +find_package (Qt5Xml REQUIRED) if (UNIX AND NOT APPLE) find_package (Qt5X11Extras REQUIRED) endif () include (FindPkgConfig) -pkg_check_modules (INJEQT REQUIRED injeqt>=1.0.0) +pkg_check_modules (INJEQT REQUIRED injeqt>=1.1) include_directories (${INJEQT_INCLUDEDIR}) link_directories (${INJEQT_LIBRARY_DIRS}) -set (CMAKE_CXX_FLAGS "-Woverloaded-virtual -Wnon-virtual-dtor -std=c++0x ${CMAKE_CXX_FLAGS}") +set (CMAKE_CXX_FLAGS "-Woverloaded-virtual -Wnon-virtual-dtor -std=c++14 ${CMAKE_CXX_FLAGS}") if (NOT WIN32) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") @@ -107,7 +116,6 @@ function (kadu_plugin KADU_PLUGIN_NAME) set (_multi_value_keywords PLUGIN_SOURCES - PLUGIN_MOC_SOURCES PLUGIN_CONFIGURATION_FILES PLUGIN_DATA_FILES PLUGIN_DATA_DIRECTORIES @@ -143,7 +151,7 @@ DESTINATION ${KADU_INSTALL_PLUGINS_DATA_DIR} ) - add_library (${KADU_PLUGIN_NAME} SHARED ${KADU_PLUGIN_SOURCES} ${KADU_PLUGIN_MOC_SOURCES}) + add_library (${KADU_PLUGIN_NAME} SHARED ${KADU_PLUGIN_SOURCES}) kadu_set_flags (${KADU_PLUGIN_NAME}) set_property (TARGET ${KADU_PLUGIN_NAME} PROPERTY AUTOMOC ON) set_property (TARGET ${KADU_PLUGIN_NAME} APPEND PROPERTY INCLUDE_DIRECTORIES diff -Nru kadu-3.0/cmake/Modules/FindQCA2.cmake kadu-4.1/cmake/Modules/FindQCA2.cmake --- kadu-3.0/cmake/Modules/FindQCA2.cmake 2016-02-12 22:49:34.000000000 +0000 +++ kadu-4.1/cmake/Modules/FindQCA2.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,50 +0,0 @@ -# - Try to find QCA2 (Qt Cryptography Architecture 2) -# Once done this will define -# -# QCA2_FOUND - system has QCA2 -# QCA2_INCLUDE_DIR - the QCA2 include directory -# QCA2_LIBRARIES - the libraries needed to use QCA2 -# QCA2_DEFINITIONS - Compiler switches required for using QCA2 -# -# use pkg-config to get the directories and then use these values -# in the FIND_PATH() and FIND_LIBRARY() calls - -# Copyright (c) 2006, Michael Larouche, -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -include(FindLibraryWithDebug) - -if (QCA2_INCLUDE_DIR AND QCA2_LIBRARIES) - - # in cache already - set(QCA2_FOUND TRUE) - -else (QCA2_INCLUDE_DIR AND QCA2_LIBRARIES) - - set (QCA_QCA_NAME qca-qt5) - set (QCA_QCA2_NAME qca2-qt5) - - if (NOT WIN32) - find_package(PkgConfig) - pkg_check_modules(PC_QCA2 QUIET ${QCA_QCA2_NAME}) - set(QCA2_DEFINITIONS ${PC_QCA2_CFLAGS_OTHER}) - endif (NOT WIN32) - - find_library_with_debug(QCA2_LIBRARIES - WIN32_DEBUG_POSTFIX d - NAMES ${QCA_QCA_NAME} ${QCA_QCA2_NAME} - HINTS ${PC_QCA2_LIBDIR} ${PC_QCA2_LIBRARY_DIRS} - ) - - find_path(QCA2_INCLUDE_DIR QtCrypto - HINTS ${PC_QCA2_INCLUDEDIR} ${PC_QCA2_INCLUDE_DIRS} - PATH_SUFFIXES QtCrypto) - - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(QCA2 DEFAULT_MSG QCA2_LIBRARIES QCA2_INCLUDE_DIR) - - mark_as_advanced(QCA2_INCLUDE_DIR QCA2_LIBRARIES) - -endif (QCA2_INCLUDE_DIR AND QCA2_LIBRARIES) diff -Nru kadu-3.0/CMakeLists.txt kadu-4.1/CMakeLists.txt --- kadu-3.0/CMakeLists.txt 2016-02-12 22:49:34.000000000 +0000 +++ kadu-4.1/CMakeLists.txt 2016-10-30 22:53:55.000000000 +0000 @@ -6,7 +6,6 @@ option (ENABLE_DEVELOPER_BUILD "Turn on some features helpful during development process (has nothing to do with debugging symbols)" OFF) option (INSTALL_SDK "Install SDK (API headers, CMake modules, MSVC program libraries)" ON) -option (BUILD_TESTING "Build the test suite." "${ENABLE_DEVELOPER_BUILD}") option (WINDOWS_ARCHITECTURE "Architecture for Windows binaries." "x86") # Global CMake variables @@ -26,12 +25,10 @@ set (CMAKE_BUILD_TYPE "${default}" CACHE STRING "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE) endif () -# C++11 support, warnings and other flags +# C++14 support, warnings and other flags -set (DEFINITIONS QT_USE_QSTRINGBUILDER QT_NO_CAST_TO_ASCII QT_DISABLE_DEPRECATED_BEFORE=0x040900) -if (BUILD_TESTING) - list (APPEND DEFINITIONS KADU_EXPORT_TESTS) -endif () +set (DEFINITIONS QT_NO_CAST_TO_ASCII QT_DISABLE_DEPRECATED_BEFORE=0x040900) +list (APPEND DEFINITIONS KADU_EXPORT_TESTS) set (DEFINITIONS_DEBUG DEBUG_ENABLED DEBUG_OUTPUT_ENABLED) if (MSVC) @@ -40,17 +37,14 @@ else () set (COMMON_COMPILE_FLAGS "-Wall -Wextra -Wundef -Wunused -Wuninitialized -Wcast-align -Wpointer-arith -fno-common") set (C_FLAGS "-Wwrite-strings") - set (CXX_FLAGS "-Woverloaded-virtual -Wnon-virtual-dtor -std=c++0x") - set (CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}") + set (CXX_FLAGS "-Woverloaded-virtual -Wnon-virtual-dtor -std=c++14 ${CXX_FLAGS}") + set (CMAKE_CXX_FLAGS "-std=c++14 ${CMAKE_CXX_FLAGS}") if (NOT WIN32) set (COMMON_COMPILE_FLAGS "${COMMON_COMPILE_FLAGS} -fvisibility=hidden") set (CXX_FLAGS "${CXX_FLAGS} -fvisibility-inlines-hidden") endif () - # Qt 4.8.5 cannot detect Clang's C++11 features, it depends on - # detected GCC version, anc Clang mimics GCC 4.2.1. Let's mimic - # GCC 4.8.1. if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") set (COMMON_COMPILE_FLAGS "${COMMON_COMPILE_FLAGS} -U__GNUC_MINOR__ -D__GNUC_MINOR__=8") endif () @@ -81,6 +75,13 @@ endif () endif () +## CCache is cool stuff to improve compilation time +find_program (CCACHE_FOUND ccache) +if (CCACHE_FOUND) + set_property (GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) + set_property (GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) +endif (CCACHE_FOUND) + # Look above, DEBUG_ENABLED is always enabled in Debug configuration. # Enable it in all configurations when ENABLE_DEVELOPER_BUILD is on. if (ENABLE_DEVELOPER_BUILD) @@ -129,6 +130,64 @@ set (KADU_PRERELEASE TRUE) endif () +# if ((NOT DEFINED NETWORK_IMPLEMENTATION AND NOT Qt5Core_FOUND) OR "${NETWORK_IMPLEMENTATION}" STREQUAL "ntrack") +# find_package (QNtrack 010) +# endif () + +if (NOT DEFINED NETWORK_IMPLEMENTATION) +# if (QNTRACK_FOUND) +# message (STATUS "No NETWORK_IMPLEMENTATION defined. Autodetected implementation: ntrack") +# set (NETWORK_IMPLEMENTATION "ntrack") +# else () + message (STATUS "No NETWORK_IMPLEMENTATION defined. Autodetected implementation: Qt") + set (NETWORK_IMPLEMENTATION "Qt") +# endif () +endif () + +set (NETWORK_IMPLEMENTATION "${NETWORK_IMPLEMENTATION}" CACHE STRING "Select network-aware implementation (Qt/ntrack/dummy)" FORCE) + +if ("${NETWORK_IMPLEMENTATION}" STREQUAL "ntrack") + list (APPEND ADDITIONAL_LIBKADU_LIBRARIES ${QNTRACK_LIBRARIES}) +endif () +# The rest of NETWORK_IMPLEMENTATION stuff is handled in network/CMakeLists.txt. + +# injeqt +find_package (PkgConfig) +pkg_check_modules (INJEQT REQUIRED injeqt>=1.1) +set (INJEQT_DEFINITIONS ${INJEQT_CFLAGS_OTHER}) +include_directories (${INJEQT_INCLUDEDIR}) +link_directories (${INJEQT_LIBRARY_DIRS}) + +list (APPEND ADDITIONAL_LIBKADU_LIBRARIES ${INJEQT_LIBRARIES}) +list (APPEND ADDITIONAL_LIBRARIES ${INJEQT_LIBRARIES}) + +# Tests +find_package (Qt5Test REQUIRED) + +function (kadu_add_plugin_test plugin_name name_) + set (test_file "${name_}.test") + string (REPLACE "/" "-" test_name ${test_file}) + list (APPEND UNIT_TEST_TARGETS ${test_name} PARENT_SCOPE) + + add_executable (${test_name} "${test_file}.cpp") + kadu_set_flags (${test_name}) + if (NOT MSVC) + set_property (TARGET ${test_name} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-error") + endif () + add_test ( + NAME ${test_name} + COMMAND ${test_name}) + + qt5_use_modules (${test_name} LINK_PRIVATE Core Gui Network Qml Quick QuickWidgets Test WebKit WebKitWidgets Widgets Xml) + + # Add libkadu after the plugin so that --as-needed won't drop anything + target_link_libraries (${test_name} LINK_PRIVATE libkadu ${plugin_name} ${ADDITIONAL_LIBRARIES}) +endfunction () + +function (kadu_add_test name_) + kadu_add_plugin_test ("" "${name_}") +endfunction () + # Installation paths. set (INSTALL_SDK_DIR "" CACHE PATH "SDK installation root") @@ -261,19 +320,16 @@ include_directories (${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/kadu-core) +enable_testing () + add_subdirectory (kadu-core) add_subdirectory (varia) add_subdirectory (translations) include (Plugins.cmake) add_subdirectory (plugins) - -if (BUILD_TESTING) - enable_testing () - add_subdirectory (tests) -endif () - add_subdirectory (kthxbye) +add_subdirectory (tests) # Now write KaduConfig for installation. if (UNIX) diff -Nru kadu-3.0/debian/build_kadu.sh kadu-4.1/debian/build_kadu.sh --- kadu-3.0/debian/build_kadu.sh 2016-04-15 08:08:05.000000000 +0000 +++ kadu-4.1/debian/build_kadu.sh 2016-11-28 08:15:45.000000000 +0000 @@ -9,35 +9,13 @@ version=$(head -1 debian/changelog | awk '{printf $2}' | cut -b2-$n) upstream_version=$(echo $version | awk -F "-" '{printf $1}') debian_revision=$(echo $version | awk -F "-" '{printf $2}') -version_override="no" - -if [ $# = 1 ]; then - # In case a branch name cannot contain a version (e.g. 3.0~rc1 -- no "~" - # allowed as part of branch name, it's possible to override branch name with - # first argument, but then passing "-S" won't work. - upstream_version=$1 - version_override="yes" -fi git clean -d -f -x git reset --hard git co ${upstream_version}/upstream-kadu git br -D ${upstream_version}/master || true git co -b ${upstream_version}/master ${upstream_version}/upstream-kadu -git merge -m "Merging ${upstream_version}/upstream-themes ${upstream_version}/debian" \ - ${upstream_version}/upstream-themes ${upstream_version}/debian - -if [ "$debian_revision" = 1 ]; then - # Generate orig-externalthemes.tar.bz2, but only if it's first - # Debian revision for particular upstream version - tar c externalthemes | bzip2 -9 > ../kadu_$upstream_version.orig-externalthemes.tar.bz2 - tar c externalplugins | bzip2 -9 > ../kadu_$upstream_version.orig-externalplugins.tar.bz2 -fi +git merge -m "Merging ${upstream_version}/debian" ${upstream_version}/debian -if [ "$version_override" = "no" ]; then - debuild -us -uc -I.git $@ -else - echo "Now execute:" - echo "debuild -us -uc -I.git" -fi +debuild -us -uc -I.git $@ diff -Nru kadu-3.0/debian/changelog kadu-4.1/debian/changelog --- kadu-3.0/debian/changelog 2016-06-15 18:12:46.000000000 +0000 +++ kadu-4.1/debian/changelog 2016-11-28 08:15:45.000000000 +0000 @@ -1,3 +1,18 @@ +kadu (4.1-1) unstable; urgency=medium + + * New upstream release. (Closes: #841787) + * Added debian/patches/04-fix_compilation_error_c++14_vs_gnu++11.patch + * Updated debian/patches/02-about-dialog.patch + * Removed qtquick1-5-dev from Build-Depends + * Removed debian/handle_external.sh + * Removed debian/patches/01-external-themes.patch + * Cleaned up debian/*.install + * Updated debian/build_kadu.sh + * Added debian/patches/05-no_tests_during_build.patch + * Removed debian/README.Debian + + -- Patryk Cisek Mon, 28 Nov 2016 09:15:45 +0100 + kadu (3.0-1.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru kadu-3.0/debian/control kadu-4.1/debian/control --- kadu-3.0/debian/control 2016-06-11 22:22:38.000000000 +0000 +++ kadu-4.1/debian/control 2016-11-28 08:15:45.000000000 +0000 @@ -55,8 +55,8 @@ ${misc:Depends}, ${shlibs:Depends} Breaks: kadu-external-modules (<< 1.0) -Replaces: kadu-external-modules (<< 1.0) Suggests: kadu-themes +Replaces: kadu-external-modules (<< 1.0) Description: Gadu-Gadu/XMPP client for X11 Gadu-Gadu is a Windows instant messenger, very popular in Poland. Kadu is a Qt5 client of Gadu-Gadu and XMPP for *nix systems. @@ -78,7 +78,6 @@ Architecture: all Depends: ${misc:Depends}, ${shlibs:Depends} Breaks: kadu-external-modules (<< 0.10.0-2) -Suggests: kadu-themes Description: Gadu-Gadu/XMPP client for X11 Gadu-Gadu is a Windows instant messenger, very popular in Poland. Kadu is a Qt5 client of Gadu-Gadu and XMPP for *nix systems. diff -Nru kadu-3.0/debian/handle_external.sh kadu-4.1/debian/handle_external.sh --- kadu-3.0/debian/handle_external.sh 2016-04-15 08:08:05.000000000 +0000 +++ kadu-4.1/debian/handle_external.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -#! /bin/sh - -if [ "$1" = "copy" ]; then - for i in externalthemes/emoticons/*; do - cp -r $i varia/themes/emoticons - done - for i in externalthemes/sounds/*; do - cp -r $i varia/themes/sounds - done -elif [ "$1" = "remove" ]; then - for i in externalthemes/emoticons/*; do - rm -rf varia/themes/emoticons/${i##*/} - done - for i in externalthemes/sounds/*; do - rm -rf varia/themes/sounds/${i##*/} - done -fi diff -Nru kadu-3.0/debian/kadu-common.install kadu-4.1/debian/kadu-common.install --- kadu-3.0/debian/kadu-common.install 2016-04-15 08:08:05.000000000 +0000 +++ kadu-4.1/debian/kadu-common.install 2016-11-28 08:15:45.000000000 +0000 @@ -15,17 +15,13 @@ debian/tmp/usr/share/kadu/plugins/configuration/autoresponder.ui debian/tmp/usr/share/kadu/plugins/configuration/autostatus.ui debian/tmp/usr/share/kadu/plugins/configuration/cenzor.ui -debian/tmp/usr/share/kadu/plugins/configuration/docking.ui debian/tmp/usr/share/kadu/plugins/configuration/docking-notify.ui +debian/tmp/usr/share/kadu/plugins/configuration/docking.ui debian/tmp/usr/share/kadu/plugins/configuration/emoticons.ui -debian/tmp/usr/share/kadu/plugins/configuration/encryption-ng-simlite.ui debian/tmp/usr/share/kadu/plugins/configuration/ext_sound.ui debian/tmp/usr/share/kadu/plugins/configuration/filedesc.ui debian/tmp/usr/share/kadu/plugins/configuration/firewall.ui debian/tmp/usr/share/kadu/plugins/configuration/freedesktop_notify.ui -debian/tmp/usr/share/kadu/plugins/configuration/hint-over-user.ui -debian/tmp/usr/share/kadu/plugins/configuration/hints-advanced.ui -debian/tmp/usr/share/kadu/plugins/configuration/hints-notifier.ui debian/tmp/usr/share/kadu/plugins/configuration/hints.ui debian/tmp/usr/share/kadu/plugins/configuration/history.ui debian/tmp/usr/share/kadu/plugins/configuration/image-link.ui @@ -52,19 +48,15 @@ debian/tmp/usr/share/kadu/plugins/docking.desc debian/tmp/usr/share/kadu/plugins/docking_notify.desc debian/tmp/usr/share/kadu/plugins/emoticons.desc -debian/tmp/usr/share/kadu/plugins/encryption_ng.desc -debian/tmp/usr/share/kadu/plugins/encryption_ng_simlite.desc debian/tmp/usr/share/kadu/plugins/encryption_otr.desc debian/tmp/usr/share/kadu/plugins/exec_notify.desc debian/tmp/usr/share/kadu/plugins/ext_sound.desc -debian/tmp/usr/share/kadu/plugins/falf_mediaplayer.desc debian/tmp/usr/share/kadu/plugins/filedesc.desc debian/tmp/usr/share/kadu/plugins/firewall.desc debian/tmp/usr/share/kadu/plugins/freedesktop_notify.desc debian/tmp/usr/share/kadu/plugins/gadu_protocol.desc debian/tmp/usr/share/kadu/plugins/hints.desc debian/tmp/usr/share/kadu/plugins/history.desc -debian/tmp/usr/share/kadu/plugins/history_migration.desc debian/tmp/usr/share/kadu/plugins/idle.desc debian/tmp/usr/share/kadu/plugins/imagelink.desc debian/tmp/usr/share/kadu/plugins/jabber_protocol.desc @@ -73,8 +65,6 @@ debian/tmp/usr/share/kadu/plugins/mpd_mediaplayer.desc debian/tmp/usr/share/kadu/plugins/mprisplayer_mediaplayer.desc debian/tmp/usr/share/kadu/plugins/pcspeaker.desc -debian/tmp/usr/share/kadu/plugins/phonon_sound.desc -debian/tmp/usr/share/kadu/plugins/profiles_import.desc debian/tmp/usr/share/kadu/plugins/screenshot.desc debian/tmp/usr/share/kadu/plugins/simpleview.desc debian/tmp/usr/share/kadu/plugins/single_window.desc @@ -85,6 +75,7 @@ debian/tmp/usr/share/kadu/plugins/sql_history.desc debian/tmp/usr/share/kadu/plugins/tabs.desc debian/tmp/usr/share/kadu/plugins/translations +debian/tmp/usr/share/kadu/plugins/windows_integration.desc debian/tmp/usr/share/kadu/plugins/word_fix.desc debian/tmp/usr/share/kadu/qml debian/tmp/usr/share/kadu/scripts diff -Nru kadu-3.0/debian/kadu.docs kadu-4.1/debian/kadu.docs --- kadu-3.0/debian/kadu.docs 2016-04-15 08:08:05.000000000 +0000 +++ kadu-4.1/debian/kadu.docs 2016-11-28 08:15:45.000000000 +0000 @@ -3,4 +3,3 @@ debian/tmp/usr/share/kadu/HISTORY debian/tmp/usr/share/kadu/README debian/tmp/usr/share/kadu/THANKS -debian/README.Debian diff -Nru kadu-3.0/debian/kadu.install kadu-4.1/debian/kadu.install --- kadu-3.0/debian/kadu.install 2016-04-15 08:08:05.000000000 +0000 +++ kadu-4.1/debian/kadu.install 2016-11-28 08:15:45.000000000 +0000 @@ -12,19 +12,15 @@ debian/tmp/usr/lib/*/kadu/plugins/libdocking.so debian/tmp/usr/lib/*/kadu/plugins/libdocking_notify.so debian/tmp/usr/lib/*/kadu/plugins/libemoticons.so -debian/tmp/usr/lib/*/kadu/plugins/libencryption_ng.so -debian/tmp/usr/lib/*/kadu/plugins/libencryption_ng_simlite.so debian/tmp/usr/lib/*/kadu/plugins/libencryption_otr.so debian/tmp/usr/lib/*/kadu/plugins/libexec_notify.so debian/tmp/usr/lib/*/kadu/plugins/libext_sound.so -debian/tmp/usr/lib/*/kadu/plugins/libfalf_mediaplayer.so debian/tmp/usr/lib/*/kadu/plugins/libfiledesc.so debian/tmp/usr/lib/*/kadu/plugins/libfirewall.so debian/tmp/usr/lib/*/kadu/plugins/libfreedesktop_notify.so debian/tmp/usr/lib/*/kadu/plugins/libgadu_protocol.so debian/tmp/usr/lib/*/kadu/plugins/libhints.so debian/tmp/usr/lib/*/kadu/plugins/libhistory.so -debian/tmp/usr/lib/*/kadu/plugins/libhistory_migration.so debian/tmp/usr/lib/*/kadu/plugins/libidle.so debian/tmp/usr/lib/*/kadu/plugins/libimagelink.so debian/tmp/usr/lib/*/kadu/plugins/libjabber_protocol.so @@ -33,8 +29,6 @@ debian/tmp/usr/lib/*/kadu/plugins/libmpd_mediaplayer.so debian/tmp/usr/lib/*/kadu/plugins/libmprisplayer_mediaplayer.so debian/tmp/usr/lib/*/kadu/plugins/libpcspeaker.so -debian/tmp/usr/lib/*/kadu/plugins/libphonon_sound.so -debian/tmp/usr/lib/*/kadu/plugins/libprofiles_import.so debian/tmp/usr/lib/*/kadu/plugins/libscreenshot.so debian/tmp/usr/lib/*/kadu/plugins/libsimpleview.so debian/tmp/usr/lib/*/kadu/plugins/libsingle_window.so @@ -44,4 +38,5 @@ debian/tmp/usr/lib/*/kadu/plugins/libspellchecker.so debian/tmp/usr/lib/*/kadu/plugins/libsql_history.so debian/tmp/usr/lib/*/kadu/plugins/libtabs.so +debian/tmp/usr/lib/*/kadu/plugins/libwindows_integration.so debian/tmp/usr/lib/*/kadu/plugins/libword_fix.so diff -Nru kadu-3.0/debian/kadu-themes.install kadu-4.1/debian/kadu-themes.install --- kadu-3.0/debian/kadu-themes.install 2016-04-15 08:08:05.000000000 +0000 +++ kadu-4.1/debian/kadu-themes.install 2016-11-28 08:15:45.000000000 +0000 @@ -1,9 +1,3 @@ debian/tmp/usr/share/kadu/themes/emoticons/tango debian/tmp/usr/share/kadu/themes/icons/glass debian/tmp/usr/share/kadu/themes/icons/oxygen -debian/tmp/usr/share/kadu/themes/sounds/bns -debian/tmp/usr/share/kadu/themes/sounds/drums -debian/tmp/usr/share/kadu/themes/sounds/florkus -debian/tmp/usr/share/kadu/themes/sounds/michalsrodek -debian/tmp/usr/share/kadu/themes/sounds/percussion -debian/tmp/usr/share/kadu/themes/sounds/ultr diff -Nru kadu-3.0/debian/patches/01-external-themes.patch kadu-4.1/debian/patches/01-external-themes.patch --- kadu-3.0/debian/patches/01-external-themes.patch 2016-04-15 08:08:05.000000000 +0000 +++ kadu-4.1/debian/patches/01-external-themes.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -Description: Selects all usable external themes - Kadu has a nice set of external (submitted by 3rd parties) themes and - plugins. - . - This patch makes all usable external themes to be installed -Author: Patryk Cisek ---- -diff --git a/varia/themes/sounds/CMakeLists.txt b/varia/themes/sounds/CMakeLists.txt -index 51b567a..fcb3e4e 100644 ---- a/varia/themes/sounds/CMakeLists.txt -+++ b/varia/themes/sounds/CMakeLists.txt -@@ -1,5 +1,11 @@ - set (SOUND_THEMES - default -+ bns -+ drums -+ florkus -+ michalsrodek -+ percussion -+ ultr - ) - - if (SOUND_THEMES) diff -Nru kadu-3.0/debian/patches/02-about-dialog.patch kadu-4.1/debian/patches/02-about-dialog.patch --- kadu-3.0/debian/patches/02-about-dialog.patch 2016-04-15 08:08:05.000000000 +0000 +++ kadu-4.1/debian/patches/02-about-dialog.patch 2016-11-28 08:15:45.000000000 +0000 @@ -14,10 +14,10 @@ Author: Patryk Cisek --- diff --git a/kadu-core/gui/windows/about.cpp b/kadu-core/gui/windows/about.cpp -index 0376ab8..ba975ef 100644 +index 74f5b85..3a7055e 100644 --- a/kadu-core/gui/windows/about.cpp +++ b/kadu-core/gui/windows/about.cpp -@@ -158,7 +158,7 @@ About::About(QWidget *parent) : +@@ -179,7 +179,7 @@ void About::init() tb_changelog->setOpenLinks(false); tb_changelog->setFrameStyle(QFrame::NoFrame); tb_changelog->viewport()->setAutoFillBackground(false); @@ -26,38 +26,23 @@ changelog.replace('\n', "
"); // #bug_no -> Redmine URL changelog.replace(QRegExp("#(\\d+)"), "#\\1"); -@@ -235,11 +235,19 @@ void About::keyPressEvent(QKeyEvent *event) - QWidget::keyPressEvent(event); - } - --QString About::loadFile(const QString &name) -+QString About::loadFile(QString name) +@@ -258,8 +258,17 @@ void About::keyPressEvent(QKeyEvent *event) + QString About::loadFile(const QString &name) { kdebugf(); - -- QFile file(Application::instance()->pathsProvider()->dataPath() + name); +- +- QFile file(m_pathsProvider->dataPath() + name); ++ QString fullPathName; ++ + if(name.startsWith("COPYING")) + { -+ name = "/usr/share/common-licenses/GPL-2"; ++ fullPathName = "/usr/share/common-licenses/GPL-2"; + } + else + { -+ name = "/usr/share/doc/kadu/" + name; ++ fullPathName = "/usr/share/doc/kadu/" + name; + } -+ QFile file(name); ++ QFile file(fullPathName); if (!file.open(QIODevice::ReadOnly)) { kdebugm(KDEBUG_ERROR, "About::loadFile(%s) cannot open file\n", qPrintable(name)); -diff --git a/kadu-core/gui/windows/about.h b/kadu-core/gui/windows/about.h -index 06280f2..f881f68 100644 ---- a/kadu-core/gui/windows/about.h -+++ b/kadu-core/gui/windows/about.h -@@ -49,7 +49,7 @@ class About : public QWidget, DesktopAwareObject - { - Q_OBJECT - -- QString loadFile(const QString &name); -+ QString loadFile(QString name); - - private slots: - void openUrl(const QUrl &url); diff -Nru kadu-3.0/debian/patches/04-fix_compilation_error_c++14_vs_gnu++11.patch kadu-4.1/debian/patches/04-fix_compilation_error_c++14_vs_gnu++11.patch --- kadu-3.0/debian/patches/04-fix_compilation_error_c++14_vs_gnu++11.patch 1970-01-01 00:00:00.000000000 +0000 +++ kadu-4.1/debian/patches/04-fix_compilation_error_c++14_vs_gnu++11.patch 2016-11-28 08:15:45.000000000 +0000 @@ -0,0 +1,22 @@ +Description: Fixed compilation error caused by coliding + -std=c++14 and -std=gnu++11 +Author: Patryk Cisek +--- +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c8718de..e5cd430 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -37,8 +37,8 @@ if (MSVC) + else () + set (COMMON_COMPILE_FLAGS "-Wall -Wextra -Wundef -Wunused -Wuninitialized -Wcast-align -Wpointer-arith -fno-common") + set (C_FLAGS "-Wwrite-strings") +- set (CXX_FLAGS "-Woverloaded-virtual -Wnon-virtual-dtor -std=c++14 ${CXX_FLAGS}") +- set (CMAKE_CXX_FLAGS "-std=c++14 ${CMAKE_CXX_FLAGS}") ++ set (CXX_FLAGS "-Woverloaded-virtual -Wnon-virtual-dtor ${CXX_FLAGS}") ++ set(CMAKE_CXX_STANDARD 14) + + if (NOT WIN32) + set (COMMON_COMPILE_FLAGS "${COMMON_COMPILE_FLAGS} -fvisibility=hidden") +-- +2.10.2 + diff -Nru kadu-3.0/debian/patches/05-no_tests_during_build.patch kadu-4.1/debian/patches/05-no_tests_during_build.patch --- kadu-3.0/debian/patches/05-no_tests_during_build.patch 1970-01-01 00:00:00.000000000 +0000 +++ kadu-4.1/debian/patches/05-no_tests_during_build.patch 2016-11-28 08:15:45.000000000 +0000 @@ -0,0 +1,15 @@ +Description: No tests running during the Debian build +Author: Patryk Cisek +--- +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e5cd430..f606ed8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -329,7 +329,6 @@ add_subdirectory (translations) + include (Plugins.cmake) + add_subdirectory (plugins) + add_subdirectory (kthxbye) +-add_subdirectory (tests) + + # Now write KaduConfig for installation. + if (UNIX) diff -Nru kadu-3.0/debian/patches/series kadu-4.1/debian/patches/series --- kadu-3.0/debian/patches/series 2016-04-15 08:08:05.000000000 +0000 +++ kadu-4.1/debian/patches/series 2016-11-28 08:15:45.000000000 +0000 @@ -1,3 +1,4 @@ -01-external-themes.patch 02-about-dialog.patch 03-exclude_unsupported_plugins.patch +04-fix_compilation_error_c++14_vs_gnu++11.patch +05-no_tests_during_build.patch diff -Nru kadu-3.0/debian/README.Debian kadu-4.1/debian/README.Debian --- kadu-3.0/debian/README.Debian 2016-04-15 08:08:05.000000000 +0000 +++ kadu-4.1/debian/README.Debian 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -Kadu for Debian ---------------- - -When compiling Kadu from sources we are able to select which plugins we want -to compile by editing .config file located in Kadu's source tree. This file is -than parsed during cmake run. Some of these plugins are located in Kadu's -source tree, and some (the ones not officially included, or developed by -external developers) are not. - -These external plugins are downloaded during cmake run, than compiled (when -executing make) and finally installed (when executing make install). In Debian -these plugins are in kadu-external-plugins package. - -Currently we have following external plugins plugins: -* AnonymousCheck: - Adds ability to automatically search for a contact in public directory in - case the interlocutor is not on our contact list. - Previously part of PowerKadu. Now it's separate plugin. - -* GlobalHotKeys: - Adds global hotkeys support to Kadu. - -* LEDNotify: - Notification by Scroll Lock LED. - -* MimeTeX: - Adds ability to send gif images containing mathematical formulas easily - edited by built-in graphical editor. - -* NextInfo: - Adds additional information about contacts. - -* PanelKadu: - Turns Kadu's main window into a desktop panel. - -* SentHistory: - Adds history of sent messages to chat windows. - - -- Patryk Cisek Mon, 21 Feb 2011 11:17:54 +0100 diff -Nru kadu-3.0/debian/rules kadu-4.1/debian/rules --- kadu-3.0/debian/rules 2016-06-11 14:53:55.000000000 +0000 +++ kadu-4.1/debian/rules 2016-11-28 08:15:45.000000000 +0000 @@ -23,7 +23,6 @@ dh_testdir mkdir $(BUILD_DIR) find . -name '*.o' -delete - bash debian/handle_external.sh copy cd $(BUILD_DIR) && cmake -DCMAKE_C_FLAGS="$(CFLAGS)" -DCMAKE_CXX_FLAGS="$(CXXFLAGS) $(CPPFLAGS)" -DCMAKE_EXE_LINKER_FLAGS="$(LDFLAGS)" -DCMAKE_SHARED_LINKER_FLAGS="$(LDFLAGS)" -DCMAKE_SKIP_RPATH=False -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr $(PKG_DIR) touch configure-stamp @@ -45,7 +44,6 @@ rm -f build-arch-stamp build-indep-stamp configure-stamp test -d $(BUILD_DIR) && cd $(BUILD_DIR) && $(MAKE) clean || true rm -rf $(BUILD_DIR) - bash debian/handle_external.sh remove dh_clean install: install-indep install-arch @@ -59,7 +57,6 @@ find $(INSTALL_DIR) -name '[lL][iI][cC][eE][nN][sS][eE].txt' -delete # Remove all thumbnails files find $(INSTALL_DIR) -name Thumbs.db -delete - rm -f $(INSTALL_DIR)/usr/share/kadu/themes/sounds/bns/sound.conf~ dh_install -i install-arch: @@ -70,7 +67,6 @@ cd $(BUILD_DIR) && $(MAKE) DESTDIR=$(INSTALL_DIR) install cp $(INSTALL_DIR)/usr/share/kadu/ChangeLog debian/kadu/usr/share/doc/kadu/about-changes-tab.txt # Rmove some cruft - rm -f $(INSTALL_DIR)/usr/share/kadu/modules/data/osd_hints/License # Remove RPATH from all the plugins chrpath -d debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/kadu/plugins/*.so dh_install -s Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/8P.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/8P.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/8P_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/8P_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/beksa.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/beksa.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/beksa_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/beksa_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/bije.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/bije.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/bije_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/bije_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/brawa.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/brawa.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/brawa_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/brawa_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/buja_w_oblokach.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/buja_w_oblokach.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/buja_w_oblokach_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/buja_w_oblokach_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/bukiet.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/bukiet.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/bukiet_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/bukiet_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/chatownik.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/chatownik.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/chatownik_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/chatownik_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/cmok.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/cmok.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/cmok_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/cmok_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/dobani.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/dobani.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/dostal.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/dostal.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/dostal_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/dostal_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/dresiarz.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/dresiarz.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/dresiarz_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/dresiarz_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/drink.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/drink.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/drink_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/drink_na.gif differ diff -Nru kadu-3.0/externalthemes/emoticons/gg6_compatible/1/emots.txt kadu-4.1/externalthemes/emoticons/gg6_compatible/1/emots.txt --- kadu-3.0/externalthemes/emoticons/gg6_compatible/1/emots.txt 2016-04-15 08:08:05.000000000 +0000 +++ kadu-4.1/externalthemes/emoticons/gg6_compatible/1/emots.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,64 +0,0 @@ -(":)",":))",":)))",":))))"),"wesoly.gif","wesoly_na.gif" -(":(",":((",":(((",":((((",":-("),"smutny.gif","smutny_na.gif" -(";)",";))",";)))",";))))"),"mruga.gif","mruga_na.gif" -(":[","","wrrrr!"),"zly.gif","zly_na.gif" -"","z_jezorem.gif","z_jezorem_na.gif" -"","niee"),"niee.gif","niee_na.gif" -("","tiaaa"),"tiaaa.gif","tiaaa_na.gif" -"","zdziwko.gif","zdziwko_na.gif" -"","beksa.gif","beksa_na.gif" -"","lol.gif" -"","rotfl.gif","rotfl_na.gif" -"","wstydnis.gif","wstydnis_na.gif" -"","8P.gif","8P_na.gif" -"","gafa.gif","gafa_na.gif" -"","zab.gif","zab_na.gif" -"","ziew.gif","ziew_na.gif" -"","prysznic.gif","prysznic_na.gif" -"","wanna.gif","wanna_na.gif" -"","wc.gif","wc_na.gif" -"","krecka_dostal.gif","krecka_dostal_na.gif" -"","hmmm.gif","hmmm_na.gif" -"","puknijsie.gif","puknijsie_na.gif" -"","olaboga.gif","olaboga_na.gif" -"","tort.gif","tort_na.gif" -"","bukiet.gif","bukiet_na.gif" -"","szampan.gif","szampan_na.gif" -"","gool.gif","gool_na.gif" -"","cmok.gif","cmok_na.gif" -"","onajego.gif","onajego_na.gif" -"","buja_w_oblokach.gif","buja_w_oblokach_na.gif" -"","zakochany.gif","zakochany_na.gif" -"","pada.gif","pada_na.gif" -"","okularnik.gif","okularnik_na.gif" -"<śnieg>","snieg.gif","snieg_na.gif" -"<śpioch>","spioch.gif","spioch_na.gif" -"","je_pizze.gif","je_pizze_na.gif" -"","piwko2.gif","piwko2_na.gif" -"","drink.gif","drink_na.gif" -"","obiad.gif","obiad_na.gif" -"","telefon.gif","telefon_na.gif" -"","gazeta.gif","gazeta_na.gif" -"","chatownik.gif","chatownik_na.gif" -"","gra.gif","gra_na.gif" -"","bije.gif","bije_na.gif" -"","dresiarz.gif","dresiarz_na.gif" -"","dostal.gif","dostal_na.gif" -"","palacz.gif","palacz_na.gif" -"","nonono.gif","nonono_na.gif" -"","brawa.gif","brawa_na.gif" -"","heej.gif","heej_na.gif" -"","fuck.gif","fuck_na.gif" -"","dobani.gif" -"","ok.gif" -"","papa.gif","papa_na.gif" -"","serducho.gif","serducho_na.gif" -"","zegar.gif","zegar_na.gif" -"","Jablko.gif" -"","kawa.gif" -"","kwiatek.gif" -"","prezent.gif" -"","serce.gif" -"","milosc.gif" -"","usta.gif" Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/fuck.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/fuck.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/fuck_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/fuck_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/gafa.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/gafa.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/gafa_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/gafa_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/gazeta.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/gazeta.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/gazeta_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/gazeta_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/gool.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/gool.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/gool_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/gool_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/gra.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/gra.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/gra_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/gra_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/heej.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/heej.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/heej_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/heej_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/hmmm.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/hmmm.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/hmmm_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/hmmm_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/jablko.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/jablko.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/je_pizze.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/je_pizze.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/je_pizze_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/je_pizze_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/kawa.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/kawa.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/krecka_dostal.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/krecka_dostal.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/krecka_dostal_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/krecka_dostal_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/kwiatek.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/kwiatek.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/lol.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/lol.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/milosc.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/milosc.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/mruga.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/mruga.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/mruga_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/mruga_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/mutny.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/mutny.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/niee.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/niee.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/niee_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/niee_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/nonono.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/nonono.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/nonono_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/nonono_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/obiad.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/obiad.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/obiad_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/obiad_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/ok.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/ok.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/okularnik.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/okularnik.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/okularnik_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/okularnik_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/olaboga.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/olaboga.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/olaboga_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/olaboga_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/onajego.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/onajego.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/onajego_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/onajego_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/pada.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/pada.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/pada_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/pada_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/palacz.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/palacz.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/palacz_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/palacz_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/papa.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/papa.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/papa_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/papa_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/piwko2.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/piwko2.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/piwko2_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/piwko2_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/prezent.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/prezent.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/prysznic.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/prysznic.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/prysznic_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/prysznic_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/puknijsie.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/puknijsie.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/puknijsie_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/puknijsie_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/rotfl.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/rotfl.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/rotfl_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/rotfl_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/serce.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/serce.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/serducho.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/serducho.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/serducho_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/serducho_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/smutny.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/smutny.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/smutny_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/smutny_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/snieg.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/snieg.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/snieg_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/snieg_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/spioch.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/spioch.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/spioch_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/spioch_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/szampan.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/szampan.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/szampan_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/szampan_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/telefon.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/telefon.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/telefon_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/telefon_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/tiaaa.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/tiaaa.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/tiaaa_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/tiaaa_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/tort.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/tort.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/tort_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/tort_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/usta.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/usta.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/wanna.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/wanna.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/wanna_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/wanna_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/wc.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/wc.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/wc_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/wc_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/wesoly.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/wesoly.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/wesoly_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/wesoly_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/winko.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/winko.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/wstydnis.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/wstydnis.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/wstydnis_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/wstydnis_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/zab.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/zab.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/zab_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/zab_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/zakochany.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/zakochany.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/zakochany_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/zakochany_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/zdziwko.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/zdziwko.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/zdziwko_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/zdziwko_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/zegar.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/zegar.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/zegar_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/zegar_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/ziew.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/ziew.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/ziew_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/ziew_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/z_jezorem.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/z_jezorem.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/z_jezorem_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/z_jezorem_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/zly.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/zly.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/zly_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/zly_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/1/zniesmaczony.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/1/zniesmaczony.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/3m_sie.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/3m_sie.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/3m_sie_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/3m_sie_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/aniolek.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/aniolek.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/aniolek_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/aniolek_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/boje_sie.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/boje_sie.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/boje_sie_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/boje_sie_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/boks.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/boks.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/boks_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/boks_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/calus.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/calus.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/calus_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/calus_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/cfaniak.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/cfaniak.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/cfaniak_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/cfaniak_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/chytry.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/chytry.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/chytry_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/chytry_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/cisza.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/cisza.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/cisza_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/cisza_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/cmok.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/cmok.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/cmok_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/cmok_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/co.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/co.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/co_jest.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/co_jest.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/co_jest_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/co_jest_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/co_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/co_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/czarodziej.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/czarodziej.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/czas.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/czas.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/czas_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/czas_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/czytaj.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/czytaj.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/czytaj_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/czytaj_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/diabelek.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/diabelek.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/diabelek_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/diabelek_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/dupa.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/dupa.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/dupa_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/dupa_na.gif differ diff -Nru kadu-3.0/externalthemes/emoticons/gg6_compatible/2/emots.txt kadu-4.1/externalthemes/emoticons/gg6_compatible/2/emots.txt --- kadu-3.0/externalthemes/emoticons/gg6_compatible/2/emots.txt 2016-04-15 08:08:05.000000000 +0000 +++ kadu-4.1/externalthemes/emoticons/gg6_compatible/2/emots.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,76 +0,0 @@ -(""),"usmiech.gif","usmiech_na.gif" -*(":-)",":-))",":-)))",":-))))",":-)))))",":-))))))",":-)))))))",":-))))))))",":-)))))))))",":-))))))))))",":-))))))))))"),"usmiech2.gif","usmiech2_na.gif" -(""),"smutny.gif","smutny_na.gif" -(""),"oczko.gif","oczko_na.gif" -*(";-)",";-))",";-)))",";-))))",";-)))))",";-))))))",";-)))))))",";-))))))))",";-)))))))))",";-))))))))))"),"oczko2.gif","oczko2_na.gif" -(""),"zly.gif","zly_na.gif" -(":P",":PP",":PPP",":PPPP",":PPPPP",":PPPPPP",":PPPPPPP",":PPPPPPPP",":PPPPPPPPP",":PPPPPPPPPP",":-P",":-PP",":-PPP",":-PPPP",":-PPPPP",":-PPPPPP",":-PPPPPPP",":-PPPPPPPP",":-PPPPPPPPP",":-PPPPPPPPPP"),"jezyk1.gif","jezyk1_na.gif" -(";P",";PP",";PPP",";PPPP",";PPPPP",";PPPPPP",";PPPPPPP",";PPPPPPPP",";PPPPPPPPP",";PPPPPPPPPP",";-P",";-PP",";-PPP",";-PPPP",";-PPPPP",";-PPPPPP",";-PPPPPPP",";-PPPPPPPP",";-PPPPPPPPP",";-PPPPPPPPPP"),"jezyk2.gif","jezyk2_na.gif" -(""),"nie.gif","nie_na.gif" -(""),"ok.gif","ok_na.gif" -*"","ok2.gif","ok2_na.gif" -("!!"),"wykrzyknik.gif","wykrzyknik_na.gif" -("??"),"pytajnik.gif","pytajnik_na.gif" -(";(",";((",";(((",";((((",";(((((",";((((((",";-(",";-((",";-(((",";-((((",";-(((((",""),"placze.gif","placze_na.gif" -(""),"lol.gif","lol_na.gif" -(":D",":-D",";D",";-D"),"zeby.gif","zeby_na.gif" -(""),"rotfl.gif","rotfl_na.gif" -("","",":O",":-O",";O",";-O"),"wow.gif","wow_na.gif" -"","wsciekly.gif","wsciekly_na.gif" -"","zawstydzony.gif","zawstydzony_na.gif" -("",""),"co_jest.gif","co_jest_na.gif" -(":>",";>",":->",";->"),"chytry.gif","chytry_na.gif" -("",""),"spie.gif","spie_na.gif" -(":|",";|",":-|",";-|",""),"ysz.gif","ysz_na.gif"; -(":]",";]",":-]",";-]"),"krzywy.gif" -(":/",";/",":-/",";-/",""),"kwasny.gif" -"","roza.gif","roza_na.gif" -(""),"piwo.gif","piwo_na.gif" -"","nie_powiem.gif" -*"","sex.gif" -"","soczek.gif","soczek_na.gif" -(":*",":-*",";*",";-*",""),"cmok.gif","cmok_na.gif" -(""),"calus.gif","calus_na.gif" -("","oczy.gif"),"oczy_na.gif" -"<ściana>","sciana.gif","sciana_na.gif" -(""),"serduszka.gif","serduszka_na.gif" -"","przytul.gif","przytul_na.gif" -"","uscisk.gif","uscisk_na.gif" -"","glaszcze.gif","glaszcze_na.gif" -(""),"cfaniak.gif","cfaniak_na.gif" -(""),"jem.gif","jem_na.gif" -"","hahaha.gif","hahaha_na.gif" -"","telefon.gif","telefon_na.gif" -"","klotnia.gif","klotnia_na.gif" -(""),"pisze.gif","pisze_na.gif" -(""),"boks.gif","boks_na.gif" -(""),"faja.gif","faja_na.gif" -(""),"papa.gif","papa_na.gif" -"<3m się>","3m_sie.gif","3m_sie_na.gif" -(""),"czas.gif","czas_na.gif" -"","cisza.gif","cisza_na.gif" -("",""),"co.gif","co_na.gif" -"","czarodziej.gif" -"","czytaj.gif","czytaj_na.gif" -*"]:->","diabelek.gif" -"","dupa.gif","dupa_na.gif" -*"","ganja.gif","ganja_na.gif" -"","glupek2.gif","glupek2_na.gif" -"","glupek.gif" -"","jupi.gif","jupi_na.gif" -*"","killer.gif" -"","list.gif","list_na.gif" -"","nauka.gif","nauka_na.gif" -"","paker.gif","paker_na.gif" -"","aniolek.gif","aniolek_na.gif" -"","peace.gif","peace_na.gif" -"","pomocy.gif","pomocy_na.gif" -"","boje_sie.gif","boje_sie_na.gif" -*"","serduszka2.gif","serduszka2_na.gif" -"","slonko.gif","slonko_na.gif" -(""),"spoko.gif","spoko_na.gif" -"","stop.gif","stop_na.gif" -"","tancze.gif","tancze_na.gif" -"","tuptup.gif","tuptup_na.gif" -"","uczen.gif","uczen_na.gif" -*"<żygi>","zygi.gif","zygi_na.gif" \ No newline at end of file Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/faja.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/faja.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/faja_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/faja_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/ganja.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/ganja.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/ganja_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/ganja_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/glaszcze.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/glaszcze.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/glaszcze_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/glaszcze_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/glupek2.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/glupek2.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/glupek2_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/glupek2_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/glupek.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/glupek.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/hahaha.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/hahaha.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/hahaha_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/hahaha_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/jem.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/jem.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/jem_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/jem_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/jezyk1.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/jezyk1.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/jezyk1_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/jezyk1_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/jezyk2.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/jezyk2.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/jezyk2_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/jezyk2_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/jupi.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/jupi.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/jupi_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/jupi_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/killer.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/killer.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/killer_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/killer_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/klotnia.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/klotnia.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/klotnia_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/klotnia_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/krzywy.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/krzywy.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/kwasny.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/kwasny.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/list.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/list.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/list_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/list_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/lol.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/lol.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/lol_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/lol_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/menu.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/menu.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/nauka.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/nauka.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/nauka_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/nauka_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/nie.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/nie.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/nie_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/nie_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/nie_powiem.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/nie_powiem.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/oczko2.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/oczko2.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/oczko2_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/oczko2_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/oczko.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/oczko.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/oczko_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/oczko_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/oczy.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/oczy.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/oczy_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/oczy_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/ok2.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/ok2.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/ok2_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/ok2_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/ok.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/ok.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/ok_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/ok_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/paker.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/paker.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/paker_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/paker_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/papa.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/papa.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/papa_na.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/papa_na.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/peace.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/peace.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/peace_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/peace_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/pisze.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/pisze.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/pisze_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/pisze_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/piwo.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/piwo.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/piwo_na.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/piwo_na.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/placze.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/placze.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/placze_na.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/placze_na.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/pomocy.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/pomocy.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/pomocy_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/pomocy_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/przytul.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/przytul.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/przytul_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/przytul_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/pytajnik.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/pytajnik.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/pytajnik_na.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/pytajnik_na.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/rotfl.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/rotfl.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/rotfl_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/rotfl_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/roza.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/roza.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/roza_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/roza_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/sciana.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/sciana.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/sciana_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/sciana_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/serduszka2.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/serduszka2.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/serduszka2_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/serduszka2_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/serduszka.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/serduszka.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/serduszka_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/serduszka_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/sex.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/sex.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/sex_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/sex_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/slonko.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/slonko.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/slonko_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/slonko_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/smutny.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/smutny.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/smutny_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/smutny_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/soczek.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/soczek.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/soczek_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/soczek_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/spie.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/spie.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/spie_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/spie_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/spoko.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/spoko.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/spoko_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/spoko_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/stop.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/stop.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/stop_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/stop_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/tancze.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/tancze.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/tancze_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/tancze_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/telefon.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/telefon.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/telefon_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/telefon_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/tuptup.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/tuptup.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/tuptup_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/tuptup_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/uczen.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/uczen.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/uczen_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/uczen_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/uscisk.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/uscisk.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/uscisk_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/uscisk_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/usmiech2.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/usmiech2.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/usmiech2_na.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/usmiech2_na.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/usmiech.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/usmiech.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/usmiech_na.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/usmiech_na.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/wow.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/wow.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/wow_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/wow_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/wsciekly.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/wsciekly.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/wsciekly_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/wsciekly_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/wykrzyknik.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/wykrzyknik.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/wykrzyknik_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/wykrzyknik_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/ysz.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/ysz.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/ysz_na.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/ysz_na.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/zawstydzony.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/zawstydzony.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/zawstydzony_na.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/zawstydzony_na.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/zeby.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/zeby.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/zeby_na.GIF and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/zeby_na.GIF differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/zly.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/zly.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/zly_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/zly_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/zygi.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/zygi.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/emoticons/gg6_compatible/2/zygi_na.gif and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/emoticons/gg6_compatible/2/zygi_na.gif differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/sounds/bns/error.wav and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/sounds/bns/error.wav differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/sounds/bns/msg.wav and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/sounds/bns/msg.wav differ diff -Nru kadu-3.0/externalthemes/sounds/bns/readme.txt kadu-4.1/externalthemes/sounds/bns/readme.txt --- kadu-3.0/externalthemes/sounds/bns/readme.txt 2016-04-15 08:08:05.000000000 +0000 +++ kadu-4.1/externalthemes/sounds/bns/readme.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -Copyright 2008 bns | http://www.banas.ovh.org - -Distributed under the terms of the Creative Commons Attribution-Share Alike 3.0 diff -Nru kadu-3.0/externalthemes/sounds/bns/sound.conf kadu-4.1/externalthemes/sounds/bns/sound.conf --- kadu-3.0/externalthemes/sounds/bns/sound.conf 2016-04-15 08:08:05.000000000 +0000 +++ kadu-4.1/externalthemes/sounds/bns/sound.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -[sounds] -NewMessage=wiadomosc1.wav -NewChat=wiadomosc.wav -StatusChanged/ToOnline=status.wav -StatusChanged/ToBusy=status.wav -StatusChanged/ToInvisible=status.wav -StatusChanged/ToOffline=status.wav -ConnectionError=error.wav -FileTransfer/IncomingFile=msg.wav -FileTransfer/Finished=msg.wav Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/sounds/bns/status.wav and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/sounds/bns/status.wav differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/sounds/bns/wiadomosc1.wav and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/sounds/bns/wiadomosc1.wav differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/sounds/bns/wiadomosc.wav and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/sounds/bns/wiadomosc.wav differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/sounds/drums/error.wav and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/sounds/drums/error.wav differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/sounds/drums/newchat.wav and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/sounds/drums/newchat.wav differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/sounds/drums/newmsg.wav and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/sounds/drums/newmsg.wav differ diff -Nru kadu-3.0/externalthemes/sounds/drums/README.txt kadu-4.1/externalthemes/sounds/drums/README.txt --- kadu-3.0/externalthemes/sounds/drums/README.txt 2016-04-15 08:08:05.000000000 +0000 +++ kadu-4.1/externalthemes/sounds/drums/README.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -This is a sound theme for Kadu instant messenger ( http://www.kadu.net/ ) -If you have any questions ask on http://www.kadu.net/forum/ - -Created by Konrad (ancestor) Strack . -This work is licensed under a Creative Commons Attribution-Share Alike 3.0 license. diff -Nru kadu-3.0/externalthemes/sounds/drums/sound.conf kadu-4.1/externalthemes/sounds/drums/sound.conf --- kadu-3.0/externalthemes/sounds/drums/sound.conf 2016-04-15 08:08:05.000000000 +0000 +++ kadu-4.1/externalthemes/sounds/drums/sound.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -[sounds] -NewMessage=newmsg.wav -NewChat=newchat.wav -StatusChanged/ToOnline=statuschange.wav -StatusChanged/ToBusy=statuschange.wav -StatusChanged/ToInvisible=statuschange.wav -StatusChanged/ToOffline=statuschange.wav -ConnectionError=error.wav -FileTransfer/IncomingFile=newchat.wav -FileTransfer/Finished=newchat.wav Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/sounds/drums/statuschange.wav and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/sounds/drums/statuschange.wav differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/sounds/florkus/error.wav and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/sounds/florkus/error.wav differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/sounds/florkus/msg.wav and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/sounds/florkus/msg.wav differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/sounds/florkus/newmsg.wav and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/sounds/florkus/newmsg.wav differ diff -Nru kadu-3.0/externalthemes/sounds/florkus/readme.txt kadu-4.1/externalthemes/sounds/florkus/readme.txt --- kadu-3.0/externalthemes/sounds/florkus/readme.txt 2016-04-15 08:08:05.000000000 +0000 +++ kadu-4.1/externalthemes/sounds/florkus/readme.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -(c) Copyrigth 2008 florkus -CC-SA \ No newline at end of file diff -Nru kadu-3.0/externalthemes/sounds/florkus/sound.conf kadu-4.1/externalthemes/sounds/florkus/sound.conf --- kadu-3.0/externalthemes/sounds/florkus/sound.conf 2016-04-15 08:08:05.000000000 +0000 +++ kadu-4.1/externalthemes/sounds/florkus/sound.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -[sounds] -NewMessage=newmsg.wav -NewChat=msg.wav -StatusChanged/ToOnline=status.wav -StatusChanged/ToBusy=status.wav -StatusChanged/ToInvisible=status.wav -StatusChanged/ToOffline=status.wav -ConnectionError=error.wav -FileTransfer/IncomingFile=trans.wav -FileTransfer/Finished=transend.wav Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/sounds/florkus/status.wav and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/sounds/florkus/status.wav differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/sounds/florkus/transend.wav and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/sounds/florkus/transend.wav differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/sounds/florkus/trans.wav and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/sounds/florkus/trans.wav differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/sounds/michalsrodek/error.wav and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/sounds/michalsrodek/error.wav differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/sounds/michalsrodek/kadumusic.wav and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/sounds/michalsrodek/kadumusic.wav differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/sounds/michalsrodek/newmessage.wav and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/sounds/michalsrodek/newmessage.wav differ diff -Nru kadu-3.0/externalthemes/sounds/michalsrodek/readme.txt kadu-4.1/externalthemes/sounds/michalsrodek/readme.txt --- kadu-3.0/externalthemes/sounds/michalsrodek/readme.txt 2016-04-15 08:08:05.000000000 +0000 +++ kadu-4.1/externalthemes/sounds/michalsrodek/readme.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -This is a sound theme for Kadu instant messenger ( http://www.kadu.net/ ) -If you have any questions ask on http://www.kadu.net/forum/ - -Created by MichaĹ‚ Ĺšrodek < mail @ MAIL .com>. -This work is licensed under a Creative Commons Attribution-Share Alike 3.0 license. - - -files trans i transsend: -(c) Copyrigth 2008 florkus -CC-SA \ No newline at end of file diff -Nru kadu-3.0/externalthemes/sounds/michalsrodek/sound.conf kadu-4.1/externalthemes/sounds/michalsrodek/sound.conf --- kadu-3.0/externalthemes/sounds/michalsrodek/sound.conf 2016-04-15 08:08:05.000000000 +0000 +++ kadu-4.1/externalthemes/sounds/michalsrodek/sound.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -[sounds] -NewMessage=newmessage.wav -NewChat=newmessage.wav -StatusChanged/ToOnline=kadumusic.wav -StatusChanged/ToBusy=kadumusic.wav -StatusChanged/ToInvisible=kadumusic.wav -StatusChanged/ToOffline=kadumusic.wav -ConnectionError=error.wav -FileTransfer/IncomingFile=trans.wav -FileTransfer/Finished=transend.wav Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/sounds/michalsrodek/transend.wav and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/sounds/michalsrodek/transend.wav differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/sounds/michalsrodek/trans.wav and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/sounds/michalsrodek/trans.wav differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/sounds/percussion/error.wav and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/sounds/percussion/error.wav differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/sounds/percussion/newchat.wav and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/sounds/percussion/newchat.wav differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/sounds/percussion/newmsg.wav and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/sounds/percussion/newmsg.wav differ diff -Nru kadu-3.0/externalthemes/sounds/percussion/README.txt kadu-4.1/externalthemes/sounds/percussion/README.txt --- kadu-3.0/externalthemes/sounds/percussion/README.txt 2016-04-15 08:08:05.000000000 +0000 +++ kadu-4.1/externalthemes/sounds/percussion/README.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -This is a sound theme for Kadu instant messenger ( http://www.kadu.net/ ) -If you have any questions ask on http://www.kadu.net/forum/ - -Created by Konrad (ancestor) Strack . -This work is licensed under a Creative Commons Attribution-Share Alike 3.0 license. diff -Nru kadu-3.0/externalthemes/sounds/percussion/sound.conf kadu-4.1/externalthemes/sounds/percussion/sound.conf --- kadu-3.0/externalthemes/sounds/percussion/sound.conf 2016-04-15 08:08:05.000000000 +0000 +++ kadu-4.1/externalthemes/sounds/percussion/sound.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -[sounds] -NewMessage=newmsg.wav -NewChat=newchat.wav -StatusChanged/ToOnline=statuschange.wav -StatusChanged/ToBusy=statuschange.wav -StatusChanged/ToInvisible=statuschange.wav -StatusChanged/ToOffline=statuschange.wav -ConnectionError=error.wav -FileTransfer/IncomingFile=newchat.wav -FileTransfer/Finished=newchat.wav Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/sounds/percussion/statuschange.wav and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/sounds/percussion/statuschange.wav differ diff -Nru kadu-3.0/externalthemes/sounds/ultr/authors.txt kadu-4.1/externalthemes/sounds/ultr/authors.txt --- kadu-3.0/externalthemes/sounds/ultr/authors.txt 2016-04-15 08:08:05.000000000 +0000 +++ kadu-4.1/externalthemes/sounds/ultr/authors.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -collecting: - Piotr "ultr" DÄ…browski - - - -error.wav - http://www.freesound.org/samplesViewSingle.php?id=27422 - by hello_flowers - - - -filefinished.wav - http://www.freesound.org/samplesViewSingle.php?id=56229 - by pera - - - -fileincoming.wav - http://www.freesound.org/samplesViewSingle.php?id=32951 - by HardPCM - - - -newchat.wav - http://www.freesound.org/samplesViewSingle.php?id=26777 - by junggle - - - -newmessage.wav - http://www.pdsounds.org/sounds/blip - by Natalie - - - -status.wav - http://www.pdsounds.org/sounds/clickick_switch - by Stephan Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/sounds/ultr/error.wav and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/sounds/ultr/error.wav differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/sounds/ultr/filefinished.wav and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/sounds/ultr/filefinished.wav differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/sounds/ultr/fileincoming.wav and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/sounds/ultr/fileincoming.wav differ diff -Nru kadu-3.0/externalthemes/sounds/ultr/license.txt kadu-4.1/externalthemes/sounds/ultr/license.txt --- kadu-3.0/externalthemes/sounds/ultr/license.txt 2016-04-15 08:08:05.000000000 +0000 +++ kadu-4.1/externalthemes/sounds/ultr/license.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -Creative Commons Sampling Plus 1.0 - -http://creativecommons.org/licenses/sampling+/1.0/ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/sounds/ultr/newchat.wav and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/sounds/ultr/newchat.wav differ Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/sounds/ultr/newmessage.wav and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/sounds/ultr/newmessage.wav differ diff -Nru kadu-3.0/externalthemes/sounds/ultr/sound.conf kadu-4.1/externalthemes/sounds/ultr/sound.conf --- kadu-3.0/externalthemes/sounds/ultr/sound.conf 2016-04-15 08:08:05.000000000 +0000 +++ kadu-4.1/externalthemes/sounds/ultr/sound.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -[sounds] -NewMessage=newmessage.wav -NewChat=newchat.wav -StatusChanged/ToOnline=status.wav -StatusChanged/ToBusy=status.wav -StatusChanged/ToInvisible=status.wav -StatusChanged/ToOffline=status.wav -ConnectionError=error.wav -FileTransfer/IncomingFile=fileincoming.wav -FileTransfer/Finished=filefinished.wav Binary files /tmp/tmpKbi2KH/valg0SmX9o/kadu-3.0/externalthemes/sounds/ultr/status.wav and /tmp/tmpKbi2KH/0y37U6knj1/kadu-4.1/externalthemes/sounds/ultr/status.wav differ diff -Nru kadu-3.0/kadu-core/accounts/account.cpp kadu-4.1/kadu-core/accounts/account.cpp --- kadu-3.0/kadu-core/accounts/account.cpp 2016-02-12 22:49:34.000000000 +0000 +++ kadu-4.1/kadu-core/accounts/account.cpp 2016-10-30 22:53:55.000000000 +0000 @@ -30,6 +30,8 @@ #include "configuration/deprecated-configuration-api.h" #include "contacts/contact-manager.h" #include "contacts/contact.h" +#include "core/core.h" +#include "core/injected-factory.h" #include "identities/identity.h" #include "misc/misc.h" #include "protocols/protocol-factory.h" @@ -43,21 +45,6 @@ Account Account::null; -Account Account::create(const QString &protocolName) -{ - return new AccountShared(protocolName); -} - -Account Account::loadStubFromStorage(const std::shared_ptr &accountStoragePoint) -{ - return AccountShared::loadStubFromStorage(accountStoragePoint); -} - -Account Account::loadFromStorage(const std::shared_ptr &accountStoragePoint) -{ - return AccountShared::loadFromStorage(accountStoragePoint); -} - Account::Account() { } @@ -104,3 +91,8 @@ KaduSharedBase_PropertyDef(Account, bool, useDefaultProxy, UseDefaultProxy, true) KaduSharedBase_PropertyDefCRW(Account, NetworkProxy, proxy, Proxy, NetworkProxy::null) KaduSharedBase_PropertyDef(Account, bool, privateStatus, PrivateStatus, true) + +Protocol * protocol(Account account) +{ + return protocol(account.data()); +} diff -Nru kadu-3.0/kadu-core/accounts/account-details.cpp kadu-4.1/kadu-core/accounts/account-details.cpp --- kadu-3.0/kadu-core/accounts/account-details.cpp 2016-02-12 22:49:34.000000000 +0000 +++ kadu-4.1/kadu-core/accounts/account-details.cpp 2016-10-30 22:53:55.000000000 +0000 @@ -19,8 +19,8 @@ #include "accounts/account-details.h" -AccountDetails::AccountDetails(AccountShared *mainData) : - Details(mainData) +AccountDetails::AccountDetails(AccountShared *mainData, QObject *parent) : + Details(mainData, parent) { } diff -Nru kadu-3.0/kadu-core/accounts/account-details.h kadu-4.1/kadu-core/accounts/account-details.h --- kadu-3.0/kadu-core/accounts/account-details.h 2016-02-12 22:49:34.000000000 +0000 +++ kadu-4.1/kadu-core/accounts/account-details.h 2016-10-30 22:53:55.000000000 +0000 @@ -34,7 +34,7 @@ { public: - explicit AccountDetails(AccountShared *mainData); + explicit AccountDetails(AccountShared *mainData, QObject *parent = nullptr); virtual ~AccountDetails(); }; diff -Nru kadu-3.0/kadu-core/accounts/account.h kadu-4.1/kadu-core/accounts/account.h --- kadu-3.0/kadu-core/accounts/account.h 2016-02-12 22:49:34.000000000 +0000 +++ kadu-4.1/kadu-core/accounts/account.h 2016-10-30 22:53:55.000000000 +0000 @@ -42,9 +42,6 @@ KaduSharedBaseClass(Account) public: - static Account create(const QString &protocolName); - static Account loadStubFromStorage(const std::shared_ptr &accountStoragePoint); - static Account loadFromStorage(const std::shared_ptr &accountStoragePoint); static Account null; Account(); @@ -71,6 +68,8 @@ }; +KADUAPI Protocol * protocol(Account account); + Q_DECLARE_METATYPE(Account) #endif // ACCOUNT_H diff -Nru kadu-3.0/kadu-core/accounts/account-manager.cpp kadu-4.1/kadu-core/accounts/account-manager.cpp --- kadu-3.0/kadu-core/accounts/account-manager.cpp 2016-02-12 22:49:34.000000000 +0000 +++ kadu-4.1/kadu-core/accounts/account-manager.cpp 2016-10-30 22:53:55.000000000 +0000 @@ -21,17 +21,19 @@ */ #include "accounts/accounts-aware-object.h" +#include "accounts/account-storage.h" #include "buddies/buddy-manager.h" #include "chat/chat-manager.h" #include "configuration/configuration-api.h" +#include "configuration/configuration-manager.h" #include "configuration/configuration.h" #include "configuration/deprecated-configuration-api.h" #include "contacts/contact-manager.h" -#include "core/core.h" +#include "core/injected-factory.h" +#include "core/myself.h" #include "gui/widgets/dialog/password-dialog-widget.h" #include "gui/windows/kadu-dialog.h" #include "identities/identity.h" -#include "protocols/connection-error-notification.h" #include "protocols/protocol-factory.h" #include "protocols/protocol.h" #include "protocols/protocols-manager.h" @@ -40,31 +42,65 @@ #include "account-manager.h" -AccountManager * AccountManager::Instance = 0; +AccountManager::AccountManager(QObject *parent) : + Manager{parent} +{ +} -AccountManager * AccountManager::instance() +AccountManager::~AccountManager() { - if (0 == Instance) - { - Instance = new AccountManager(); - Instance->init(); - } +} - return Instance; +void AccountManager::setAccountStorage(AccountStorage *accountStorage) +{ + m_accountStorage = accountStorage; } -AccountManager::AccountManager() +void AccountManager::setBuddyManager(BuddyManager *buddyManager) { + m_buddyManager = buddyManager; } -AccountManager::~AccountManager() +void AccountManager::setChatManager(ChatManager *chatManager) +{ + m_chatManager = chatManager; +} + +void AccountManager::setConfigurationManager(ConfigurationManager *configurationManager) +{ + m_configurationManager = configurationManager; +} + +void AccountManager::setContactManager(ContactManager *contactManager) +{ + m_contactManager = contactManager; +} + +void AccountManager::setInjectedFactory(InjectedFactory *injectedFactory) { + m_injectedFactory = injectedFactory; +} + +void AccountManager::setMyself(Myself *myself) +{ + m_myself = myself; } void AccountManager::init() { // needed for QueuedConnection qRegisterMetaType("Account"); + m_configurationManager->registerStorableObject(this); +} + +void AccountManager::done() +{ + m_configurationManager->unregisterStorableObject(this); +} + +Account AccountManager::loadStubFromStorage(const std::shared_ptr &storagePoint) +{ + return m_accountStorage->loadStubFromStorage(storagePoint); } void AccountManager::itemAdded(Account item) @@ -97,14 +133,7 @@ AccountsAwareObject::notifyAccountRegistered(item); - /* NOTE: We need QueuedConnection here so when the protocol emits the signal, it can cleanup - * itself before we do something (e.g., reset connection data after invalidPassword, so when - * we try to log in after entering new password, a new connection can be estabilished instead - * of giving up because of already existing connection). - */ - connect(item.protocolHandler(), SIGNAL(connectionError(Account, const QString &, const QString &)), - this, SLOT(connectionError(Account, const QString &, const QString &)), Qt::QueuedConnection); - connect(item.protocolHandler(), SIGNAL(invalidPassword(Account)), + connect(protocol(item), SIGNAL(invalidPassword(Account)), this, SLOT(providePassword(Account)), Qt::QueuedConnection); emit accountRegistered(item); @@ -115,7 +144,7 @@ QMutexLocker locker(&mutex()); AccountsAwareObject::notifyAccountUnregistered(item); - disconnect(item.protocolHandler(), 0, this, 0); + disconnect(protocol(item), 0, this, 0); emit accountAboutToBeUnregistered(item); } @@ -197,30 +226,22 @@ emit accountUpdated(account); } -void AccountManager::connectionError(Account account, const QString &server, const QString &message) -{ - QMutexLocker locker(&mutex()); - - ConnectionErrorNotification::notifyConnectionError(account, server, message); -} - void AccountManager::removeAccountAndBuddies(Account account) { StatusContainer *statusContainer = account.statusContainer(); if (statusContainer) statusContainer->setStatus(Status(), SourceUser); // user removed account - Protocol *protocolHandler = account.protocolHandler(); - if (protocolHandler) - delete protocolHandler->rosterService(); + if (auto p = protocol(account)) + delete p->rosterService(); removeItem(account); - QVector contacts = ContactManager::instance()->contacts(account); + QVector contacts = m_contactManager->contacts(account); foreach (const Contact &contact, contacts) - BuddyManager::instance()->clearOwnerAndRemoveEmptyBuddy(contact); + m_buddyManager->clearOwnerAndRemoveEmptyBuddy(contact); - QVector chats = ChatManager::instance()->chats(account); + QVector chats = m_chatManager->chats(account); foreach (const Chat &chat, chats) chat.setDisplay(QString()); } @@ -237,8 +258,8 @@ // inform protocol that we have password // maybe this should be in other place, but for now it is enough - if (account.protocolHandler()) - account.protocolHandler()->passwordProvided(); + if (auto p = protocol(account)) + p->passwordProvided(); } void AccountManager::providePassword(Account account) @@ -249,7 +270,7 @@ .arg(account.accountIdentity().name()) .arg(account.id()); - PasswordDialogWidget *passwordWidget = new PasswordDialogWidget(message, account, 0); + auto passwordWidget = m_injectedFactory->makeInjected(message, account, nullptr); connect(passwordWidget, SIGNAL(passwordEntered(const QVariant &, const QString &, bool)), this, SLOT(passwordProvided(const QVariant &, const QString &, bool))); KaduDialog *window = new KaduDialog(passwordWidget, 0); window->exec(); @@ -260,7 +281,7 @@ Manager::loaded(); foreach (const Account &account, allItems()) - account.accountContact().setOwnerBuddy(Core::instance()->myself()); + account.accountContact().setOwnerBuddy(m_myself->buddy()); } #include "moc_account-manager.cpp" diff -Nru kadu-3.0/kadu-core/accounts/account-manager.h kadu-4.1/kadu-core/accounts/account-manager.h --- kadu-3.0/kadu-core/accounts/account-manager.h 2016-02-12 22:49:34.000000000 +0000 +++ kadu-4.1/kadu-core/accounts/account-manager.h 2016-10-30 22:53:55.000000000 +0000 @@ -19,12 +19,7 @@ * along with this program. If not, see . */ -#ifndef ACCOUNT_MANAGER_H -#define ACCOUNT_MANAGER_H - -#include -#include -#include +#pragma once #include "accounts/account.h" #include "protocols/protocol-factory.h" @@ -32,40 +27,64 @@ #include "storage/manager.h" #include "exports.h" -class Status; +#include +#include +#include +#include + +class AccountStorage; +class BuddyManager; +class ChatManager; class ConfigurationApi; +class ConfigurationManager; +class ContactManager; +class InjectedFactory; +class Myself; +class Status; -class KADUAPI AccountManager : public QObject, public Manager +class KADUAPI AccountManager : public Manager { Q_OBJECT - Q_DISABLE_COPY(AccountManager) - - static AccountManager *Instance; - - AccountManager(); - virtual ~AccountManager(); - void init(); + QPointer m_accountStorage; + QPointer m_buddyManager; + QPointer m_chatManager; + QPointer m_configurationManager; + QPointer m_contactManager; + QPointer m_injectedFactory; + QPointer m_myself; private slots: + INJEQT_SET void setAccountStorage(AccountStorage *accountStorage); + INJEQT_SET void setBuddyManager(BuddyManager *buddyManager); + INJEQT_SET void setChatManager(ChatManager *chatManager); + INJEQT_SET void setConfigurationManager(ConfigurationManager *configurationManager); + INJEQT_SET void setContactManager(ContactManager *contactManager); + INJEQT_SET void setInjectedFactory(InjectedFactory *injectedFactory); + INJEQT_SET void setMyself(Myself *myself); + INJEQT_INIT void init(); + INJEQT_DONE void done(); + void passwordProvided(const QVariant &data, const QString &password, bool permament); void accountDataUpdated(); - void connectionError(Account account, const QString &server, const QString &message); protected: - virtual void itemAdded(Account item); - virtual void itemRemoved(Account item); + virtual Account loadStubFromStorage(const std::shared_ptr &storagePoint) override; + + virtual void itemAdded(Account item) override; + virtual void itemRemoved(Account item) override; - virtual void itemAboutToBeRegistered(Account item); - virtual void itemRegistered(Account item); - virtual void itemAboutToBeUnregisterd(Account item); - virtual void itemUnregistered(Account item); + virtual void itemAboutToBeRegistered(Account item) override; + virtual void itemRegistered(Account item) override; + virtual void itemAboutToBeUnregisterd(Account item) override; + virtual void itemUnregistered(Account item) override; - virtual void loaded(); + virtual void loaded() override; public: - static AccountManager * instance(); + Q_INVOKABLE explicit AccountManager(QObject *parent = nullptr); + virtual ~AccountManager(); template