Import release 2.0

Import release 2.0rc1
Import release 2.0beta2
2009-07-25 14:07:41 +00:00 · 2009-07-17 15:44:01 +00:00 · 2009-05-13 18:20:42 +00:00 · 2009-03-23 23:35:55 +00:00 · 2009-03-23 23:26:37 +00:00
430 changed files with 124814 additions and 109649 deletions
@@ -0,0 +1,43 @@
+[Buildset]
+Number of Builditems=1
+
+[Buildset][Builditem0]
+Itemname=KMess
+Itempath=./
+Projectname=KMess
+
+[CMake]
+BuildDirs=./build
+CMakeDir=/usr/share/cmake/Modules
+Current CMake binary=cmake
+CurrentBuildDir=./build
+CurrentInstallDir=
+ProjectRootRelative=./
+
+[Chat Window debug-Run Options]
+Arguments=--runtest chatwindow
+Executable=./build/src/kmess
+Working Directory=./build/src/
+
+[Contact List debug-Run Options]
+Arguments=--runtest contactlist
+Executable=./build/src/kmess
+Working Directory=./build/src/
+
+[Debug-Run Options]
+Executable=./build/src/kmess
+
+[MakeBuilder]
+Abort on First Error=false
+Number Of Jobs=3
+Run Multiple Jobs=true
+
+[Project]
+VersionControlSupport=kdevsubversion
+
+[Run Options]
+Run Targets=Chat Window debug,Contact List debug,Debug
+
+[Veritas]
+executables=
+framework=QTest
@@ -1,4 +1,5 @@
-Developers:
+-- Developers --
+
  Mike K. Bennett       <mkb137@users.sourceforge.net>
  Michael Curtis        <mdcurtis@users.sourceforge.net>
  Jan Toenjes           <jan.toenjes@web.de>
@@ -6,48 +7,153 @@ Developers:
  Richard Conway        <richardconway@users.sourceforge.net>
  Valerio Pilo          <amroth@coldshock.net>
  Antonio Nastasi       <sifcenter@gmail.com>
+  Ruben Vandamme        <vandammeru@gmail.com>
+  Sjors Gielen          <dazjorz@dazjorz.com>
+  Adam Goossens         <fontknocker@gmail.com>

-Translations:
-  Arabic                - Mohamed Aser <mohasr@link.net>
-                          Youssef Chahibi <chahibi@gmail.com>
-  Brazilian Portuguese  - Mauricio Rother <mauricio@digicomm.com.br>
-  Catalan               - Jaume Cornadó <jaumec@lleida.net>
-  Chinese (Simplified)  - Lin Haoxiang <linhaoxiang@hotmail.com>
-                          Liu Sizhuang <chinatslsz@hotmail.com>
-  Chinese (Traditional) - Yen-chou Chen <yenchou.mse90@nctu.edu.tw>
-  Danish                - Lars Sommer <admin@lasg.dk>
-                          Pascal d'Hermilly <pascal@tipisoft.dk>
-  Dutch                 - Arend van Beelen Jr. <arend@auton.nl>
-                          Diederik van der Boor <vdboor@codingdomain.com>
-                          Jaap Woldringh <jjh.woldringh@planet.nl>
-  Estonian              - Jyri Toomessoo <nuubik@hotmail.com>
-  Finnish               - Markus Vuori <markus@vuoret.net>
-                          Joonas Niilola <juippis@roskakori.org>
-                          Jussi Timperi <jussi.timperi@gmail.com>
-  French                - Choplair <pachilor@yahoo.co.jp>
-                          Vincent Fretin <fretinvincent@hotmail.com>
-                          Andrea Blankenstijn <darkan9el@gmail.com>
-  German                - Jan Tönjes <jan.toenjes@web.de>
-  Hungarian             - Páder Rezsõ <rezso@rezso.net>
-  Italian               - David Vignoni <dvgn@libero.it>
-                          Valerio Pilo <amroth@coldshock.net>
-                          Vincenzo Reale <smart2128@baslug.org>
-  Korean                - Park Dong Cheon <pdc@kaist.ac.kr>
-  Norsk Bokmal          - Øyvind Sæther <oyvind@sather.tk>
-  Slovenian             - Matjaž kaše <kase@g-kabel.si>
-  Spanish               - Johanna Gersch
-                          J.C.A. Javi <yovoya30ks@hotmail.com>
-                          Alejandro Araiza Alvarado <mebrelith@gmail.com>
-                          Jaume Corbí <jaume4@gmail.com>
-                          Christian Kaiser <k39@users.sourceforge.net>
-  Swedish               - Christian Lundgren <zeflunk@gmail.com>
-  Thai                  - Rachan Hongpairote <rachanh@yahoo.com>
-  Turkish               - Gorkem Cetin <gorkem@gelecek.com.tr>
-                          Barbaros Ulutas <tebarul@yahoo.com>
-                          Uğur Çetin <ugur.jnmbk@gmail.com>
+-- Translations --

+  Translations Maintainer:
+
+    Panagiotis Papadopoulos <pano_90@gmx.net>
+
+  Arabic:
+
+    Mohamed Aser <mohasr@link.net>
+    Youssef Chahibi <chahibi@gmail.com>
+    Ma'moun Diraneyya <mamoun.diraneyya@gmail.com>
+
+  Brazilian Portuguese:
+
+    Mauricio Rother <mauricio@digicomm.com.br>
+    Leonel Freire <leonelfreire@gmail.com>
+    Sergio Rafael Lemke <bedi.com@gmail.com>
+    Maurício Arozi Moraes
+
+  Catalan:
+
+    Jaume Cornadó <jaumec@lleida.net>
+    Adrià Arrufat <swiftscythe@gmail.com>
+
+  Chinese (Simplified):
+
+    Lin Haoxiang <linhaoxiang@hotmail.com>
+    Liu Sizhuang <chinatslsz@hotmail.com>
+    Cheng Yang <yangzju@gmail.com>
+
+  Chinese (Traditional):
+
+    Yen-chou Chen <yenchou.mse90@nctu.edu.tw>
+    Tryneeds-Chinese Translation Platform <http://tryneeds.westart.tw/tryneeds>
+
+  Danish:
+
+    Lars Sommer <admin@lasg.dk>
+    Pascal d'Hermilly <pascal@tipisoft.dk>
+
+  Dutch:
+
+    Arend van Beelen Jr. <arend@auton.nl>
+    Diederik van der Boor <vdboor@codingdomain.com>
+    Jaap Woldringh <jjh.woldringh@planet.nl>
+    Elve <elve@savage-elve.net>
+    Sander Pientka <cumulus0007@gmail.com>
+    Heimen Stoffels <djmusic121@gmail.com>
+
+  Estonian:
+
+    Jyri Toomessoo <nuubik@hotmail.com>
+
+  Finnish:
+
+    Markus Vuori <markus@vuoret.net>
+    Joonas Niilola <juippis@roskakori.org>
+    Jussi Timperi <jussi.timperi@gmail.com>
+    Antony Hussi <antony.hussi@tranciend.com>
+
+  French:
+
+    Choplair <pachilor@yahoo.co.jp>
+    Vincent Fretin <fretinvincent@hotmail.com>
+    Andrea Blankenstijn <darkan9el@gmail.com>
+    Barthe Guillaume <gu_barthe@yahoo.fr>
+    Scias <shining.scias@gmail.com>
+
+  German:
+
+    Jan Tönjes <jan.toenjes@web.de>
+    Panagiotis Papadopoulos <pano_90@gmx.net>
+
+  Greek:
+
+    Panagiotis Papadopoulos <pano_90@gmx.net>
+    Dimitrios Glentadakis <dglent@gmail.com>
+
+  Hungarian:
+
+    Páder Rezső <rezso@rezso.net>
+    Pauli Henrik <henrik.pauli@drangolin.net>
+
+  Italian:
+
+    David Vignoni <dvgn@libero.it>
+    Valerio Pilo <amroth@coldshock.net>
+    Vincenzo Reale <smart2128@baslug.org>
+    Andrea Decorte <adecorte@gmail.com>
+
+  Japanese:
+
+    Daniel E. Moctezuma <shinsen27@gmail.com>
+
+  Korean:
+
+    Park Dong Cheon <pdc@kaist.ac.kr>
+
+  Norsk Bokmal:
+
+    Øyvind Sæther <oyvind@sather.tk>
+
+  Serbian:
+
+    Zoran Milovanović <provalisam@gmail.com>
+
+  Slovak:
+
+    Rastislav Krupanský <ra100@atlas.sk>
+
+  Slovenian:
+
+    Matjaž Kaše <kase@g-kabel.si>
+
+  Spanish:
+
+    Johanna Gersch
+    J.C.A. Javi <yovoya30ks@hotmail.com>
+    Alejandro Araiza Alvarado <mebrelith@gmail.com>
+    Jaume Corbí <jaume4@gmail.com>
+    Christian Kaiser <k39@users.sourceforge.net>
+    Juan Pablo González Tognarelli <jotapesan@gmail.com>
+    Alexis Daniel Medina Medina <alexismedina@gmail.com>
+    Manuel Ramírez <elpreto@kde.org.ar>
+    Mauricio Muñoz Lucero <real.mml@gmail.com>
+
+  Swedish:
+
+    Christian Lundgren <zeflunk@gmail.com>
+    Mattias Newzella <newzella@gmail.com>
+
+  Thai:
+
+    Rachan Hongpairote <rachanh@yahoo.com>
+
+  Turkish:
+
+    Gorkem Cetin <gorkem@gelecek.com.tr>
+    Barbaros Ulutas <tebarul@yahoo.com>
+    Uğur Çetin <ugur.jnmbk@gmail.com>
+
+-- Thanks to --

-Also tranks to:
  Jan Tönjes <jan.toenjes@web.de>
  - testing, documentation, web master, project management, etc

@@ -84,6 +190,26 @@ Also tranks to:
  Damien Sandras <dsandras@seconix.com>
  - GnomeMeeting developer

+  Liu Sizhuang <chinatslsz@hotmail.com>
+  - P4-Context field support
+
+  Guido Solinas <whereismwhite@gmail.com>
+  - Pictures in contact list code
+  - Contact client info
+  - Chat font zoom
+
+  Pedro Ferreira <pedro.ferreira@fe.up.pt>
+  - File transfer thumbnails
+
+  Matteo Nardi <91.matteo@gmail.com>
+  - KWallet support
+
+  Andrea Decorte <adecorte@gmail.com>
+  - Group selection in 'contact added user' dialog
+
+  Dario Freddi <drf_av@users.sourceforge.net>
+  - Chat history dialog
+
  KMerlin <http://kmerlin.olsd.de/>
  - Inspiration and assorted code

@@ -100,28 +226,7 @@ Also tranks to:

  Amarok
  - Custom crash handler implementation
+  - System tray icon overlay implementation

-  Liu Sizhuang <chinatslsz@hotmail.com>
-  - P4-Context field support
-
-  Guido Solinas <whereismwhite@gmail.com>
-  - Pictures in contact list code
-  - Contact client info
-  - Chat font zoom
-
-  Pedro Ferreira <pedro.ferreira@fe.up.pt>
-  - File transfer thumbnails
-
-  Ruben Vandamme <vandammeru@gmail.com>
-  - Basic DBus support
-  - Tab closing message
-  - Menu hiding shortcut
-  - Toolbars lock
-
-  Matteo Nardi <91.matteo@gmail.com>
-  - KWallet support
-
-  Adam Goossens <fontknocker@gmail.com>
-  - Notifications blocking option
-  - Winks disabling option
-  - Last message date feature
+  Quassel
+  - KNotify not giving focus bug fix and KWin focus stealing prevention workaround
@@ -3,9 +3,10 @@ PROJECT( kmess )

 #### System checks ####

-# To add checks, see
+# To add checks, see in one or more of these paths
 # /usr/share/cmake/Modules
 # /usr/share/kde4/apps/cmake/modules
+# /usr/share/apps/cmake

 # Check for cmake, same as minimum for KDE 4.0.0
 CMAKE_MINIMUM_REQUIRED( VERSION 2.4.5 )
@@ -14,18 +15,103 @@ CMAKE_MINIMUM_REQUIRED( VERSION 2.4.5 )
 FIND_PACKAGE( KDE4 REQUIRED )

 # Check for libxml2
-FIND_PACKAGE( LibXml2 REQUIRED )
-MACRO_OPTIONAL_FIND_PACKAGE( LibXml2 )
-MACRO_LOG_FEATURE( LIBXML2_FOUND "LibXML2" "Libraries used to develop XML applications" "http://xmlsoft.org" FALSE "" "Required for the chat styles system." )
+FIND_PACKAGE( LibXml2 )
+MACRO_LOG_FEATURE( LIBXML2_FOUND "LibXML2" "Libraries used to develop XML-aware applications" "http://www.xmlsoft.org/" TRUE ""
+"  Required for the chat styles system.
+  * You will need this package and the matching development package: for example, 'kmess' and 'kmess-dev' or 'kmess-devel'.
+  * Usually the package names for this library are:
+        on Ubuntu:   'libxml2' and 'libxml2-dev'
+        on openSUSE: 'libxml2' and 'libxml2-devel'
+  * Please refer to the KMess board for more info, and specially to this guide: http://www.kmess.org/board/viewtopic.php?t=3100" )

 # Check for libxslt
-FIND_PACKAGE( LibXslt REQUIRED )
-MACRO_OPTIONAL_FIND_PACKAGE( LibXslt )
-MACRO_LOG_FEATURE( LIBXSLT_FOUND "LibXSLT" "A library to transform XML files into other XML files" "http://xmlsoft.org/XSLT" FALSE "" "Required for the chat styles system." )
+FIND_PACKAGE( LibXslt )
+MACRO_LOG_FEATURE( LIBXSLT_FOUND "LibXSLT" "A library to transform XML into other formats" "http://www.xmlsoft.org/XSLT" TRUE ""
+"  Required for the chat styles system.
+  * You will need this package and the matching development package: for example, 'kmess' and 'kmess-dev' or 'kmess-devel'.
+  * Usually the package names for this library are:
+        on Ubuntu:   'libxslt' and 'libxslt-dev'
+        on openSUSE: 'libxslt' and 'libxslt-devel'
+  * Please refer to the KMess board for more info, and specially to this guide: http://www.kmess.org/board/viewtopic.php?t=3100" )
+
+# Check for qca2
+FIND_PACKAGE( QCA2 )
+MACRO_LOG_FEATURE( QCA2_FOUND "QCA 2" "A cryptographic library written in Qt to access various encryption methods" "http://delta.affinix.com/qca/" TRUE ""
+"  Required for the Windows Live Messenger login process.
+  * You will need this package and the matching development package: for example, 'kmess' and 'kmess-dev' or 'kmess-devel'.
+  * Usually the package names for this library are:
+      on Ubuntu:   'libqca2', 'libqca2-dev' and 'libqca2-plugin-ossl'
+      on openSUSE: 'libqca2' and 'libqca2-devel'
+      on Fedora:   'qca2' and 'qca2-devel'
+  * Please refer to the KMess board for more info, and specially to this guide: http://www.kmess.org/board/viewtopic.php?t=3100" )
+
+# As far as I know, it is impossible to find out if the required QCA plugin for OpenSSL is installed:
+# so we need to ask QCA itself it it's got such a plugin. Pretty darned unportable stuff.
+IF( QCA2_FOUND )
+  IF( UNIX )
+    EXECUTE_PROCESS( COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/cmake/check-qca2-ossl.sh OUTPUT_VARIABLE HAS_QCA2_OSSL_PLUGIN )
+    IF( HAS_QCA2_OSSL_PLUGIN EQUAL 1 )
+      SET( QCA2_OSSL_PLUGIN_FOUND TRUE )
+    ELSE( HAS_QCA2_OSSL_PLUGIN EQUAL 1 )
+      SET( QCA2_OSSL_PLUGIN_FOUND FALSE )
+    ENDIF( HAS_QCA2_OSSL_PLUGIN EQUAL 1 )
+    MACRO_LOG_FEATURE( QCA2_OSSL_PLUGIN_FOUND "QCA 2 - OpenSSL Plugin" "OpenSSL interaction library for QCA2" "http://delta.affinix.com/qca/" TRUE ""
+"  Required for the Windows Live Messenger login process.
+  * This package should have been installed along QCA2: if you have QCA2 installed
+  but still see this message, your distribution probably packages it separately.
+  Ubuntu does this, the package name is 'libqca2-plugin-ossl'.
+  * Please refer to the KMess forum for more info, and specially to this guide: http://www.kmess.org/board/viewtopic.php?t=3100" )
+  ELSE( UNIX )
+    # TODO: Find another *portable* way to detect the OSSL plugin.
+    MESSAGE( STATUS "NOTE: The qca2 OpenSSL can't be detected on this platform yet. Make sure you have it installed." )
+  ENDIF( UNIX )
+ENDIF( QCA2_FOUND )

 # Check for XScreenSaver extension
-MACRO_BOOL_TO_01( X11_Xscreensaver_FOUND HAVE_XSCREENSAVER )
-MACRO_LOG_FEATURE( X11_Xscreensaver_FOUND "XScreenSaver" "X11 extension used to check idle state" "" FALSE "" "Required for the auto-away feature." )
+OPTION( WANT_XSCREENSAVER "Build with X11 screensaver auto-away support" ON )
+IF( WANT_XSCREENSAVER )
+  MACRO_BOOL_TO_01( X11_Xscreensaver_FOUND HAVE_XSCREENSAVER )
+  MACRO_OPTIONAL_FIND_PACKAGE(X11)
+  IF( X11_FOUND )
+    MACRO_LOG_FEATURE( X11_Xscreensaver_FOUND "XScreenSaver" "X11 extension used to check idle state" "" FALSE ""
+  "  Required for the auto-away feature.
+  * Usually the package names for this library are:
+      on Ubuntu:   'libxss-dev'
+      on openSUSE: 'xorg-x11-libs'
+  * Please refer to the KMess board for more info, and specially to this guide: http://www.kmess.org/board/viewtopic.php?t=3100" )
+  ELSE( X11_FOUND )
+    MESSAGE( STATUS "NOTE: The auto-away feature is not supported on this platform yet." )
+  ENDIF( X11_FOUND )
+ENDIF( WANT_XSCREENSAVER )
+
+# Check for libkonq
+# QUIET is to fix compiling on systems like Debian Lenny, which don't have FindLibKonq.cmake
+#   (for an optional feature, we don't want that to be fatal)
+MACRO_OPTIONAL_FIND_PACKAGE( LibKonq QUIET )
+MACRO_LOG_FEATURE( LIBKONQ_FOUND "LibKonq" "Integration with Konqueror context menu" "http://www.kde.org/" FALSE ""
+"  Optional context menu integration with Konqueror.
+  * You will need this package and the matching development package: for example, 'kmess' and 'kmess-dev' or 'kmess-devel'.
+  * Usually the package names for this library are:
+      on Ubuntu:   'libkonq5' and 'libkonq5-dev'
+      on openSUSE: 'libkonq5' and 'libkonq-devel'
+  * Please refer to the KMess board for more info, and specially to this guide: http://www.kmess.org/board/viewtopic.php?t=3100" )
+
+# Check for libgif
+INCLUDE( "cmake/giflib_hack.cmake" )
+MACRO_OPTIONAL_FIND_PACKAGE( GIF )
+MACRO_BOOL_TO_01( GIF_FOUND HAVE_LIBGIF )
+MACRO_LOG_FEATURE( GIF_FOUND "GIF" "Handwriting messages support" "http://sourceforge.net/projects/giflib/" FALSE ""
+"  Optional support to send handwriting messages compatible with Windows Live Messenger.
+  * You will need to install both the library and development packages of the GIF Library, giflib.
+  * Usually the package names for this library are:
+      on Ubuntu:   'libgif4' and 'libgif-dev'
+      on openSUSE: 'giflib' and 'giflib-devel'
+  * Please refer to the KMess board for more info, and specially to this guide: http://www.kmess.org/board/viewtopic.php?t=3100" )
+
+
+# Display the dependency collection results
+MACRO_DISPLAY_FEATURE_LOG()
+


 #### Configure build ####
@@ -42,7 +128,7 @@ INCLUDE_DIRECTORIES( ${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${LIBXM

 # Switch between the following two commands to force using a predefined version number
 # EXECUTE_PROCESS( COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/cmake/get-svn-version.sh OUTPUT_VARIABLE KMESS_VERSION )
-SET( KMESS_VERSION "2.0alpha2" )
+SET( KMESS_VERSION "2.0" )


 #### Define compiler flags ####
@@ -50,9 +136,14 @@ SET( KMESS_VERSION "2.0alpha2" )
 # Tune the debug build with even more flags
 # also see FindKDE4Internal.cmake for more defaults
 IF( CMAKE_COMPILER_IS_GNUCXX )
-  # skipped: -ansi -pendantic -Wfatal-errors -Wold-style-cast
+  # skipped: -ansi -pendantic -Wfatal-errors -Wold-style-cast -Wconversion
  SET( CMAKE_CXX_FLAGS_DEBUG     "-O0 -g -Wall" )
-  SET( CMAKE_CXX_FLAGS_DEBUGFULL "-O0 -g3 -fno-inline -Wall -Woverloaded-virtual -Wsign-compare -Wundef -Wconversion" )
+  SET( CMAKE_CXX_FLAGS_DEBUGFULL "-O0 -g3 -fno-inline -Wall -Woverloaded-virtual -Wsign-compare -Wundef" )
+  # the -fvisibility option makes symbols also visible to the KDE backtrace dumper, but
+  # the MinGW gcc doesn't seem to understand it well, so only add it if we're not on win32
+  IF( NOT WIN32 )
+    SET( CMAKE_CXX_FLAGS_DEBUGFULL "${CMAKE_CXX_FLAGS_DEBUGFULL} -fvisibility=default" )
+  ENDIF( NOT WIN32 )
 ENDIF( CMAKE_COMPILER_IS_GNUCXX )


@@ -65,7 +156,7 @@ ENDIF( CMAKE_COMPILER_IS_GNUCXX )
 # - relwithdebinfo  (release with debug info)
 # - minsizerel      (minsize release)
 # Uncomment the next line to always force building in full debug mode
-SET( CMAKE_BUILD_TYPE debugfull )
+#SET( CMAKE_BUILD_TYPE debugfull )

 # Enable the KMess debug output when compiling a debug build
 IF( CMAKE_BUILD_TYPE STREQUAL debugfull OR KMESS_DEBUG_OUTPUT EQUAL 1 )
@@ -75,12 +166,15 @@ ELSE( CMAKE_BUILD_TYPE STREQUAL debugfull OR KMESS_DEBUG_OUTPUT EQUAL 1 )
 ENDIF( CMAKE_BUILD_TYPE STREQUAL debugfull OR KMESS_DEBUG_OUTPUT EQUAL 1 )


-# Set a default value for relocatable binary support
-IF( KMESS_ENABLE_BINRELOC EQUAL 1 )
-  SET( KMESS_ENABLE_BINRELOC "1" )
-ELSE( KMESS_ENABLE_BINRELOC EQUAL 1 )
-  SET( KMESS_ENABLE_BINRELOC "0" )
-ENDIF( KMESS_ENABLE_BINRELOC EQUAL 1 )
+# Change symbol visibility, to obtain clearer KDE backtraces
+SET( __KDE_HAVE_GCC_VISIBILITY 0 )
+
+# Disable LikeBack if not needed
+IF( KMESS_DISABLE_LIKEBACK EQUAL 1 )
+  SET( KMESS_DISABLE_LIKEBACK "1" )
+ELSE( KMESS_DISABLE_LIKEBACK EQUAL 1 )
+  SET( KMESS_DISABLE_LIKEBACK "0" )
+ENDIF( KMESS_DISABLE_LIKEBACK EQUAL 1 )


 # Set a default installation path
@@ -88,6 +182,42 @@ IF( NOT CMAKE_INSTALL_PREFIX )
  SET( CMAKE_INSTALL_PREFIX "/usr" )
 ENDIF( NOT CMAKE_INSTALL_PREFIX )

+IF( CMAKE_USE_CPACK EQUAL 1 )
+  MESSAGE( STATUS "Enabling the CPack package target..." )
+  # source: http://www.vtk.org/Wiki/CMake:Packaging_With_CPack
+  INCLUDE( InstallRequiredSystemLibraries )
+  # the installer will be named ${PACKAGENAME}-{VERSIONMAJOR}.{VERSIONMINOR}.{VERSIONPATCH}-win32.exe.
+  # the installer will say "Welcome to the ${INSTALL_DIRECTORY} Setup Wizard and install to ${INSTALL_DIRECTORY} too, and
+  # put the program in start menu under the ${INSTALL_DIRECTORY} name.
+  # it will ask if ${PACKAGENAME} should be put in PATH.
+  SET( CPACK_PACKAGE_NAME "KMess" )
+  SET( CPACK_PACKAGE_DESCRIPTION_SUMMARY "KMess (package description)" )
+  SET( CPACK_PACKAGE_VENDOR "The KMess team" )
+  SET( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README" )
+  SET( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING" )
+  SET( CPACK_PACKAGE_VERSION_MAJOR "1" )
+  SET( CPACK_PACKAGE_VERSION_MINOR "0" )
+  SET( CPACK_PACKAGE_VERSION_PATCH "0" )
+  SET( CPACK_PACKAGE_INSTALL_DIRECTORY "KMess" )
+  IF( WIN32 AND NOT UNIX )
+    # There is a bug in NSI that does not handle full unix paths properly. Make
+    # sure there is at least one set of four (4) backslashes.
+    SET( CPACK_GENERATOR "NSIS" )
+    SET( CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/data/icons\\\\hi32-app-kmess.png" )
+    SET( CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\kmess.exe" )
+    SET( CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} KMess (display name)" )
+    SET( CPACK_NSIS_HELP_LINK "http:\\\\\\\\kmess.org" )
+    SET( CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\kmess.org" )
+    SET( CPACK_NSIS_CONTACT "project@kmess.org" )
+    SET( CPACK_NSIS_MODIFY_PATH ON )
+  ELSE( WIN32 AND NOT UNIX )
+    SET( CPACK_STRIP_FILES "bin/kmess" )
+    SET( CPACK_SOURCE_STRIP_FILES "" )
+  ENDIF( WIN32 AND NOT UNIX )
+
+  SET( CPACK_PACKAGE_EXECUTABLES "kmess" "KMess" )
+  INCLUDE( CPack )
+ENDIF( CMAKE_USE_CPACK EQUAL 1 )

 #### Other settings ####

@@ -96,10 +226,15 @@ CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/cmake/config-kmess.h.in ${CMAKE_CURR
 INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} )

 # continue in directories
-ADD_SUBDIRECTORY( src )
 ADD_SUBDIRECTORY( po )
 ADD_SUBDIRECTORY( data )
 ADD_SUBDIRECTORY( doc )
+ADD_SUBDIRECTORY( src )
+
+IF( LIBKONQ_FOUND )
+  ADD_SUBDIRECTORY( src/utils/kmess-send )
+ENDIF( LIBKONQ_FOUND )
+

 # Also add the tests if compiling in development mode
 IF( CMAKE_BUILD_TYPE STREQUAL debugfull AND KMESS_DEBUG_OUTPUT EQUAL 1 )
@@ -5,7 +5,7 @@
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = KMess
-PROJECT_NUMBER         = 2.0-alpha2
+PROJECT_NUMBER         = 2.0
 OUTPUT_DIRECTORY       = ./apidocs
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
@@ -25,8 +25,8 @@ ABBREVIATE_BRIEF       = "The $name class" \
 ALWAYS_DETAILED_SEC    = NO
 INLINE_INHERITED_MEMB  = NO
 FULL_PATH_NAMES        = YES
-STRIP_FROM_PATH        = 
-STRIP_FROM_INC_PATH    = 
+STRIP_FROM_PATH        =
+STRIP_FROM_INC_PATH    =
 SHORT_NAMES            = NO
 JAVADOC_AUTOBRIEF      = NO
 QT_AUTOBRIEF           = NO
@@ -35,7 +35,7 @@ DETAILS_AT_TOP         = NO
 INHERIT_DOCS           = YES
 SEPARATE_MEMBER_PAGES  = NO
 TAB_SIZE               = 2
-ALIASES                = 
+ALIASES                =
 OPTIMIZE_OUTPUT_FOR_C  = NO
 OPTIMIZE_OUTPUT_JAVA   = NO
 OPTIMIZE_FOR_FORTRAN   = NO
@@ -73,13 +73,13 @@ GENERATE_TODOLIST      = YES
 GENERATE_TESTLIST      = YES
 GENERATE_BUGLIST       = YES
 GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS       = 
+ENABLED_SECTIONS       =
 MAX_INITIALIZER_LINES  = 30
 SHOW_USED_FILES        = NO
 SHOW_DIRECTORIES       = NO
 SHOW_FILES             = YES
 SHOW_NAMESPACES        = YES
-FILE_VERSION_FILTER    = 
+FILE_VERSION_FILTER    =
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
@@ -89,7 +89,7 @@ WARN_IF_UNDOCUMENTED   = YES
 WARN_IF_DOC_ERROR      = YES
 WARN_NO_PARAMDOC       = YES
 WARN_FORMAT            = "$file:$line: $text"
-WARN_LOGFILE           = 
+WARN_LOGFILE           =
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
@@ -104,13 +104,13 @@ EXCLUDE                = *.moc \
                         *.moc.h
 EXCLUDE_SYMLINKS       = NO
 EXCLUDE_PATTERNS       = */build*/*
-EXCLUDE_SYMBOLS        = 
-EXAMPLE_PATH           = 
+EXCLUDE_SYMBOLS        =
+EXAMPLE_PATH           =
 EXAMPLE_PATTERNS       = *
 EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             = 
-INPUT_FILTER           = 
-FILTER_PATTERNS        = 
+IMAGE_PATH             =
+INPUT_FILTER           =
+FILTER_PATTERNS        =
 FILTER_SOURCE_FILES    = NO
 #---------------------------------------------------------------------------
 # configuration options related to source browsing
@@ -128,7 +128,7 @@ VERBATIM_HEADERS       = YES
 #---------------------------------------------------------------------------
 ALPHABETICAL_INDEX     = NO
 COLS_IN_ALPHA_INDEX    = 4
-IGNORE_PREFIX          = 
+IGNORE_PREFIX          =
 #---------------------------------------------------------------------------
 # configuration options related to the HTML output
 #---------------------------------------------------------------------------
@@ -144,8 +144,8 @@ GENERATE_DOCSET        = NO
 DOCSET_FEEDNAME        = "Doxygen generated docs"
 DOCSET_BUNDLE_ID       = org.doxygen.Project
 HTML_DYNAMIC_SECTIONS  = NO
-CHM_FILE               = 
-HHC_LOCATION           = 
+CHM_FILE               =
+HHC_LOCATION           =
 GENERATE_CHI           = NO
 BINARY_TOC             = NO
 TOC_EXPAND             = NO
@@ -163,8 +163,8 @@ LATEX_CMD_NAME         = latex
 MAKEINDEX_CMD_NAME     = makeindex
 COMPACT_LATEX          = NO
 PAPER_TYPE             = a4wide
-EXTRA_PACKAGES         = 
-LATEX_HEADER           = 
+EXTRA_PACKAGES         =
+LATEX_HEADER           =
 PDF_HYPERLINKS         = NO
 USE_PDFLATEX           = NO
 LATEX_BATCHMODE        = NO
@@ -176,8 +176,8 @@ GENERATE_RTF           = NO
 RTF_OUTPUT             = rtf
 COMPACT_RTF            = NO
 RTF_HYPERLINKS         = NO
-RTF_STYLESHEET_FILE    = 
-RTF_EXTENSIONS_FILE    = 
+RTF_STYLESHEET_FILE    =
+RTF_EXTENSIONS_FILE    =
 #---------------------------------------------------------------------------
 # configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -190,8 +190,8 @@ MAN_LINKS              = NO
 #---------------------------------------------------------------------------
 GENERATE_XML           = NO
 XML_OUTPUT             = xml
-XML_SCHEMA             = 
-XML_DTD                = 
+XML_SCHEMA             =
+XML_DTD                =
 XML_PROGRAMLISTING     = YES
 #---------------------------------------------------------------------------
 # configuration options for the AutoGen Definitions output
@@ -203,37 +203,37 @@ GENERATE_AUTOGEN_DEF   = NO
 GENERATE_PERLMOD       = NO
 PERLMOD_LATEX          = NO
 PERLMOD_PRETTY         = YES
-PERLMOD_MAKEVAR_PREFIX = 
+PERLMOD_MAKEVAR_PREFIX =
 #---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
+# Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
 ENABLE_PREPROCESSING   = YES
 MACRO_EXPANSION        = NO
 EXPAND_ONLY_PREDEF     = NO
 SEARCH_INCLUDES        = YES
-INCLUDE_PATH           = 
-INCLUDE_FILE_PATTERNS  = 
+INCLUDE_PATH           =
+INCLUDE_FILE_PATTERNS  =
 PREDEFINED             = KMESSTEST \
                         KMESS_NETWORK_WINDOW
-EXPAND_AS_DEFINED      = 
+EXPAND_AS_DEFINED      =
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
-# Configuration::additions related to external references   
+# Configuration::additions related to external references
 #---------------------------------------------------------------------------
-TAGFILES               = 
+TAGFILES               =
 GENERATE_TAGFILE       = kmess.tag
 ALLEXTERNALS           = NO
 EXTERNAL_GROUPS        = YES
 PERL_PATH              = /usr/bin/perl
 #---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
+# Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 CLASS_DIAGRAMS         = NO
-MSCGEN_PATH            = 
+MSCGEN_PATH            =
 HIDE_UNDOC_RELATIONS   = YES
 HAVE_DOT               = YES
 DOT_FONTNAME           = FreeSans
-DOT_FONTPATH           = 
+DOT_FONTPATH           =
 CLASS_GRAPH            = YES
 COLLABORATION_GRAPH    = YES
 GROUP_GRAPHS           = YES
@@ -246,8 +246,8 @@ CALLER_GRAPH           = NO
 GRAPHICAL_HIERARCHY    = YES
 DIRECTORY_GRAPH        = NO
 DOT_IMAGE_FORMAT       = png
-DOT_PATH               = 
-DOTFILE_DIRS           = 
+DOT_PATH               =
+DOTFILE_DIRS           =
 DOT_GRAPH_MAX_NODES    = 50
 MAX_DOT_GRAPH_DEPTH    = 1000
 DOT_TRANSPARENT        = NO
@@ -255,6 +255,6 @@ DOT_MULTI_TARGETS      = YES
 GENERATE_LEGEND        = YES
 DOT_CLEANUP            = YES
 #---------------------------------------------------------------------------
-# Configuration::additions related to the search engine   
+# Configuration::additions related to the search engine
 #---------------------------------------------------------------------------
 SEARCHENGINE           = NO
@@ -1,22 +1,23 @@
 KMess Feature list
 ========================
 - 2.0 -
-Support to receive and send Ink (hand-written) messages.
-Support to send huge messages.
-Options to copy a contact's email, name, message, listened music and links present in the name/message
+Support to receive and send hand-written (Ink) messages (still doesn't work with some Messengers).
+Options to copy a contact's email, name, message, listened music and links present in the name/message.
 List of contact events, such as logins and logouts.
-Chat Windows can be used again when reconnecting.
+Chat Windows can be used again after reconnecting.
 Quick retype of previous sent messages, using Ctrl+Up/Ctrl+Down.
 MSN connections over HTTP, to deal with corporate firewalls which only allow connections to browse the web.
 Support to chat with offline and invisible contacts.
 Support to search in the contact list.
-Support to send bigger chat messages.
+Support to send longer chat messages.
+Option to hide annoying contact emoticons.
 Option to choose the browser used to open web sites, Live Mail, and MSN support sites.
 Option to manually send commands to the server in developer builds.
 Support to group all chats in the same chat window (tabbed chatting).
 Option to select a directory where all received files will be put.
 Option to choose the interval of ports used for fast file transfers.
 Option to keep short notes for each contact.
+Option to hide annoying contact emoticons.
 Support to MSN Plus text formatting.
 Support for DBus remote application control.
 Option to choose a previously chosen display picture.
@@ -26,6 +27,7 @@ Support for KDE's KWallet, to store in a secure way the accounts passwords.
 Automatic detection of network connection and disconnection.
 Option to block notifications when the status is set to Busy.
 Option to disable displaying of received winks.
+Automatic reconnection to MSN after unwanted disconnections with keeping of last status.

 - 1.5.1 -
 Contact's MSN client detection.
@@ -96,4 +98,4 @@ Chats can be configured to show timestamps when contacts send messages.
 A "compact" chat format can be used to remove extraneous line breaks and reduce the size of the chat.
 The chat window caption in the taskbar alternates between lower and upper case to inform the user of a received message when the window is not on top.
 Internationalization support, with translations in: English, Dutch, German, Italian, Portuguese, Spanish, Turkish, Chinese, French, Catalan, Arabic, Korean, Norsk, Thai, Danish, and Estonian
-There is now a method, though not absolute, to tell if a contact is blocking you. If a chat is started with a contact that appears offline, you will be informed if the contact is offline or online and blocking you. 
+There is now a method, though not absolute, to tell if a contact is blocking you. If a chat is started with a contact that appears offline, you will be informed if the contact is offline or online and blocking you.
@@ -1,242 +1,61 @@

-Installation Tip:
-=================
+Installation Hints:
+===================

  NOTE: This package is used to build KMess from source code.
        If you're looking for a simple way to install KMess,
-		take a look at http://www.kmess.org/download/.
+        take a look at http://www.kmess.org/download/.
+
+  NOTE: These instructions are meant for UNIX-like systems. If they don't
+        work for you, please tell us at http://www.kmess.org/board/.
+        For building on Windows, see this Wiki page:
+        http://trac.kmess.org/wiki/Compiling%20KMess%20for%20Windows

 To install KMess from this source package you need to create a separate
-build directory first. It must be created outside the source folder.
+build directory first. It must be created outside the source folder. After
+that, you must configure your build using cmake.

-  mkdir kmess2-build
-
-Then configure your build using cmake,
-and point to the source folder:
-
-  cd kmess2-build
-  cmake ../kmess2
-
-If the cmake scripts did not display any errors, you can run:
+To ease the building process, KMess comes with a 'configure' script that
+creates the directory and runs CMake for you. To build this package, simply
+run:

+  cd kmess
+  ./configure
  make

-and then, as root, type
+To install on most systems, you can run:

-  make install
+  sudo make install
+
+If your system doesn't come with sudo, you can use:
+
+  su -c 'make install'

 That's it!
+Of course, building without the configure script is also possible:

+  mkdir build
+  cd build
+  cmake ..
+  make
+  sudo make install

+Useful parameters:
+==================

-Useful cmake parameters:
-========================
+The configure script automatically makes the right build for you. For a release (non-alpha or beta)
+package, the configure script builds KMess in release mode; for an alpha or beta package, KMess will
+run in debug mode. When something goes wrong, debug mode will help us find the cause, and fix it. :-)

-Try the following switches the change the build.
+If you want to modify your build, you can try the following options to the configure script:

-D CMAKE_INSTALL_PREFIX=/usr
+--prefix=/usr

  Install in the /usr directory instead.

-D CMAKE_BUILD_TYPE=[none,debug,debugfull,release,relwithdebuginfo,minsizerel]
+--build-type=(one of debug,debugfull,release,relwithdebuginfo,minsizerel)

-  Set the preferred build type, which sets recommended compiler flags automatically.
+  Tell CMake to build this specific build type.

 Also consider running "ccmake" for an curses-interface to cmake.
-That only works after the build directory is configured with cmake before.
-
-
-
-
-* * * * * * The parts below do not apply to KMess 2 yet! * * * * * *
-
-
-
-Important:
-==========
-
-The configure script tries to detect your KDE3 directory automatically.
-If configure fails to detect KDE, you should tell KMess which directory
-to use.  Basically, we're talking about the parent directory
-of /share/apps/k~bunch of kapps~
-
-Not doing this will result in emoticons being displayed
-as text, and icons being displayed incorrectly as well.
-
-If configure tells you you're missing something that you think you
-have installed on your system, you probably need to install the
-"devel" version of that thing.  i.e. If it tells you you're missing
-libfam, install the libfam-devel rpm.
-
-More information can be found in the README file.
-The following paragraphs below provide generic installation instructions:
-
-
-
-Basic Installation
-==================
-
-   These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
-
-   The file `configure.in' is used to create `configure' by a program
-called `autoconf'.  You only need `configure.in' if you want to change
-it or regenerate `configure' using a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes a while.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Type `make install' to install the programs and any data files and
-     documentation.
-
-  4. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  You can give `configure'
-initial values for variables by setting them in the environment.  Using
-a Bourne-compatible shell, you can do that on the command line like
-this:
-     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
-
-Or on systems that have the `env' program, you can do it like this:
-     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not supports the `VPATH'
-variable, you have to compile the package for one architecture at a time
-in the source code directory.  After you have installed the package for
-one architecture, use `make distclean' before reconfiguring for another
-architecture.
-
-Installation Names
-==================
-
-   By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
-     CPU-COMPANY-SYSTEM
-
-See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
-
-   If you are building compiler tools for cross-compiling, you can also
-use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Operation Controls
-==================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--cache-file=FILE'
-     Use and save the results of the tests in FILE instead of
-     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
-     debugging `configure'.
-
-`--help'
-     Print a summary of the options to `configure', and exit.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--version'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`configure' also accepts some other, not widely useful, options.
-
+ccmake only works after the build directory has been configured with cmake before.
@@ -1,44 +1,224 @@

-Changes between KMess SVN and 2.0-alpha2:
+Changes between KMess 2.0 and 2.0-rc1:
 --------------------------------------
+- updated German translation by Panagiotis Papadopoulos.
+- updated Simplified Chinese translation by Cheng Yang.
+
+Changes between KMess 2.0-rc1 and 2.0-beta2:
+--------------------------------------
+- added Japanese translation by Daniel E. Moctezuma.
+- added display of emoticons in presence messages.
+- added status restoring on reconnection.
+- added fading effect for long text labels and the contact list.
+- changed the image used for unknown display pictures.
+- changed the application windows icons.
+- changed the system tray icon with one showing both the bird and the current
+  status.
+- fixed a crash triggered by clients aborting while we're sending data.
+- fixed appearance when using right-to-Left languages, like Arabic.
+- fixed bug preventing temporary accounts to be correctly cleaned up.
+- fixed file selection errors in chat logging.
+- fixed newly added contacts appearing as not having added the user in their
+  list.
+- improved appearance of the contact list when antialiasing is enabled.
+- removed all experimental features which could not be finished in time.
+- updated Arabic translation by Ma'moun Diraneyya.
+- updated Brazilian Portuguese translation by Maurício Arozi Moraes and Sergio
+  Rafael Lemke.
+- updated Catalan translation by Adrià Arrufat.
+- updated Finnish translation by Antony Hussi.
+- updated Dutch translation by Sander Pientka and Sjors Gielen.
+- updated French translation by Scias.
+- updated German translation by Panagiotis Papadopoulos.
+- updated Greek translation by Dimitrios Glentadakis.
+- updated Hungarian translation by Pauli Henrik.
+- updated Italian translation by Valerio Pilo.
+- updated Slovak translation by Rastislav Krupanský.
+- updated Spanish translation by Mauricio Muñoz Lucero.
+- updated Simplified Chinese translation by Cheng Yang.
+- updated Traditional Chinese translation by Yen-chou Chen.
+
+Changes between KMess 2.0-beta2 and 2.0-beta1:
+--------------------------------------
+- completed drag&drop support.
+- fixed quick retype.
+- fixed winks playing and naming support.
+- fixed disconnections after many hours of use.
+- fixed losing KDE Wallet passwords.
+- fixed typing notifications not appearing in WLM 2009.
+- fixed long words breaking was breaking copy-pastes.
+- fixed weird characters which were breaking the chat styles.
+- fixed resending messages already sent as offline messages.
+- fixed searching for offline contacts.
+- fixed time of arrival of offline messages.
+- fixed new chat windows or tabs opened by contacts sometimes stole focus.
+- fixed contact list group sorting.
+- fixed many memory leaks.
+- fixed overflowing contact list background picture and color.
+- improved the Chat History dialog and its integration with KMess.
+- improved drag and drop support in contact list.
+- improved the color of the less important contact status messages in chat.
+- improved client detection support.
+- improved handwriting message sending.
+- improved the file transfers window's behavior.
+- improved chat session management.
+- improved the LikeBack buttons bar.
+- updated English handbook.
+- updated Arabic translation by Ma'moun Diraneyya.
+- updated Brazilian Portuguese translation by Sergio Rafael Lemke.
+- updated Brazilian Portuguese translation by Maurício Arozi Moraes.
+- updated Catalan translation by Adrià Arrufat.
+- updated Dutch translation by Heimen Stoffels.
+- updated Dutch translation by Sander Pientka.
+- updated Finnish translation by Antony Hussi.
+- updated French translation by Barthe Guillaume.
+- updated French translation by Scias.
+- updated German translation by Panagiotis Papadopoulos.
+- updated Greek translation by Dimitrios Glentadakis.
+- updated Italian translation by Andrea Decorte.
+- updated Spanish translation by Manuel Ramírez.
+- updated Spanish translation by Mauricio Muñoz Lucero.
+- updated Traditional Chinese translation by Yen-chou Chen.
+- updated Traditional Chinese translation by the Tryneeds-Chinese Translation Platform.
+
+Changes between KMess 2.0-beta1 and 2.0-alpha2:
+--------------------------------------
+- added support to start chats while you're invisible.
+- added automatic reconnection after unwanted disconnections.
+- added IRC like command handling in the chat window (/away, etc..)
+- added 'Send with KMess' menu item to Konqueror context menu's.
+- added verbose status message when KMess fallbacks to the HTTP connection.
+- added contact emoticon blacklist, to block annoying custom emoticons from contacts.
+- added Likeback support to collect user feedback, ported from Basket of KDE 3.
+- added support to configure the toolbars and menus in the chat window.
+- added contact list export dialog.
+- added context menu to the contact list, to open the contact menu with the left mouse too.
+- added confirmation dialogs when the menu gets hidden with Ctrl+M.
+- added confirmation dialogs when deleting custom emoticons.
+- added confirmation dialogs when deleting old display pictures.
+- added filtering options to the file transfer window, to show downloads/uploads only.
+- added Greek translation by Panagiotis Papadopoulos.
+- added Serbian translation by Zoran Milovanović.
+- added Slovak translation by Rastislav Krupanský.
+- improved protocol support, upgraded the server core protocol to MSNP15.
+- improved user interface of the main login dialog, added links.
+- improved overall user interface with further fine tuning.
+- improved KDE session restoring; KMess will reconnect if you were connected at logout.
+- improved chat notifications to be compatible with the new Plasma notifications of KDE 4.2.
+- improved emoticon panels; users can choose between message editors or permanent sidebar panels.
+- improved painting controls for the Ink handwriting.
+- improved chat logging support (support XML, TXT output) in preparation of a chat logging browser.
+- improved chat autoscroll feature.
+- improved chat window status bar.
+- improved several English messages in the user interface.
+- improved reporting of error messages, using notifications for warnings.
+- improved cmake detection of libqca2-plugin-ossl package for Ubuntu.
+- changed contact sidebar, clicking the contact always shows the context menu.
+- fixed multiple bugs with automatic reconnecting.
+- fixed blocked login view when there is no network connection.
+- fixed saving passwords when the 'save password' account option is off.
+- fixed saving passwords when KWallet is not supported, or the user refused to use it.
+- fixed contact list group expanding/collapsing with incremental search.
+- fixed contact list sorting and grouping.
+- fixed context menu to chat with a blocked/offline/allowed contact.
+- fixed double error box when adding a non-existing contact to the list.
+- fixed chat window focus issues.
+- fixed chat tabs for contacts with HTML characters in their name.
+- fixed chat tabs for contacts with long names.
+- fixed chat tabs being displayed when tabbed chatting is disabled.
+- fixed chat messages displayed in the wrong tab.
+- fixed chat message wordwrapping for long unbreakable words.
+- fixed chat spell checker setting, the setting was not remembered correctly.
+- fixed typing messages for tabbed chats.
+- fixed adding custom emoticons from the chat window sidebar.
+- fixed and improved shortcut keys to switch between chat tabs, start a chat, etc...
+- fixed layouting issue in the Classic Compact chat style.
+- fixed displaying a 'contact left chat' message twice if there was no conversation in between.
+- fixed unclickable display picture in the chat if the contact is offline.
+- fixed invalid dates being displayed for contact properties.
+- fixed updating the chat windows after an emoticon theme is changed.
+- fixed updating the chat style preview when "Group follow up messages" is toggled.
+- fixed start folder of the file browser for account pictures.
+- fixed displaying the filename for files transferred with the old MSNFTP protocol.
+- fixed cancel link not being removed when a file transfer invitation hit the timeout
+- fixed notification default settings.
+- fixed missing nudge event in the notification settings.
+- fixed missing detection of "Windows Media Center" in the list of known MSN clients.
+- fixed now listening icon, using a common icon now.
+- fixed now listening support, added support for all MPris-compatible players.
+- fixed inconsistent order of the artist and track title in now Listening information.
+- fixed position of the red circle in the system tray screenshot.
+- fixed protocol support of group chats.
+- fixed protocol support of the MSN-HTTP fallback.
+- fixed protocol support of MSNP2P by Windows Live Messenger 2009, should fix picture/emoticon transfers.
+- fixed protocol support of MSN Plus! markup, displaying contact names incorrectly at various places.
+- fixed protocol support for resetting your Personal Message, was not recognized by Windows Live Messenger 2009.
+- fixed displaying of Offline-IM messages, wrong sender was displayed when receiving many messages.
+- fixed error handling for SOAP protocol errors.
+- fixed "view profile" pages with updated MSN website.
+- fixed crashes in the contact list model code.
+- fixed a crash when receiving MSN Plus! predefined messages.
+- fixed a crash with receiving files with the old MSNFTP protocol.
+- fixed an assertion crashing KMess caused by read-only configuration files with a KDE 4 debug build.
+- fixed compiling issues with KDE 4.0, 'KDE on Windows' and MinGW32.
+- fixed compiler warnings.
+- fixed adblock icons showing up by the embedded KHTMLPart component in the chat window.
+- fixed network code to use QNetworkAccessManager, this should give us proper Proxy support.
+- fixed browser invocation code, using KToolInvocation to have instant invocation.
+- fixed issues with network detection if Solid/NetworkManager is not available.
+- fixed removed translator name entries in the .po files; some languages appear to have translated names.
+- removed custom notification settings in favour of KNotify settings in the global settings panel.
+- updated English handbook by Heimen Stoffels.
+- updated Brazilian Portuguese translation by Leonel Freire.
+- updated Brazilian Portuguese translation by Sergio Rafael Lemke.
+- updated Dutch translation by Elve and Sander Pientka.
+- updated French translation by Barthe Guillaume.
+- updated German translation by Panagiotis Papadopoulos.
+- updated Greek translation by Panagiotis Papadopoulos, Dimitrios Glentadakis.
+- updated Hungarian translation by Pauli Henrik.
+- updated Italian translation.
+- updated Norsk Bokmal translation by Øyvind Sæther.
+- updated Simplified Chinese translation by Cheng Yang.
+- updated Spanish translation by Alexis Daniel Medina Medina, Juan Pablo González Tognarelli.
+- updated Swedish translation by Mattias Newzella.
+- updated Traditional Chinese translation by Yen-chou Chen, the Tryneeds-Chinese Translation Platform.


 Changes between KMess 2.0-alpha2 and 2.0-alpha:
 --------------------------------------
 - added connecting over HTTP, to deal with corporate firewalls which only allow connections to browse the web.
- added an history box in the contact list, to display recent contact events.
+- added tabbed chatting support!
 - added offline messaging functionality.
- added an application-wide settings dialog.
- added an account manager in the application-wide settings.
- added ability to search the contacts in contact list.
- added the ability to send huge messages.
- added option to copy the music a contact is listening to the clipboard.
- added option to choose the browser and e-mail client used to open Web links.
- added tabbed chatting support.
- added the ability to send ink messages.
- added a little button on the notification popups to allow closing them, other than the right-click.
- added an option to choose a default directory where to put all received files.
- added option to choose the interval of ports used for fast file transfers.
- added ability to keep short notes for each contact.
+- added the support to send ink messages.
+- added the support to send huge messages.
 - added full MSN Plus text-formatting support in chat and in the contact list.
- added a DBus remote control interface, to enable interaction with KMess from other applications.
- added options to switch a contact between groups from that contact's properties dialog.
- added dialog to choose a previously set display picture for the account.
- added a dark chat style suitable for use with dark KDE color themes.
- added option to choose the dimensions of the contact list pictures.
- added KWallet support to store in a secure way the passwords of the saved accounts.
+- added application-wide settings dialog, which includes an account manager.
+- added option to choose the interval of ports used for fast file transfers.
+- added option to change the groups of a contact from the contact's properties dialog.
+- added option to choose a previously set display picture for the account.
+- added option to choose the dimensions of the pictures in the contact list.
 - added option to specify where received files will be downloaded to.
+- added option to display all offline contacts in a single group ("mixed" group mode).
 - added option to hide currently empty groups.
- added option to display online contacts divided by group along with offline contacts all grouped in the offline group.
- added detection of network connection availability.
 - added option to block notifications when the status is set to Busy.
 - added option to disable displaying of received winks.
- added the date of the last received message from a contact.
+- added option to choose a default directory where to put all received files.
+- added option to choose the browser and e-mail client used to open Web links.
+- added copy menu entry for the music a contact is listening.
+- added a dark chat style suitable for use with dark KDE color themes.
+- added ability to keep short notes for each contact.
+- added a search box in the contact list.
+- added an history box in the contact list, which displays recent contact events.
+- added a close button on the notification popups (for people who don't know about right-click to close).
+- added a DBus remote control interface, to enable interaction with KMess from other applications.
+- added KWallet support to store in a secure way the passwords of the saved accounts.
+- added detection of network connection availability, using Solid.
+- added tracking of the 'last seen' and 'last chat message' dates for a contact.
 - improved reporting of error messages.
 - improved the user interface of many dialogs.
 - improved the Now Playing support with Amarok 2 support. Amarok 1.4 is still supported.
- improved the way the file transfer messages are displayed within the chat.
- improved the auto-message feature by displaying the automessage more often.
+- improved the file transfer messages within the chat.
+- improved the auto-message feature, displays the automessage more often.
 - fixed displaying old contact names and no personal messages after login.
 - fixed loading emoticon themes containing non-PNG picture files.
 - fixed compatibility and styling issues with dark KDE color schemes.
@@ -67,7 +247,7 @@ Changes between KMess 1.5.2 and 1.5.1:
 - fixed displaying old contact names after login.
 - fixed enabled auto-away settings if the XScreenSaver extension was not found.
 - fixed a bug which caused a disconnection when setting an extremely long nickname.
- fixed a bug which discarded saved settings for an account when quitting and when just disconnecting. 
+- fixed a bug which discarded saved settings for an account when quitting and when just disconnecting.
 - fixed a bug which prevented non-PNG emoticon themes from loading.
 - fixed a crash in debug builds for unknown contacts.
 - fixed a possible crash in the passive popups.
@@ -2,251 +2,23 @@
 About KMess:
 ============

-KMess is a MSN Messenger clone for Linux. It enables Linux users
-to chat with friends online who are using MSN Messenger in
-Windows or Mac OS. The strength of KMess is it's integration
-with the KDE desktop environment, focus on MSN Messenger
-specific features and an easy-to-use interface.
+KMess is a Windows Live Messenger client for Linux. It enables
+Linux, Mac and even Windows users to chat with friends online
+who are using the official Messenger client for Windows. The
+strengths of KMess are its integration with the KDE desktop
+environment, its focus on Live Messenger specific features
+and an easy-to-use interface.

 Like many Linux and KDE applications, KMess is free software.
 The licensing terms are the GNU General Public License.



-Installation Tip:
+Installing KMess:
 =================

-  NOTE: This package is used to build KMess from source code.
-        If you're looking for a simple way to install KMess,
-        take a look at http://www.kmess.org/download/.
-
-First configure your build using the configure script:
-
-  ./configure
-
-If everything went well, you can run:
-
-  make
-
-and then, as root, type
-
-  make install
-
-That's it!
-
-
-
-Compiling with cmake:
-=====================
-
- * * this is for experienced users only * *
-
-KMess 2 is KDE 4 software, which uses 'cmake' to build the software.
-To make it a bit more familiar for you, we have created a 'configure'
-script which does all the cmake magic behind the scenes.
-
-It's also possible to use 'cmake' directly.
-The build commands become a little bit different.
-
-First, you need to create a separate build directory:
-
-  mkdir build
-
-Then configure your build using cmake,
-and point to the source folder:
-
-  cd build
-  cmake ../
-
-You can provide extra parameters with the '-D' option, see below.
-If the cmake scripts did not display any errors, you can run:
-
-  make
-
-and then, as root, type
-
-  make install
-
-
-
-Useful cmake parameters:
-========================
-
-Try the following switches to change the build.
-
-D CMAKE_INSTALL_PREFIX=/usr
-
-  Install in the /usr directory instead (default is /usr/local).
-
-D CMAKE_BUILD_TYPE=[none,debug,debugfull,release,relwithdebuginfo,minsizerel]
-
-  Set the preferred build type, which sets recommended compiler flags automatically.
-
-D KMESS_DEBUG_OUTPUT=[1,0]
-
-  Activates/deactivates KMess debugging output to console, even on release builds.
-  This flag is automatically enabled when the build type is "debugfull".
-
-D KMESS_ENABLE_BINRELOC=[1,0]
-
-  Enable support for binary relocatable binaries. This allows the binary
-  to find it's resource files whatevery directory it is installed in.
-
-G "MinGW Makefiles"
-
-  This option is required to build KMess on Windows (still experimental).
-  See http://trac.kmess.org/wiki/Compiling%20KMess%20for%20Windows for details.
-
-If you find this too difficult, consider using our "./configure" script
-instead. This is a wrapper these 'cmake' arguments to make it easier,
-and more familiar, to compile software.
-
-Also consider running "ccmake" for an curses-interface to cmake.
-That only works after the build directory is configured with cmake before.
-
-
-
-
-
-* * * * * * The parts below do not apply to KMess 2 yet! * * * * * *
-
-
-
-Important:
-==========
-
-The configure script tries to detect your KDE3 directory automatically.
-If configure fails to detect KDE, you should tell KMess which directory
-to use.  Basically, we're talking about the parent directory
-of /share/apps/k~bunch of kapps~
-
-Not doing this will result in emoticons being displayed
-as text, and icons being displayed incorrectly as well.
-
-
-
-Troubleshooting
-===============
-
-The following packages are required to install KMess:
- make
- gcc
- gcc-c++ (if available)
- qt
- kdelibs
-
-
-If your distribution uses separate "devel" or "dev" packages,
-make sure you have these packages installed also:
-  - qt-devel         (or qt3-devel)
-  - kdelibs-devel    (or kdelibs3-devel)
-  - x-devel          (or xfree-devel/xorg-x11-devel)
-  - libstdc++-devel
-
-
-Likely the dependencies of these "devel" packages will
-be installed automatically. Some worth mentioning are:
-  - fontconfig-devel
-  - freetype2-devel
-  - libfam-devel     (or fam-devel)
-  - libjpeg-devel
-  - libpng-devel
-  - zlib-devel
-  - libart_lgpl-devel
-
-
-If configure tells you you're missing something that you think you
-have installed on your system, you probably need to install the
-"devel" package of that thing.
-
-  i.e. If it tells you you're missing libfam, install the libfam-devel rpm.
-
-
-If you get this error:
-  ''configure: error: no acceptable C compiler found in $PATH''
-you need to install the packages "gcc" and "make".
-
-
-If you get this error:
-  ''Your Installation isn't able to compile simple C++ programs.''
-you need to install "libstdc++-devel" and some distributions
-also require a "gcc-c++" package for C++ support.
-
-
-If you get this error:
-  ''error: Can't find X includes. Please check your installation [...]''
-you need to install the x developer packages. Depending on your distribution,
-this can be something like "x-devel", "xfree-devel", "xorg-devel".
-
-
-If you get this eror:
-  ''checking for libz... configure: error: not found.''
-you need to install the "zlib-devel" package.
-
-
-If you get this error:
-  ''configure: WARNING: libjpeg not found. disable JPEG support.''
-you need to install the "libjpeg-devel" package.
-
-
-If you get this error:
-  ''checking for Qt... configure: error:
-    Qt (>= Qt 3.1 (20021021)) (headers and libraries) not found.
-    Please check your installation!''
-you need to install the "qt-devel" (or "qt3-devel") package.
-
-
-If you get this error:
-  ''checking for KDE... configure: error:
-    in the prefix, you've chosen, are no KDE headers installed. This will fail.
-    So, check this please and use another prefix!''
-you need to make sure "kdelibs-devel" (or "kdelibs3-devel") is installed!
-
-
-
-
-
-Installing from SVN:
-====================
-
-If there is any need to install the SVN version, read on.
-
-The KMess SVN repository contains the latest changes made to KMess.
-Each new feature or bugfix will be stored into SVN by developers.
-The code in SVN will eventually become the new KMess release.
-
-   NOTE: The SVN version is the equivalent
-   of an "alpha" or "beta" release; there also is
-   a little possibility that it won't even compile!
-
-To install KMess from SVN you need to have the packages "autoconf"
-and "automake" installed.
-
-
-To download the SVN version, run these commands:
-
-  svn checkout http://kmess.svn.sourceforge.net/svnroot/kmess/trunk/kmess/
-
-If the download succeeds, run this command:
-
-  make -f Makefile.dist
-
-This will generate the ./configure script and Makefile templates.
-Then you can proceed with the normal installation.
-
-
-Each time the SVN version is updated, you can run
-
-  svn update
-  make -f Makefile.dist
-  ./configure
-  make
-  make install
-
-and you'll have the latest KMess version installed.
-
-For more information about accessing the KMess SVN repository,
-visit the KMess site at http://kmess.org/svn/ .
+Please see the INSTALL file for help with compiling and installing
+KMess from source.



@@ -263,16 +35,14 @@ This is what you need to do:
  - Open the language "po" file, and start translating!
    Also watch for translations marked as "fuzzy",
    they often need updating.
-  - The the following commands in the "po" folder:
-      make
-      make install
-      (if this doesn't work, run configure first)
+  - Update the translations.
  - Test the new translation.
    (to test other languages, run 'KDE_LANG=<code> kmess')
-  - Contact the KMess developers.
+  - Contact the KMess developers to send your changes!

 A more detailed tutorial can be found online
-at http://www.kmess.org/translating/
+at http://trac.kmess.org/wiki/Translating%20KMess
+


 Building RPM Packages
@@ -287,7 +57,7 @@ To build a RPM package for your distribution, run:
 Building Slackware Packages
 ===========================

-To build a TGZ package for Slackware, also run:
+To build a TGZ package for Slackware, run:

  rpmbuild -tb kmess-2.0.tar.gz

@@ -1,205 +1,9 @@


-  Please note this file is replaced by an online Trac installation.
-  Our trac installation can be found at: http://trac.kmess.org/
+For bugs, future ideas, et cetera, please check our developer site
+powered by trac at http://trac.kmess.org/.

-  If you're looking for junior jobs, you may also contact us
-  at the KMess help forums.
+If you're looking for junior jobs, you may also contact us at the
+KMess help forums: http://kmess.org/board/

-  Thanks
-
-
-
-To do:
-======
-
-Unfinished new features:
-___ Invite contacts for a new chat session when the current chat is used for file transfers.
-___ Invite contacts for a new chat session when the current chat has multiple participants (display dialog to choose the contact).
-___ Change mouse cursor when hovering over the "personal status message" widget, make non-active background color less dark.
-___ Lookup all "TODO" items in the code.
-
-Unfinished protocol features:
-___ Integrate UPnP support with file transfer invitation code.
-___ Make sure KMess can send two files at once with the classic file transfer method (test this).
-___ Support a SLP Decline/error message for a sent P2P/SLP transfer invitation, and continue to transfer over the switchboard.
-___ Support a second invitation for file transfers, detect when remote client only returns it's internal IP or does not listen.
-___ Detect network settings, make the other client server for file transfer (sending a second transfer-invite).
-___ Update the classic FileTransfer application to use the new async-cnnect, DirectConnectionPool and showTransfer*() API.
-
-Critical bugs:
-___ Restore the documentation
-___ Restore the translations
-
-Junior jobs:
-___ Improve wink playing, include preview, offer "play" button (also see other showWink() issues). Also fixes issues when chat is started with a wink.
-___ Implement phone settings (PRP and BPR fields).
-___ Implement privacy settings (GTC and BLP fields, messages like "can't chat with invited contact" because not in the AL).
-___ Add the ability to select another browser for opened links, instead of the kde's default browser.
-... And if you're up for a challenge, you could try one of the "Low priority protocol features" below too.
-... Or try to implement a new MSN feature (see "Future ideas" section).
-
-Annoying bugs:
-___ Fix repeated picture transfer invitations when contact declines or aborts the invitation (preferably disable only for a few minutes).
-___ Automatically clean up the displaypics folder, and msnpicture-alias-##.png images that are older then 1 month.
-___ Add detection for NAK responses to file transfer invitations
-___ Improve performance of restyling the chat window: combine xml to one string.
-___ Contact list items flicker, specially when there are a lot of contacts.
-
-Low-priority features:
-___ Improve wink processing messages of `cabextract` output in ChatWindow::showWink().
-___ When chat window closes, inform user the file transfers will also abort.
-___ See what happens when there is a picture transfer in a multi-chat, and one of the chats becomes buzy.
-___ Improve the parsing of *bold* /italics/ and _underline_, so http:/website/ does not become italic and avoid mangling <a href="http://website/"> to <a href="http:/<i>/website/</i>">.
-___ Disable cut/copy for the password line (InitialViewInterface, not using KPasswordEdit because it disables too much).
-___ When opening chat windows, shift their position to make them cascade.
-
-Low-priority code changes:
-___ Add Application::get..TransferAbortMessage().
-___ Only allow plugins/non-local files temporary when displaying winks?
-___ Implement Application::attachToChat(..) feature to improve aborting?
-___ Create a WinkArchive class for the code in ChatWindow::showWink().
-___ Include contact meta-data in receivedMessage() call of ChatWindow::showWink().
-___ Use kdWarning() instead of kdDebug() << "WARNING", for warning messages.
-___ Use if(KMESS_NULL(..)) checks instead of current if(.. != 0) { .. }
-___ Move utility classes to a separate folder.
-___ Put TcpConnectionBase under MsnConnection.
-___ Remove all #includes for <kdebug.h> and replace it with "kmessdebug.h" (watch for inclusions from subdirs)
-
-Low-priority protocol features:
-___ Support adding contacts to multiple groups.
-___ Detect multiple external IP addresses to advertise in file transfer invite message.
-___ Support sending the data-preparation ACK later with Windows Live Messenger picture transfers.
-___ Support direct connection setups when requesting contact pictures.
-___ Support aborting the data-preparation, also detect when contact does this.
-___ Support the datacast emulation over MSNP2P for MSNC1-compatible clients (for winks).
-___ Test whether applications need to be aborted when the switchboard reconnects.
-___ Check P2P incomingMessages_ / outgoingMessages_ cache for timeouts.
-___ Leave a P2PApplication half-open to receive a final error message.
-___ Use "URL PERSON/PROFILE" settings.
-
-Wishes by users for 1.5:
-___ Compact sidebar list as described in http://www.kmess.org/board/viewtopic.php?t=460
-    (make it optional, let the user choose between "no", "compact", "full")
-___ Maybe: improve chat window layout like http://kde-apps.org/content/show.php?content=24461
-    (looks more clean, though it's a bit kmerlin like though, and the current pictures list is not that bad for multi-chat) - Being worked on
-___ Group off-line contacts in one single group.
-___ Group chats: use more compact contact frame.
-___ Account menu's: only show submenu when there are multiple accounts.
-___ XMMS2 now listening: http://www.kmess.org/board/viewtopic.php?t=1569 (use relaytool from autopackage.org for that).
-
-Wishes by users for 1.6:
-___ Tabbed chats.
-
-Open for discussion:
-___ Order of the title in the main window, account before or after. Should distinguish from the chat windows though.
-
-Implemented for 1.5:
-_Y_ Implement text/x-clientcaps message and MsnObject name to advertise KMess to other third-party messengers.
-_Y_ Add a checkbox to the settingspanel to disable the shaking window effect.
-_Y_ Support emoticons folder with KDE 3.3
-_Y_ Support "now playing" by other contacts, use dcop for our status.
-_Y_ Handle closed direct connection, KMess keeps using the direct connection.
-_Y_ Implement i18n() for chat styles, e.g. use libxml to replace all text nodes, create an XSLT to extract all text nodes.
-_Y_ Fix the memory-leak of sentMessages_ for chat messages, these are only cleared at a NAK currently.
-_Y_ Send previews of images in msn file transfers.
-_Y_ Fix detection of context field splitter in FileTransferP2P::contactStarted1..(), also needed to show image previews.
-_Y_ Contact sidebar width is not saved/restord anymore.
-_Y_ Contact sidebar width is changed when the chat window resizes.
-_Y_ Check if our eventsrc file is found in the KDE-dirs, otherwise warn KMess can't notify or flash the taskbar or play sounds (see: http://www.kmess.org/board/viewtopic.php?t=1619)
-_N_ (caused by Beryl bug) "Focus stealing prevention", open the new chat windows in the background by default.
-_Y_ Add save log button to network window.
-_Y_ Improve removing contacts, offer dialog to block the contact as well (currently always kept in allowed list).
-_Y_ Display a message box if the chat logs can't be saved because the folder no longer exists.
-_Y_ Automatically save settings when pressing OK, not when closing KMess.
-_Y_ Fix settings for balloon notifications, see http://www.kmess.org/board/viewtopic.php?t=559
-_Y_ Now listening icon is SUSE specific
-_Y_ Fix MsnConnection::addPercents(), replace with KURL::encode_string(), but test for compatibility.
-_Y_ Replace warning message "you can't change your friendly name" with something less unobtrusive.
-_Y_ Emoticons are no longer displayed in the chat settings tab.
-_Y_ Improve settingsdialog height, for 800x600 displays.
-_Y_ Hide the register link when editing an account.
-_Y_ Remove the dependency on QWidget for data-classes.
-_Y_ Add a balloon if the contact start the chat with an filetransfer/nudge/wink.
-_Y_ Implement KDE passive popups so the balloon code can be removed later.
-_Y_ Balloon size fix (2 contacts on balloon), might become obsolute when passive popups are used instead.
-_Y_ Get rid of the balloons
-_Y_ Drag and drop of files in the chat window.
-_Y_ Fix newline shortkey Ctrl+Enter / Shift+Enter in GNOME. In fact it didn't work at all, not only in GNOME. :P
-_Y_ Delete contact settings when contact no longer exists in the contact list.
-_Y_ Implement cleaning up of the kmessrc file, remove old Contact entries that are no longer used.
-_Y_ Make moving of contacts smoother, see MsnNotificationConnection::getAdc().
-_Y_ Fix error messages with 'actions -> new contact' on a 'non-existing contact', 'existing contact' and 'contact without @'.
-_N_ Move network/extra/httpsoapconnection to the network root folder.
-_Y_ Move chat/invitedcontact.h to the contact folder.
-_Y_ Implement text/x-keepalive message so be sure when a contact really left a chat.
-_Y_ Update binreloc support to version 2.0.
-_Y_ Crash with downloading offline-im messages: http://www.kmess.org/board/viewtopic.php?t=1490
-_Y_ Login blocks all gui-events: make all connection attempts async
-_Y_ Allow users to scale fonts in the chat window (zoom icons).
-_Y_ Fix problems with clicking on contacts rapidly, see http://www.kmess.org/board/viewtopic.php?t=533
-_Y_ Decouple the MsnSwitchboardConnection from the ChatWindow class, for picture transfers in the background.
-_Y_ Highlight the text of the contact list item when it's active.
-_Y_ Fix contact list background picture scrolling
-_Y_ Implement setEnabled() checks for the contact group context menu in KMessView::slotContextMenu().
-_Y_ Optionally download contact pictures when the picture changed but they're not in a chat yet.
-_Y_ Test whether a display picture is fully received, and remove the image from the cache otherwise.
-_Y_ Limit the maximum number of MSN Object simultaneous downloads, to avoid server flooding. See ChatMaster::slotContactChangedMsnObject().
-_Y_ Fix e-mail support for non-Hotmail accounts, don't attempt to use Hotmail. Use chosen app or default KDE mail app instead).
-_Y_ Update the accounts listed in the initial list When one of the registered accounts is deleted.
-_Y_ Improve the contact list contact menu
-_N_ Check if the mutex lock in MsnConnection is really needed anymore.
-_Y_ Restore the context menu in the chat window.
-_Y_ Disallow logging in without having entered a password.
-_Y_ When the switchboard is disconnected (gray contact pictures), the command to invite new contacts will get ignored when a new switchboard gets ready.
-_Y_ In the emoticon settings panel, don't assume "smile.png" will always be available (parse theme, preferably with an EmoticonTheme class).
-_Y_ Include a tooltip in the contact sidebar.
-_Y_ Include a contact menu in the contact sidebar (see https://www.lab.fi.uva.es/~albgonz/kmesss.jpg)
-_Y_ When the contact disables it's picture, should we leave the current one active, or revert the the "unknown" picture?
-_Y__ Group chats: remove contact frame when a user leaves the chat.
-_Y_ Support removing a contact from just one group.
-_Y_ Group chats: fix status bar when multiple users are typing a message.
-_Y_ Implement UPnP support
-_Y_ Add winks support
-_Y_ Add emoticon transfer support
-_N_ "Who has me in his/hers contact list?" dialog (allowed/removed groups already reveal this)
-_N_ Include the network-window as "--with-network-window" if the network-window-code displays traffic nicer.
-
-
-
-
-Future ideas:
-=============
-
-MSN Protocol support:
-___ Improve old file transfer code, multiple connections like MSN5 does.
-___ Implement a settings category ("File transfers") where the user can at least choose:
-    - "[x] Allow KMess to control my internet router programmatically [learn more]"
-    - "Use the following port to receive UPnP broadcast responses: [default 1900]"
-___ Implement STUN support, also for Connection-Type field, see http://en.wikipedia.org/wiki/STUN and http://en.wikipedia.org/wiki/UDP_hole_punching.
-___ Add voice (SIP) support
-___ Add Voice clips support, see http://www.hypothetic.org/docs/msn/phorum/read.php?f=1&i=11505&t=11437
-___ Add webcam (RTP) support, see http://www.hypothetic.org/docs/msn/phorum/read.php?f=1&i=9837&t=9837
-___ Add Ink support?
-___ Fix msn remote desktop invitation support (context field with user/pass)
-___ Add HTTP connection method.
-___ Implement MSN Spaces integration
-___ Implement MSN Games support (ActicitiesCollection : public QPtrList<Activity>)
-___ Implement shared folders.
-___ Upgrade to MSNP14, but not until the protocol is fully understood! (it has some radical changes).
-
-Invitation support:
-___ Check whether gnomemeeting, krdc exists before starting/acceping a session
-___ Support Konference for netmeeting invitations as well.
-___ Detect whether gnomemeeting or konference exists before starting a netmeeting session.
-
-Interface features:
-___ Update contact properties edit dialog, icon button for contact icon.
-___ Browse/view the contact picture cache (include meta data, like contact handle and date/time)
-___ Show an icon overlay for contact connected with webmessenger.msn.com / MSN Mobile
-___ Add contact icon (purple?) for unknown contacts added by others in a multi-chat session.
-
-KDE Integration:
-___ KDE-IM bridge (http://developer.kde.org/documentation/library/cvs-api/interfaces/html/classKIMIface.html)
-___ GetHotNewStuff (as of KDE 3.4, either support it through a KPart, or wait for KDE 4 conversion)
-___ KWallet integration
+- The KMess team
@@ -1,105 +0,0 @@
-# -*-shell-script-*-
-
-[Meta]
-RootName: @kmess.sourceforge.net/kmess:$SOFTWAREVERSION
-DisplayName: KMess
-ShortName: kmess
-SoftwareVersion: 2.0alpha2
-Maintainer: The KMess Developers
-Packager: Diederik van der Boor
-Summary: MSN Messenger client for KDE
-URL: http://www.kmess.org/
-License: GNU General Public License, Version 2
-AutopackageTarget: 1.0
-
-
-[Description]
-A MSN Messenger Client for KDE
-
-KMess is a MSN Messenger client for Linux. It enables Linux
-users to chat with friends online who are using MSN Messenger
-in Windows or Mac OS. The strength of KMess is it's integration
-with the KDE desktop environment, focus on MSN Messenger specific
-features and an easy-to-use interface.
-
-
-[BuildPrepare]
-# The bogus deps solve our warnings about older distro incompatiblity
-export APBUILD_BOGUS_DEPS='art_lgpl art_lgpl_2 dl expat fontconfig freetype GL ICE idn kdefx kdesu kwalletclient m nsl png pthread resolv SM util X11 Xcursor Xft Xi Xinerama Xmu Xrandr Xrender'
-# Xrender is suggested by makeinstaller,
-# the XScreenSaver stuff can be either in libXss or libXext
-export APBUILD_STATIC='Xrender Xext Xss'
-prepareBuild
-
-
-[BuildUnprepare]
-unprepareBuild
-
-
-[Imports]
-# tells autopackage to include all files created by "make install"
-# make sure the symlink does not get installed. recreate it during Install
-find  .  -name common -type d -o -type l   -exec rm -Rf {} \;
-echo "*" | import
-
-
-[Prepare]
-# KDE 4.0 is the minimum requirement after the port to KDE4
-require @kde.org/kdelibs 4.0
-
-# flash and cabextract are used for winks.
-playWinks="1"
-
-# test for cabextract
-outputTest "cabextract"
-if locateCommand -r "cabextract" "-v"; then
-  outputTestPass
-else
-  outputTestFail
-  playWinks="0"
-fi
-
-# test for flash
-# paths taken from Konqueror.
-outputTest "flash player"
-hasFlash="0"
-for i in /usr/lib/browser-plugins $HOME/.netscape/plugins /usr/lib64/browser-plugins /usr/local/netscape/plugins /opt/mozilla/plugins /opt/mozilla/lib/plugins /opt/netscape/plugins /opt/netscape/communicator/plugins /usr/lib/netscape/plugins /usr/lib/netscape/plugins-libc5 /usr/lib/netscape/plugins-libc6 /usr/lib/mozilla/plugins /usr/lib64/netscape/plugins /usr/lib64/mozilla/plugins $MOZILLA_HOME/plugins
-do
-  if [ -e "$i/libflashplayer.so" ]
-  then
-    hasFlash="1"
-  fi
-done
-if [ "$hasFlash" -eq "1" ];
-then
-  outputTestPass
-else
-  outputTestFail
-  playWinks="0"
-fi
-
-# notify user
-if [ "$playWinks" -eq "0" ];
-then
-  outputStatus "You need to have cabextract and a flash player installed to play winks"
-  # don't abort, KMess can operate without these deps.
-fi
-
-
-[Install]
-# # force to use the KDE path, workarround for broken distro's
-# # which don't support XDG/KDE stuff in /usr or /usr/local
-# test "`id -u`" -eq 0 && export PREFIX="`getKdePrefix`" || true
-
-outputStatus "Installing application..."
-installExe     bin/*
-installData    share/apps/ share/doc/ share/emoticons/ share/sounds/
-linkFile       --silent "`getKdePrefix`/share/doc/HTML/en/common" "$PREFIX/share/doc/HTML/en/kmess/common"
-installIcon    share/icons/hicolor/ share/icons/locolor/
-installDesktop "Internet" share/applications/kde/kmess.desktop
-installLocale  share/locale/
-
-
-[Uninstall]
-uninstallFromLog
-
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+QCATOOL_EXEC=$(which qcatool2 2>/dev/null)
+if [ ! -x "$QCATOOL_EXEC" ]; then
+  echo 0
+  exit
+fi
+
+qcatool2 plugins | grep -q qca-ossl && echo 1 || echo 0
@@ -11,14 +11,14 @@
 /* Define if debug output should be enabled */
 #define KMESS_DEBUG ${KMESS_ENABLE_DEBUG_OUTPUT}

-/* Define if the Relocatable Binary support should be enable */
-#define ENABLE_BINRELOC ${KMESS_ENABLE_BINRELOC}
-
 /* Define the fallback prefix */
 #define KMESS_PREFIX "${CMAKE_INSTALL_PREFIX}"

 /* Define if you have the XScreenSaver extension */
 #cmakedefine HAVE_XSCREENSAVER ${HAVE_XSCREENSAVER}

-/* Define if you have KPhone installed (for SIP voice chat) (currently unused) */
-/* #define HAS_KPHONE 1 */
+/* Define if LikeBack is not needed */
+#define KMESS_DISABLE_LIKEBACK ${KMESS_DISABLE_LIKEBACK}
+
+/* Define whether to enable Ink support (using GIFLib) */
+#define KMESS_ENABLE_INK ${HAVE_LIBGIF}
@@ -3,18 +3,18 @@
 cd `dirname $0`/..

 # second sed expression fixes Mac OS X 10.4
-appver="`cat kmess.lsm | grep Version: | sed -e 's/[^0-9]\+//' -e 's/Version:\( \)*//'`"
+appver="`egrep 'SET.*KMESS_VERSION' CMakeLists.txt | sed -re 's/.*"([^"]+)".*/\1/'`"
 date="`date +%Y%m%d`"

 # Make sure we have the right repository
 if [ ! -f kmess.kdevelop ]; then
-  echo -n "svn (unknown)"
+  /bin/echo -n "svn (unknown)"
  exit
 fi

 # Display normal version if subversion is not installed
 if [ ! -x `which svnversion 2>/dev/null` ]; then
-  echo -n "$appver"
+  /bin/echo -n "$appver"
  exit
 fi

@@ -23,9 +23,13 @@ svnver=`LANG=C svnversion`

 # see if this is not a repository.
 if [ "$svnver" = "exported" ]; then
-  echo -n "$appver";
+  if [ -z "$KMESS_VER" ]; then
+    /bin/echo -n "$appver";
+  else
+    /bin/echo -n "$KMESS_VER";
+  fi
  exit;
 fi

 # display subversion version and date
-echo -n "$appver-svn (`svnversion` >= $date)"
+/bin/echo -n "$appver-svn (`svnversion` >= $date)"
@@ -0,0 +1,24 @@
+
+# This file is included here because the standard FindGIF.cmake file
+# requires the CHECK_STRUCT_MEMBER macro. It wasn't on my PC, at least, so
+# I include a copy of the macro here for giflib to use.
+
+MACRO (CHECK_STRUCT_MEMBER _STRUCT _MEMBER _HEADER _RESULT)
+   SET(_INCLUDE_FILES)
+   FOREACH (it ${_HEADER})
+      SET(_INCLUDE_FILES "${_INCLUDE_FILES}#include <${it}>\n")
+   ENDFOREACH (it)
+
+   SET(_CHECK_STRUCT_MEMBER_SOURCE_CODE "
+${_INCLUDE_FILES}
+int main()
+{
+   ${_STRUCT}* tmp;
+   tmp->${_MEMBER};
+  return 0;
+}
+")
+
+   CHECK_CXX_SOURCE_COMPILES("${_CHECK_STRUCT_MEMBER_SOURCE_CODE}" ${_RESULT})
+
+ENDMACRO (CHECK_STRUCT_MEMBER)
@@ -25,11 +25,22 @@
 # Variables
 #

-# auto-detect default prefix
 KDE4_PREFIX=""
 DEFAULT_PREFIX="/usr/local"
-if type -p kde4-config >/dev/null; then
-  KDE4_PREFIX=`kde4-config --prefix`
+
+# auto-detect KDE Installation on the Mac.
+KDE4_CONFIG=""
+for i in `which kde4-config` /opt/local/bin/kde4-config
+do
+  if [ -x "$i" ]; then
+    KDE4_CONFIG="$i"
+	break
+  fi
+done
+
+# auto-detect default prefix
+if [ -n "$KDE4_CONFIG" ]; then
+  KDE4_PREFIX=`$KDE4_CONFIG --prefix`
  DEFAULT_PREFIX="$KDE4_PREFIX"
 fi

@@ -37,8 +48,8 @@ fi
 PREFIX=$DEFAULT_PREFIX
 BUILD_TYPE="relwithdebinfo"
 BUILD_DIR="build"
+REAL_BUILD_DIR=""
 DEBUG=0
-BINRELOC=0

 # Globals
 cd `dirname $0`
@@ -70,7 +81,6 @@ Installation directories:

 Optional Features:
  --enable-debug-output   enable debugging output.  default=no
-  --enable-binreloc       enable binary relocation support.  default=no
  --build-dir=PATH        path to store the build files. default: ./build
  --build-type=TYPE       define the build configuration to use, values:
                            release           - standard release
@@ -95,7 +105,7 @@ After running ./configure, you can type 'make' to build this project.
  else
    echo "  WARNING:

-    kde4-config was not found. Please verify that 
+    kde4-config was not found. Please verify that
    you've installed the KDE 4 development packages!
 "
  fi
@@ -118,7 +128,8 @@ function run_cmake

  # Check build type
  case "$BUILD_TYPE" in
-    release|relwithdebinfo|minsizerel|debug|debugfull) ;;
+    debugfull) DEBUG=1 ;;
+    release|relwithdebinfo|minsizerel|debug) ;;
    *)
      echo "$0: invalid build type: $BUILD_TYPE" >&2
      exit 1
@@ -129,15 +140,15 @@ function run_cmake
  # and switch so build messages are ok.
  test -e "$BUILD_DIR" || mkdir "$BUILD_DIR" || exit 1
  cd "$BUILD_DIR"
+  REAL_BUILD_DIR=`pwd`

  # debug about cmake
  echo "configuring KMess $KMESS_VER"
  echo "checking build directory"
-  echo "running cmake from `pwd`"
+  echo "running cmake from $REAL_BUILD_DIR"
  echo "command: cmake -D CMAKE_INSTALL_PREFIX=$PREFIX \ "
  echo "               -D CMAKE_BUILD_TYPE=$BUILD_TYPE \ "
  echo "               -D KMESS_DEBUG_OUTPUT=$DEBUG \ "
-  echo "               -D KMESS_ENABLE_BINRELOC=$BINRELOC \ "
  echo "               "$SRC_DIR" "
  echo ""

@@ -145,7 +156,6 @@ function run_cmake
  cmake -D CMAKE_INSTALL_PREFIX=$PREFIX \
        -D CMAKE_BUILD_TYPE=$BUILD_TYPE \
        -D KMESS_DEBUG_OUTPUT=$DEBUG \
-        -D KMESS_ENABLE_BINRELOC=$BINRELOC \
        "$SRC_DIR" \
      && cmake_ok || cmake_error
 }
@@ -156,16 +166,11 @@ function cmake_ok
  # collect all settings
  local HAS_XSS="no   (extension not detected)"
  local HAS_DEBUG="no   (good!)"
-  local HAS_BINRELOC="no   (only available on Linux)"

  if [ $DEBUG = "1" ]; then
    HAS_DEBUG="yes  (KMess will be slow!)"
  fi

-  if [ $BINRELOC = "1" ]; then
-    HAS_BINRELOC="yes"
-  fi
-
  if grep -q '^#define HAVE_XSCREENSAVER 1$' "config-kmess.h"; then
    HAS_XSS="yes"
  fi
@@ -179,10 +184,18 @@ function cmake_ok
 #   Install prefix:      $PREFIX
 #   Auto-away feature:   $HAS_XSS
 #   Debugging messages:  $HAS_DEBUG
-#   Binary relocatable:  $HAS_BINRELOC
 #   Build type:          $BUILD_TYPE
 #   Build directory:     $BUILD_DIR
 #
+#
+# cmake command:
+#
+#   cd \"$REAL_BUILD_DIR\"
+#   cmake -D CMAKE_INSTALL_PREFIX=$PREFIX \\
+#         -D CMAKE_BUILD_TYPE=$BUILD_TYPE \\
+#         -D KMESS_DEBUG_OUTPUT=$DEBUG \\
+#         \"$SRC_DIR\"
+#
 " > $makefile

  for target in $targets; do
@@ -201,7 +214,6 @@ function cmake_ok
    Install prefix:      $PREFIX
    Auto-away feature:   $HAS_XSS
    Debugging messages:  $HAS_DEBUG
-    Binary relocatable:  $HAS_BINRELOC
    Build type:          $BUILD_TYPE


@@ -249,7 +261,7 @@ Please run cmake directly, for example:
  fi

  # Parse the arguments
-  longopts="help,prefix:,build-type:,build-dir:,build-folder:,enable-binreloc,enable-debug-output"
+  longopts="help,prefix:,build-type:,build-dir:,build-folder:,enable-debug-output"
  TEMP=`getopt --name=configure \
               --options h \
               --longoptions "$longopts" -- "$@"`
@@ -267,7 +279,6 @@ Please run cmake directly, for example:
    -h|--help)              print_help;      exit 0  ;;
    --prefix)               PREFIX=$2;       shift 2 ;;
    --enable-debug-output)  DEBUG=1;         shift   ;;
-    --enable-binreloc)      BINRELOC=1;      shift   ;;
    --build-type)           BUILD_TYPE="$2"; shift 2 ;;
    --build-dir)            BUILD_DIR="$2";  shift 2 ;;
    --builddir|--build-directory|--build-folder)  BUILD_DIR="$2";  shift 2 ;;   # be forgiving with small errors.
@@ -5,5 +5,6 @@ ADD_SUBDIRECTORY( sounds     )
 ADD_SUBDIRECTORY( emoticons  )
 ADD_SUBDIRECTORY( chatstyles )

-INSTALL( FILES  kmess.notifyrc DESTINATION ${DATA_INSTALL_DIR}/kmess )
-INSTALL( FILES  kmess.desktop  DESTINATION ${XDG_APPS_INSTALL_DIR}   )
+INSTALL( FILES  kmesschatstyles.knsrc  DESTINATION ${CONFIG_INSTALL_DIR}     )
+INSTALL( FILES  kmess.notifyrc         DESTINATION ${DATA_INSTALL_DIR}/kmess )
+INSTALL( FILES  kmess.desktop          DESTINATION ${XDG_APPS_INSTALL_DIR}   )
@@ -55,6 +55,18 @@ div.notification .filename {
 }


+/*
+ * Separator for the various chats within HTML files
+ */
+div.conversation
+{
+  margin: 2em 1em 1em 1em;
+  padding-bottom: 0.5em;
+  border-bottom: 1px solid gray;
+  color: purple;
+}
+
+

 /**
 * Remaining markup is done inline in the .xsl file.
@@ -42,8 +42,8 @@
            <span dir="{from/contact/displayName/@dir}">
              <xsl:attribute name="style">
                <xsl:choose>
-                  <xsl:when test="from/contact/displayName/@dir='ltr'">float:left; clear:both; padding-right: 0.3em;</xsl:when>
-                  <xsl:otherwise>float:right; clear:both; padding-left: 0.3em;</xsl:otherwise>
+                  <xsl:when test="from/contact/displayName/@dir='ltr'">padding-right: 0.3em;</xsl:when>
+                  <xsl:otherwise>padding-left: 0.3em;</xsl:otherwise>
                </xsl:choose>
              </xsl:attribute>

@@ -87,6 +87,16 @@
          </div>
        </xsl:when>

+
+        <!-- presence message (e.g. contact gone offline) -->
+        <xsl:when test="@type='presence'">
+          <div dir="{body/@dir}">
+            <font color="gray">
+              <xsl:value-of disable-output-escaping="yes" select="body"/>
+            </font>
+          </div>
+        </xsl:when>
+
        <!-- notification message (e.g. file received) -->
        <xsl:when test="@type='notification'">
          <div dir="{body/@dir}">
@@ -55,6 +55,17 @@ div.notification .filename {
 }


+/*
+ * Separator for the various chats within HTML files
+ */
+div.conversation
+{
+  margin: 2em 1em 1em 1em;
+  padding-bottom: 0.5em;
+  border-bottom: 1px solid gray;
+  color: purple;
+}
+

 /**
 * Remaining markup is done inline in the .xsl file.
@@ -86,6 +86,16 @@
        </xsl:when>


+        <!-- presence message (e.g. contact gone offline) -->
+        <xsl:when test="@type='presence'">
+          <div style="margin-bottom: 16px" dir="{body/@dir}">
+            <font color="gray">
+              <xsl:value-of disable-output-escaping="yes" select="body"/>
+            </font>
+          </div>
+        </xsl:when>
+
+
        <!-- notification message (e.g. file received) -->
        <xsl:when test="@type='notification'">
          <div style="margin-bottom: 16px" dir="{body/@dir}">
@@ -141,6 +141,7 @@ dd
 */
 div.application,
 div.notification,
+div.presence,
 div.system
 {
  margin: 10px 0 10px; /* top and bottom margin */
@@ -151,6 +152,11 @@ div.application
  color: blue;
 }

+div.presence
+{
+  color: gray;
+}
+
 div.notification
 {
  color: purple;
@@ -195,3 +201,16 @@ img.customEmoticonPlaceholder
  vertical-align: top;
 }

+
+
+/*
+ * Separator for the various chats within HTML files
+ */
+div.conversation
+{
+  margin: 3em 2em 2em 2em;
+  padding: 0.5em;
+  border: 1px solid grey;
+  color: purple;
+  text-align: center;
+}
@@ -119,12 +119,12 @@
      </xsl:when>

      <!--
-        other messages, like: 
+        other messages, like:
        - application message (e.g. invite for file transfer)
        - notification message (e.g. file received)
        - system message (error messages, e.g. invitations KMess does not support)
      -->
-      <xsl:when test="@type='application' or @type='notification' or @type='system'">
+      <xsl:when test="@type='application' or @type='presence' or @type='notification' or @type='system'">
        <div class="{body/@dir}">
          <div class="{@type}" dir="{body/@dir}">

@@ -129,6 +129,7 @@ dt span.time
 */
 div.application,
 div.notification,
+div.presence,
 div.system
 {
  margin: 10px 0 10px; /* top and bottom margin */
@@ -139,6 +140,11 @@ div.application
  color: #6172b2;
 }

+div.presence
+{
+  color: #c4c4c4;
+}
+
 div.notification
 {
  color: #c034c9;
@@ -183,3 +189,14 @@ img.customEmoticonPlaceholder
  vertical-align: top;
 }

+
+
+/*
+ * Separator for the various chats within HTML files
+ */
+div.conversation
+{
+  margin-top: 3em;
+  margin-bottom: 1em;
+  color: purple;
+}
@@ -118,12 +118,12 @@
      </xsl:when>

      <!--
-        other messages, like: 
+        other messages, like:
        - application message (e.g. invite for file transfer)
        - notification message (e.g. file received)
        - system message (error messages, e.g. invitations KMess does not support)
      -->
-      <xsl:when test="@type='application' or @type='notification' or @type='system'">
+      <xsl:when test="@type='application' or @type='presence' or @type='notification' or @type='system'">
        <div class="{body/@dir}">
          <div class="{@type}" dir="{body/@dir}">

@@ -144,6 +144,7 @@ dl

 div.application,
 div.notification,
+div.presence,
 div.system
 {
  margin-left: 7em;
@@ -210,6 +211,11 @@ div.application
  color: blue;
 }

+div.presence
+{
+  color: gray;
+}
+
 div.notification
 {
  color: purple;
@@ -251,3 +257,17 @@ img.customEmoticonPlaceholder
  vertical-align: top;
 }

+
+
+/*
+ * Separator for the various chats within HTML files
+ */
+div.conversation
+{
+  padding: 0;
+  margin-left: 6em;
+  margin-top: 3em;
+  margin-bottom: 1.5em;
+  font-size: larger;
+  color: purple;
+}
@@ -118,12 +118,12 @@
      </xsl:when>

      <!--
-        other messages, like: 
+        other messages, like:
        - application message (e.g. invite for file transfer)
        - notification message (e.g. file received)
        - system message (error messages, e.g. invitations KMess does not support)
      -->
-      <xsl:when test="@type='application' or @type='notification' or @type='system'">
+      <xsl:when test="@type='application' or @type='presence' or @type='notification' or @type='system'">
        <div class="{body/@dir}">
          <div class="{@type}">

@@ -119,6 +119,7 @@ dl, dt, dd

 div.application,
 div.notification,
+div.presence,
 div.system
 {
  margin-left:   11px;
@@ -228,6 +229,11 @@ div.application
  color: #0b0;
 }

+div.presence
+{
+  color: #bbb;
+}
+
 div.notification
 {
  color: #bb0;
@@ -281,3 +287,16 @@ img.customEmoticonPlaceholder
  padding: 0;
 }

+
+
+/*
+ * Separator for the various chats within HTML files
+ */
+div.conversation
+{
+  margin: 2em 1em 1em 1em;
+  padding: 0.5em;
+  border: 1px solid #000500;
+  font-size: larger;
+  color: #bb0;
+}
@@ -137,12 +137,12 @@
      </xsl:when>

      <!--
-        other messages, like: 
+        other messages, like:
        - application message (e.g. invite for file transfer)
        - notification message (e.g. file received)
        - system message (error messages, e.g. invitations KMess does not support)
      -->
-      <xsl:when test="@type='application' or @type='notification' or @type='system'">
+      <xsl:when test="@type='application' or @type='presence' or @type='notification' or @type='system'">
        <div class="{body/@dir}">
          <div class="{@type}" dir="{body/@dir}">

@@ -118,6 +118,7 @@ dl, dt, dd

 div.application,
 div.notification,
+div.presence,
 div.system
 {
  margin-left:   11px;
@@ -227,6 +228,11 @@ div.application
  color: blue;
 }

+div.presence
+{
+  color: gray;
+}
+
 div.notification
 {
  color: purple;
@@ -280,3 +286,17 @@ img.customEmoticonPlaceholder
  padding: 0;
 }

+
+
+/*
+ * Separator for the various chats within HTML files
+ */
+div.conversation
+{
+  margin: 3em 2em 2em 2em;
+  padding: 0.5em;
+  border: 1px solid #dce6ff;
+  font-size: larger;
+  color: purple;
+  text-align: center;
+}
@@ -136,12 +136,12 @@
      </xsl:when>

      <!--
-        other messages, like: 
+        other messages, like:
        - application message (e.g. invite for file transfer)
        - notification message (e.g. file received)
        - system message (error messages, e.g. invitations KMess does not support)
      -->
-      <xsl:when test="@type='application' or @type='notification' or @type='system'">
+      <xsl:when test="@type='application' or @type='presence' or @type='notification' or @type='system'">
        <div class="{body/@dir}">
          <div class="{@type}" dir="{body/@dir}">

@@ -253,6 +253,7 @@ dd
 */
 div.application,
 div.notification,
+div.presence,
 div.system
 {
  margin: 10px 0 10px; /* top and bottom margin */
@@ -263,6 +264,11 @@ div.application
  color: blue;
 }

+div.presence
+{
+  color: gray;
+}
+
 div.notification
 {
  color: purple;
@@ -319,3 +325,16 @@ img.customEmoticonPlaceholder
  padding: 10px;
 }

+
+
+/*
+ * Separator for the various chats within HTML files
+ */
+div.conversation
+{
+  margin: 2em 1.5em 1.5em 1.5em;
+  padding: 0.5em;
+  border: 1px solid #e1e1e1;
+  font-size: larger;
+  color: purple;
+}
@@ -104,7 +104,7 @@
                  <span class="name">
                    <xsl:value-of disable-output-escaping="yes" select="from/contact/displayName/@text"/>
                    <xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text>
-                  </span> 
+                  </span>
                </span>
              </dt>

@@ -121,12 +121,12 @@
      </xsl:when>

      <!--
-        other messages, like: 
+        other messages, like:
        - application message (e.g. invite for file transfer)
        - notification message (e.g. file received)
        - system message (error messages, e.g. invitations KMess does not support)
      -->
-      <xsl:when test="@type='application' or @type='notification' or @type='system'">
+      <xsl:when test="@type='application' or @type='presence' or @type='notification' or @type='system'">
        <div class="{body/@dir}">
          <div class="{@type}" dir="{body/@dir}">

@@ -226,10 +226,6 @@
 	<string>(bah)</string>
 </emoticon>

-<emoticon file="goat">
-	<string>(nah)</string>
-</emoticon>
-
 <emoticon file="bat">
 	<string>:[</string>
 	<string>:-[</string>
@@ -1,4 +1,14 @@

 KDE4_INSTALL_ICONS( ${ICON_INSTALL_DIR} )

-INSTALL( FILES gnomemeeting.png DESTINATION ${DATA_INSTALL_DIR}/kmess/icons/hicolor/16x16/apps )
+SET( KMESS_ICON_INSTALL_DIR ${DATA_INSTALL_DIR}/kmess/icons/hicolor/16x16 )
+
+# If we're compiling in debug mode, also add the LikeBack icons
+IF( ${KMESS_ENABLE_DEBUG_OUTPUT} EQUAL 1 )
+  INSTALL( FILES likeback_bug.png     DESTINATION ${KMESS_ICON_INSTALL_DIR}/actions )
+  INSTALL( FILES likeback_dislike.png DESTINATION ${KMESS_ICON_INSTALL_DIR}/actions )
+  INSTALL( FILES likeback_feature.png DESTINATION ${KMESS_ICON_INSTALL_DIR}/actions )
+  INSTALL( FILES likeback_like.png    DESTINATION ${KMESS_ICON_INSTALL_DIR}/actions )
+ENDIF( ${KMESS_ENABLE_DEBUG_OUTPUT} EQUAL 1 )
+
+INSTALL( FILES kmess-shadow.png DESTINATION ${KMESS_ICON_INSTALL_DIR}/apps )
@@ -7,10 +7,10 @@ Type=Application
 DocPath=kmess/index.html
 Terminal=0
 Categories=Qt;KDE;Network;InstantMessaging;
-Comment=MSN Messenger Clone for KDE 4
-Comment[de]=MSN Messenger Clone für KDE 4
+Comment=Live Messenger Client for KDE
+Comment[de]=Live-Messenger-Klon für KDE 4
 Comment[nl]=MSN Messenger Kloon voor KDE 4
-GenericName=MSN Client
+GenericName=Live Messenger Client
 GenericName[af]=Irc Kliënt
 GenericName[ar]=عميل MSN
 GenericName[be]=Кліент MSN
@@ -20,7 +20,7 @@ GenericName[ca]=Client MSN
 GenericName[cs]=MSN klient
 GenericName[cy]=Dibynnydd MSN
 GenericName[da]=MSN-klient
-GenericName[de]=MSN Programm
+GenericName[de]=Live-Messenger-Programm
 GenericName[el]=Πελάτης MSN
 GenericName[eo]=MSN-kliento
 GenericName[es]=Cliente de MSN
@@ -7,34 +7,46 @@ Comment=KMess Messenger Client
 Name=Contact Online
 Comment=A contact has come online
 Sound=kmess_logon.ogg
-Action=Sound|Taskbar
+Action=Sound|Popup

 [Event/contact status]
 Name=Contact Status
 Comment=A contact has changed its MSN status
 Sound=kmess_logon.ogg
-Action=Sound|Taskbar
+Action=

 [Event/contact offline]
 Name=Contact Offline
 Comment=A contact has gone offline
 Sound=kmess_logoff.ogg
-Action=Sound|Taskbar
+Action=Sound|Popup

 [Event/chat start]
 Name=Chat Start
 Comment=A contact has started a chat with you
 Sound=kmess_chat.ogg
-Action=Taskbar
+Action=Sound|Popup|Taskbar

 [Event/new message]
 Name=New Message
 Comment=You received a message from a contact
 Sound=kmess_chat.ogg
-Action=Taskbar
+Action=Sound|Popup|Taskbar
+
+[Event/nudge]
+Name=Nudge
+Comment=A contact requires your attention
+Sound=KDE-Im-Nudge.ogg
+Action=Sound|Popup|Taskbar

 [Event/new email]
 Name=New Email
 Comment=You have received a new email
 Sound=kmess_msg.ogg
-Action=Sound|Taskbar
+Action=Sound|Popup|Taskbar
+
+[Event/status]
+Name=KMess and Network Status
+Comment=Information on network and application status
+Sound=KDE-Sys-Special.ogg
+Action=Sound|Popup
@@ -0,0 +1,4 @@
+[KNewStuff2]
+ProvidersUrl=http://kmess.org/newstuff/chatstyles/providers.xml
+TargetDir=kmess/styles
+Uncompress=true
@@ -8,9 +8,9 @@ SET( kmess_PICS
   emoticons.png
   empty.png
   invisible.png
-   kmesslogo.png
-   kmesslogo2.png
   kmesspic.png
+   kmessstrip1.png
+   kmessstrip2.png
   lunch.png
   offline.png
   online.png
@@ -0,0 +1,3 @@
+[Project]
+Name=KMess
+Manager=KDevCMakeManager
@@ -69,8 +69,6 @@
      <path>build/kmess/moc_chatstylepage.cpp</path>
      <path>build/kmess/moc_emailpage.cpp</path>
      <path>build/kmess/moc_kmessapplication.cpp</path>
-      <path>build/kmess/moc_webapplicationp2p.cpp</path>
-      <path>build/kmess/moc_webcamtransferp2p.cpp</path>
      <path>build/kmess/ui_accountswidgetinterface.h</path>
      <path>build/kmess/ui_addemoticondialoginterface.h</path>
      <path>build/kmess/ui_alertssettings.h</path>
@@ -1,11 +0,0 @@
-Begin4
-Title:          KMess
-Version:        2.0alpha2
-Entered-date:   2005-05-05
-Description:    A MSN Messenger / Windows Live Messenger client for KDE
-Keywords:       KDE X11 desktop MSN Messenger
-Author:         KMess Developers Team <project@kmess.org>
-Primary-site:   http://www.kmess.org/
-Platforms:      Linux and other Unices
-Copying-policy: GNU Public License
-End
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mario Fetka	dd04b72a67	Import release 2.0	2009-07-25 14:07:41 +00:00
Mario Fetka	9d0ee5010b	Import release 2.0rc1	2009-07-17 15:44:01 +00:00
Mario Fetka	919dbe2a0f	Import release 2.0beta2	2009-05-13 18:20:42 +00:00
Mario Fetka	8c44bbd89b	Import release 1.5.2	2009-03-23 23:35:55 +00:00
Mario Fetka	a899084e37	Import release 2.0beta1	2009-03-23 23:26:37 +00:00