Import release 2.0beta1

AUTHORS

@@ -1,52 +1,144 @@
-Developers:
+-- Developers --
+
   Mike K. Bennett       <mkb137@users.sourceforge.net>
   Michael Curtis        <mdcurtis@users.sourceforge.net>
   Jan Toenjes           <jan.toenjes@web.de>
   Diederik van der Boor <vdboor@codingdomain.com>
   Richard Conway        <richardconway@users.sourceforge.net>
   Valerio Pilo          <amroth@coldshock.net>
+  Antonio Nastasi       <sifcenter@gmail.com>
+  Ruben Vandamme        <vandammeru@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>
+
+  Brazilian Portuguese:
+
+    Mauricio Rother <mauricio@digicomm.com.br>
+    Leonel Freire <leonelfreire@gmail.com>
+    Maurício Arozi Moraes
+
+  Catalan:
+
+    Jaume Cornadó <jaumec@lleida.net>
+
+  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>
+
+  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>
+    Barthe Guillaume <gu_barthe@yahoo.fr>
+
+  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>
+
+  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>
+
+  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
 
@@ -83,6 +175,34 @@ 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
+
+  Adam Goossens <fontknocker@gmail.com>
+  - Notifications blocking option
+  - Winks disabling option
+  - Last message date feature
+
+  Sjors Gielen <dazjorz@dazjorz.com>
+  - IRC-like commands in the chat window
+
+  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
 
@@ -94,5 +214,8 @@ Also tranks to:
   KScreensaver
   - Idle timer code
 
-  Liu Sizhuang <chinatslsz@hotmail.com>
-  - P4-Context field support
+  BasKet
+  - Close-to-tray icon screenshot code
+
+  Amarok
+  - Custom crash handler implementation

CMakeLists.txt

@@ -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,77 @@ 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', and 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', and 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' and 'libqca2-dev', and on openSUSE: 'libqca2' and 'libqca2-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." )
+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' and 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 )
+
+# 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', and 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" )
+
+
+# Display the dependency collection results
+MACRO_DISPLAY_FEATURE_LOG()
+
 
 
 #### Configure build ####
@@ -42,7 +102,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.0alpha" )
+SET( KMESS_VERSION "2.0beta1" )
 
 
 #### Define compiler flags ####
@@ -50,9 +110,9 @@ SET( KMESS_VERSION "2.0alpha" )
 # 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 -fvisibility=default" )
 ENDIF( CMAKE_COMPILER_IS_GNUCXX )
 
 
@@ -68,11 +128,28 @@ ENDIF( CMAKE_COMPILER_IS_GNUCXX )
 SET( CMAKE_BUILD_TYPE debugfull )
 
 # Enable the KMess debug output when compiling a debug build
-IF( CMAKE_BUILD_TYPE STREQUAL debugfull OR DEFINED KMESS_DEBUG_OUTPUT )
+IF( CMAKE_BUILD_TYPE STREQUAL debugfull OR KMESS_DEBUG_OUTPUT EQUAL 1 )
   SET( KMESS_ENABLE_DEBUG_OUTPUT "1" )
-ELSE( CMAKE_BUILD_TYPE STREQUAL debugfull OR DEFINED KMESS_DEBUG_OUTPUT )
+ELSE( CMAKE_BUILD_TYPE STREQUAL debugfull OR KMESS_DEBUG_OUTPUT EQUAL 1 )
   SET( KMESS_ENABLE_DEBUG_OUTPUT "0" )
-ENDIF( CMAKE_BUILD_TYPE STREQUAL debugfull OR DEFINED KMESS_DEBUG_OUTPUT )
+ENDIF( CMAKE_BUILD_TYPE STREQUAL debugfull OR KMESS_DEBUG_OUTPUT EQUAL 1 )
+
+
+# Change symbol visibility, to obtain clearer KDE backtraces
+SET( __KDE_HAVE_GCC_VISIBILITY 0 )
+
+# 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 )
+
+
+# Enable the experimental webcam connection if needed
+IF( NOT DEFINED KMESS_ENABLE_WEBCAM )
+  SET( KMESS_ENABLE_WEBCAM "0" )
+ENDIF( NOT DEFINED KMESS_ENABLE_WEBCAM )
 
 
 # Set a default installation path
@@ -93,3 +170,7 @@ ADD_SUBDIRECTORY( po )
 ADD_SUBDIRECTORY( data )
 ADD_SUBDIRECTORY( doc )
 
+# Also add the tests if compiling in development mode
+IF( CMAKE_BUILD_TYPE STREQUAL debugfull AND KMESS_DEBUG_OUTPUT EQUAL 1 )
+  ADD_SUBDIRECTORY( tests )
+ENDIF( CMAKE_BUILD_TYPE STREQUAL debugfull AND KMESS_DEBUG_OUTPUT EQUAL 1 )

Doxyfile

@@ -1,14 +1,14 @@
-# Doxyfile 1.4.1-KDevelop
+# Doxyfile 1.5.5-KDevelop
 
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
+DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = KMess
-PROJECT_NUMBER         = 2.0alpha
+PROJECT_NUMBER         = 2.0-beta1
 OUTPUT_DIRECTORY       = ./apidocs
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
-USE_WINDOWS_ENCODING   = NO
 BRIEF_MEMBER_DESC      = YES
 REPEAT_BRIEF           = YES
 ABBREVIATE_BRIEF       = "The $name class" \
@@ -25,19 +25,28 @@ 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
 MULTILINE_CPP_IS_BRIEF = NO
 DETAILS_AT_TOP         = NO
 INHERIT_DOCS           = YES
-DISTRIBUTE_GROUP_DOC   = NO
+SEPARATE_MEMBER_PAGES  = NO
 TAB_SIZE               = 2
-ALIASES                = 
+ALIASES                =
 OPTIMIZE_OUTPUT_FOR_C  = NO
 OPTIMIZE_OUTPUT_JAVA   = NO
+OPTIMIZE_FOR_FORTRAN   = NO
+OPTIMIZE_OUTPUT_VHDL   = NO
+BUILTIN_STL_SUPPORT    = NO
+CPP_CLI_SUPPORT        = NO
+SIP_SUPPORT            = NO
+IDL_PROPERTY_SUPPORT   = YES
+DISTRIBUTE_GROUP_DOC   = NO
 SUBGROUPING            = YES
+TYPEDEF_HIDES_STRUCT   = NO
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -46,6 +55,7 @@ EXTRACT_PRIVATE        = YES
 EXTRACT_STATIC         = YES
 EXTRACT_LOCAL_CLASSES  = YES
 EXTRACT_LOCAL_METHODS  = YES
+EXTRACT_ANON_NSPACES   = NO
 HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -57,16 +67,19 @@ SHOW_INCLUDE_FILES     = YES
 INLINE_INFO            = YES
 SORT_MEMBER_DOCS       = YES
 SORT_BRIEF_DOCS        = YES
+SORT_GROUP_NAMES       = NO
 SORT_BY_SCOPE_NAME     = NO
 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
-FILE_VERSION_FILTER    = 
+SHOW_FILES             = YES
+SHOW_NAMESPACES        = YES
+FILE_VERSION_FILTER    =
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
@@ -76,22 +89,28 @@ 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
 #---------------------------------------------------------------------------
-INPUT                  = ./kmess
-FILE_PATTERNS          = *.cpp *.h *.dox
+INPUT                  = ./src
+INPUT_ENCODING         = UTF-8
+FILE_PATTERNS          = *.cpp \
+                         *.h \
+                         *.dox
 RECURSIVE              = YES
-EXCLUDE                = *.moc *.moc.cpp *.moc.h
+EXCLUDE                = *.moc \
+                         *.moc.cpp \
+                         *.moc.h
 EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = */build-*/*
-EXAMPLE_PATH           = 
+EXCLUDE_PATTERNS       = */build*/*
+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
@@ -101,13 +120,15 @@ INLINE_SOURCES         = NO
 STRIP_CODE_COMMENTS    = YES
 REFERENCED_BY_RELATION = YES
 REFERENCES_RELATION    = YES
+REFERENCES_LINK_SOURCE = YES
+USE_HTAGS              = NO
 VERBATIM_HEADERS       = YES
 #---------------------------------------------------------------------------
 # configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
 ALPHABETICAL_INDEX     = NO
 COLS_IN_ALPHA_INDEX    = 4
-IGNORE_PREFIX          = 
+IGNORE_PREFIX          =
 #---------------------------------------------------------------------------
 # configuration options related to the HTML output
 #---------------------------------------------------------------------------
@@ -119,15 +140,20 @@ HTML_FOOTER            = doc/apidocs_footer.html
 HTML_STYLESHEET        = doc/doxygen.css
 HTML_ALIGN_MEMBERS     = YES
 GENERATE_HTMLHELP      = NO
-CHM_FILE               = 
-HHC_LOCATION           = 
+GENERATE_DOCSET        = NO
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+HTML_DYNAMIC_SECTIONS  = NO
+CHM_FILE               =
+HHC_LOCATION           =
 GENERATE_CHI           = NO
 BINARY_TOC             = NO
 TOC_EXPAND             = NO
 DISABLE_INDEX          = YES
 ENUM_VALUES_PER_LINE   = 4
-GENERATE_TREEVIEW      = NO
+GENERATE_TREEVIEW      = NONE
 TREEVIEW_WIDTH         = 250
+FORMULA_FONTSIZE       = 10
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
@@ -137,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
@@ -150,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
 #---------------------------------------------------------------------------
@@ -164,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
@@ -177,54 +203,58 @@ 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  = 
-PREDEFINED             = KMESSTEST KMESS_NETWORK_WINDOW
-EXPAND_AS_DEFINED      = 
+INCLUDE_PATH           =
+INCLUDE_FILE_PATTERNS  =
+PREDEFINED             = KMESSTEST \
+                         KMESS_NETWORK_WINDOW
+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            =
 HIDE_UNDOC_RELATIONS   = YES
 HAVE_DOT               = YES
+DOT_FONTNAME           = FreeSans
+DOT_FONTPATH           =
 CLASS_GRAPH            = YES
 COLLABORATION_GRAPH    = YES
 GROUP_GRAPHS           = YES
 UML_LOOK               = NO
-TEMPLATE_RELATIONS     = NO
-INCLUDE_GRAPH          = NO
+TEMPLATE_RELATIONS     = YES
+INCLUDE_GRAPH          = YES
 INCLUDED_BY_GRAPH      = NO
 CALL_GRAPH             = NO
-GRAPHICAL_HIERARCHY    = NO
+CALLER_GRAPH           = NO
+GRAPHICAL_HIERARCHY    = YES
 DIRECTORY_GRAPH        = NO
 DOT_IMAGE_FORMAT       = png
-DOT_PATH               = 
-DOTFILE_DIRS           = 
-MAX_DOT_GRAPH_WIDTH    = 1024
-MAX_DOT_GRAPH_HEIGHT   = 1024
+DOT_PATH               =
+DOTFILE_DIRS           =
+DOT_GRAPH_MAX_NODES    = 50
 MAX_DOT_GRAPH_DEPTH    = 1000
 DOT_TRANSPARENT        = NO
-DOT_MULTI_TARGETS      = NO
+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

FEATURES

@@ -1,11 +1,32 @@
 KMess Feature list
 ========================
 - 2.0 -
-Support to receive Ink (hand-written) messages.
-Options to copy a contact's email, name, message and links present in the name/message
+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
 List of contact events, such as logins and logouts.
 Chat Windows can be used again when 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.
+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.
+Support to MSN Plus text formatting.
+Support for DBus remote application control.
+Option to choose a previously chosen display picture.
+Support for dark KDE color schemes.
+More options to improve customization of the Contact List.
+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.
 
 - 1.5.1 -
 Contact's MSN client detection.

NEWS

@@ -1,3 +1,151 @@
+
+Changes between KMess SVN and 2.0-beta1:
+--------------------------------------
+- None yet.
+
+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 close button in the contact list search box.
+- 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 Dutch translation by Elvse 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 tabbed chatting support!
+- added offline messaging functionality.
+- 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 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 block notifications when the status is set to Busy.
+- added option to disable displaying of received winks.
+- 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 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.
+
+
 Changes between KMess 2.0-alpha and 1.5.1:
 --------------------------------------
 - ported to KDE 4.
@@ -9,10 +157,29 @@ Changes between KMess 2.0-alpha and 1.5.1:
 - added group selection box to the "add contact" dialog.
 - improved overall user interface.
 - improved client name detection of contacts.
+- improved contact properties dialog
 - fixed font color chooser in the chat window, settings could be lost.
 - fixed contact re-invites (chat resumes) to the chat when the first attempt failed.
 
 
+Changes between KMess 1.5.2 and 1.5.1:
+--------------------------------------
+- added a warning message if a file transfer is started when a non-P2P capable client.
+- fixed displaying passwords in the debug window, make it easier to share debug logs.
+- 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 prevented non-PNG emoticon themes from loading.
+- fixed a crash in debug builds for unknown contacts.
+- fixed a possible crash in the passive popups.
+- fixed a potential crash in background picture transfers (unlikely to occur).
+- fixed a potential passport login problem, not seen yet unfortunately.
+- fixed compiler warning on newer GCC.
+- updated Brazilian Portuguese translation, made by Darlan Campos.
+- updated Simplified Chinese translation by Liu Sizhuang.
+
+
 Changes between KMess 1.5.1 and 1.5:
 --------------------------------------
 - added checking if a screensaver or fullscreen app is running, and disable notification popups.

README

@@ -2,11 +2,12 @@
 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.
@@ -22,11 +23,10 @@ Installation Tip:
 
 First configure your build using the configure script:
 
-  ./configure --prefix=/usr
+  ./configure
 
 If everything went well, you can run:
 
-  cd build
   make
 
 and then, as root, type
@@ -40,6 +40,8 @@ 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.
@@ -86,6 +88,16 @@ Try the following switches to change the build.
   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 whatever 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.
@@ -278,7 +290,7 @@ Building Slackware Packages
 
 To build a TGZ package for Slackware, also run:
 
-  rpmbuild -tb kmess-1.4.tar.gz
+  rpmbuild -tb kmess-2.0.tar.gz
 
 
 

TODO

@@ -1,12 +1,14 @@
 
 
-  Please note this file is replaced by an online Trac installation.
-  Our trac installation can be found at: http://trac.kmess.org/
+  Please note that this file has been replaced by an online project management tool,
+  and all information here can be completely outdated.
+  Our new project management site can be found at: http://trac.kmess.org/
 
   If you're looking for junior jobs, you may also contact us
-  at the KMess help forums.
+  at the KMess help forums: http://kmess.org/board/
 
   Thanks
+  - The KMess team
 
 
 
@@ -16,7 +18,6 @@ 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:
@@ -35,7 +36,6 @@ 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).
 
@@ -44,14 +44,11 @@ ___ Fix repeated picture transfer invitations when contact declines or aborts th
 ___ 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).
+___ See what happens when there is a picture transfer in a multi-chat, and one of the chats becomes busy.
 ___ When opening chat windows, shift their position to make them cascade.
 
 Low-priority code changes:
@@ -60,11 +57,6 @@ ___ 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.
@@ -79,21 +71,8 @@ ___ 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.
@@ -166,6 +145,36 @@ _N_ "Who has me in his/hers contact list?" dialog (allowed/removed groups alread
 _N_ Include the network-window as "--with-network-window" if the network-window-code displays traffic nicer.
 
 
+Implemented for 2.0:
+_Y_ Account menu's: only show submenu when there are multiple accounts.
+_Y_ Add the ability to select another browser for opened links, instead of the kde's default browser.
+_Y_ Change mouse cursor when hovering over the "personal status message" widget, make non-active background color less dark.
+_Y_ 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")
+_Y_ Contact list items flicker, specially when there are a lot of contacts.
+_Y_ Disable cut/copy for the password line (InitialViewInterface, not using KPasswordEdit because it disables too much).
+_Y_ Group chats: use more compact contact frame.
+_Y_ Group off-line contacts in one single group.
+_Y_ 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>">.
+    (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
+_Y_ Maybe: improve chat window layout like http://kde-apps.org/content/show.php?content=24461
+_Y_ Move utility classes to a separate folder.
+_Y_ Order of the title in the main window, account before or after. Should distinguish from the chat windows though.
+_Y_ Put TcpConnectionBase under MsnConnection.
+_Y_ Remove all #includes for <kdebug.h> and replace it with "kmessdebug.h" (watch for inclusions from subdirs)
+_Y_ See what happens when there is a picture transfer in a multi-chat, and one of the chats becomes buzy.
+_Y_ Tabbed chats.
+_Y_ Use if(KMESS_NULL(..)) checks instead of current if(.. != 0) { .. }
+_Y_ Use kdWarning() instead of kdDebug() << "WARNING", for warning messages.
+_Y_ Add HTTP connection method.
+_Y_ Add Ink support?
+_Y_ Upgrade to MSNP14, but not until the protocol is fully understood! (it has some radical changes).
+_Y_ Update contact properties edit dialog, icon button for contact icon.
+_Y_ Browse/view the contact picture cache (include meta data, like contact handle and date/time)
+_Y_ GetHotNewStuff (as of KDE 3.4, either support it through a KPart, or wait for KDE 4 conversion)
+_Y_ KWallet integration
+
 
 
 Future ideas:
@@ -180,13 +189,10 @@ ___ Implement STUN support, also for Connection-Type field, see http://en.wikipe
 ___ 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
@@ -194,12 +200,8 @@ ___ 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

autopackage/default.apspec

@@ -4,7 +4,7 @@
 RootName: @kmess.sourceforge.net/kmess:$SOFTWAREVERSION
 DisplayName: KMess
 ShortName: kmess
-SoftwareVersion: 1.5
+SoftwareVersion: 2.0beta1
 Maintainer: The KMess Developers
 Packager: Diederik van der Boor
 Summary: MSN Messenger client for KDE
@@ -44,9 +44,8 @@ echo "*" | import
 
 
 [Prepare]
-# KDE 3.2 is the minimum requirement,
-# KDE 3.1 support was dropped with 1.5-pre1
-require @kde.org/kdelibs 3.2
+# KDE 4.1 is the minimum requirement for KMess 2
+require @kde.org/kdelibs 4.1
 
 # flash and cabextract are used for winks.
 playWinks="1"

cmake/check-qca2-ossl.sh

@@ -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

cmake/config-kmess.h.in

@@ -2,6 +2,7 @@
  * KMess configuration file
  *
  * The value for these defines is controlled by CMake at configuration time.
+ * NOTE: This file needs to be written in C, as it will be included by C source files too.
  */
 
 /* Define the application version */
@@ -10,11 +11,17 @@
 /* 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) */
-// #define HAS_KPHONE 1
+/* Define if you have KPhone installed (for SIP voice chat) (currently unused) */
+/* #define HAS_KPHONE 1 */
+
+/* Define whether to enable MSN webcam support (HIGHLY EXPERIMENTAL) */
+#define ENABLE_WEBCAM ${KMESS_ENABLE_WEBCAM}

cmake/get-svn-version.sh

@@ -2,7 +2,8 @@
 
 cd `dirname $0`/..
 
-appver="`cat kmess.lsm | grep Version: | sed -re 's/[^0-9]+//'`"
+# second sed expression fixes Mac OS X 10.4
+appver="`cat kmess.lsm | grep Version: | sed -e 's/[^0-9]\+//' -e 's/Version:\( \)*//'`"
 date="`date +%Y%m%d`"
 
 # Make sure we have the right repository
@@ -22,7 +23,11 @@ svnver=`LANG=C svnversion`
 
 # see if this is not a repository.
 if [ "$svnver" = "exported" ]; then
-  echo -n "$appver";
+  if [ -z "$KMESS_VER" ]; then
+    echo -n "$appver";
+  else
+    echo -n "$KMESS_VER";
+  fi
   exit;
 fi
 

configure

@@ -14,21 +14,36 @@
 #   the Free Software Foundation; either version 2 of the License, or
 #   (at your option) any later version.
 #
+#   Note for packagers:
+#     this script is only written to provide a more user friendly
+#     interaction between the command line and the cmake invocation.
+#     If you are familiar with CMake, you may call it directly too.
+#
 
 # ------------------------------
 #
 # Variables
 #
 
+# auto-detect default prefix
+KDE4_PREFIX=""
+DEFAULT_PREFIX="/usr/local"
+if type -p kde4-config >/dev/null; then
+  KDE4_PREFIX=`kde4-config --prefix`
+  DEFAULT_PREFIX="$KDE4_PREFIX"
+fi
+
 # To configure
-PREFIX="/usr/local"
+PREFIX=$DEFAULT_PREFIX
 BUILD_TYPE="relwithdebinfo"
 BUILD_DIR="build"
+REAL_BUILD_DIR=""
 DEBUG=0
+BINRELOC=0
 
 # Globals
 cd `dirname $0`
-SRCDIR="$PWD"
+SRC_DIR="$PWD"
 KMESS_VER="`./cmake/get-svn-version.sh`"
 
 
@@ -45,17 +60,18 @@ function print_help
 Usage: ./configure [arguments]
 
 This is an emulation script of GNU ./configure to give compiling of KDE 4
-software a more familiar usage. To use the full potential of the KDE 4
-build system, run 'cmake <path to this directory>' from an empty directory.
+software a more familiar usage. Experienced users are free to use cmake
+instead. This configure script should provide everything you need though.
 
 Configuration:
   -h, --help              display this help and exit
 
 Installation directories:
-  --prefix=PREFIX         install files in PREFIX. default: /usr/local
+  --prefix=PREFIX         install files in PREFIX. default: $DEFAULT_PREFIX
 
 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
@@ -64,9 +80,26 @@ Optional Features:
                             debug             - debug build
                             debugfull         - full debug build
 
-To have more influence over the build configuration, run 'cmake' directly.
-See the README file for more information.
+
+After running ./configure, you can type 'make' to build this project.
 "
+
+  # Hint for kde installation
+  if [ "$KDE4_PREFIX" != "" ]; then
+    if [ "$KDE4_PREFIX" != "$PREFIX" ]; then
+      echo "  NOTICE:
+
+    The installation prefix is set to '$PREFIX'. You may want to set
+    the prefix to '$KDE4_PREFIX' to install the files in the KDE 4 folder.
+"
+    fi
+  else
+    echo "  WARNING:
+
+    kde4-config was not found. Please verify that 
+    you've installed the KDE 4 development packages!
+"
+  fi
 }
 
 
@@ -93,52 +126,99 @@ function run_cmake
       ;;
   esac
 
-  # Make the directory
+  # Make the directory,
+  # and switch so build messages are ok.
   test -e "$BUILD_DIR" || mkdir "$BUILD_DIR" || exit 1
+  cd "$BUILD_DIR"
+  REAL_BUILD_DIR=`pwd`
 
-  # Start cmake
-  cd $BUILD_DIR
+  # 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 "               "$SRCDIR" "
+  echo "               -D KMESS_ENABLE_BINRELOC=$BINRELOC \ "
+  echo "               "$SRC_DIR" "
   echo ""
 
+  # finally start cmake
   cmake -D CMAKE_INSTALL_PREFIX=$PREFIX \
         -D CMAKE_BUILD_TYPE=$BUILD_TYPE \
         -D KMESS_DEBUG_OUTPUT=$DEBUG \
-        "$SRCDIR" \
+        -D KMESS_ENABLE_BINRELOC=$BINRELOC \
+        "$SRC_DIR" \
       && cmake_ok || cmake_error
 }
 
 
 function cmake_ok
 {
-  local HAS_XSS="no  (extension not detected)"
-  local HAS_DEBUG="no  (good!)"
+  # 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!)"
+    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
 
-  echo "-- cmake completed
+  # create a makefile to redirect all calls to the build directory
+  makefile=$SRC_DIR/Makefile
+  targets=`grep '^[A-Za-z_\/\-]\+:' Makefile | cut -f 1 -d ':'`
+  echo "# Generated by ./configure: NO NOT EDIT!
+# Build features:
+#
+#   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 \\
+#         -D KMESS_ENABLE_BINRELOC=$BINRELOC \\
+#         \"$SRC_DIR\"
+#
+" > $makefile
 
-  Install prefix:      $PREFIX
-  Auto-away feature:   $HAS_XSS
-  Debugging messages:  $HAS_DEBUG
-  Binary relocatable:  ..  (todo)
+  for target in $targets; do
+    echo "$target:"  >> $makefile
+    echo -en "\t"    >> $makefile
+    echo "@\$(MAKE) --no-print-directory -C '$BUILD_DIR' $target"  >> $makefile
+    echo ""          >> $makefile
+  done
+
+  # display a configure report
+  echo "-- configure completed
 
 
-  Enter the following commands to continue:
+  Build features:
+
+    Install prefix:      $PREFIX
+    Auto-away feature:   $HAS_XSS
+    Debugging messages:  $HAS_DEBUG
+    Binary relocatable:  $HAS_BINRELOC
+    Build type:          $BUILD_TYPE
+
+
+  Enter the following command to continue:
 
-    cd $BUILD_DIR
     make
 "
 }
@@ -159,34 +239,59 @@ echo "-- cmake failed
 # Main
 #
 
-# Parse the arguments
-TEMP=`getopt --name=configure \
-             --options h \
-             --longoptions help,prefix:,enable-debug-output,build-type:,build-dir:,build-folder: -- "$@"`
-case "$?" in
-   0) ;;
-   *) exit 1 ;;
-esac
+# parse arguments
+if [ -n "$*" ]; then
 
+  # check against BSD / Mac OS getopt, which is seriously lacking.
+  # It does not support additional options, so it will recognize everything
+  # after --longoptions as the $@ input.
+  if ! getopt --longoptions --prefix -- "" 2>/dev/null >/dev/null; then
+    echo "$0: Sorry, can't handle arguments at this platform.
+Your getopt version does not support long arguments.
 
-# Note the quotes around `$TEMP': they are essential!
-eval set -- "$TEMP"
+Please run cmake directly, for example:
 
-while true ; do
-  case "$1" in
-  -h|--help)                  print_help;      exit 0  ;;
-  --prefix)                   PREFIX=$2;       shift 2 ;;
-  --enable-debug-output)      DEBUG=1;         shift   ;;
-  --build-type)               BUILD_TYPE="$2"; shift 2 ;;
-  --build-dir|--build-folder) BUILD_DIR="$2";  shift 2 ;;
-  --) shift ; break ;;
-  *) echo "Internal error!" ; exit 1 ;;
+  mkdir build
+  cd build
+  cmake -D CMAKE_INSTALL_PREFIX=/usr ../
+  make
+  make install
+" >&2
+    exit 1
+  fi
+
+  # Parse the arguments
+  longopts="help,prefix:,build-type:,build-dir:,build-folder:,enable-binreloc,enable-debug-output"
+  TEMP=`getopt --name=configure \
+               --options h \
+               --longoptions "$longopts" -- "$@"`
+  case "$?" in
+     0) ;;
+     *) exit 1 ;;
   esac
-done
 
-if [ -n "$1" ]; then
-  echo "$0: invalid arguments: $@"
-  exit 1
+
+  # Note the quotes around `$TEMP': they are essential!
+  eval set -- "$TEMP"
+
+  while true ; do
+    case "$1" in
+    -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.
+    --) shift ; break ;;
+    *) echo "$0: internal error at argument '$1'!" ; exit 1 ;;
+    esac
+  done
+
+  if [ -n "$1" ]; then
+    echo "$0: invalid arguments: $@"
+    exit 1
+  fi
 fi
 
 

data/CMakeLists.txt

@@ -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}   )

data/chatstyles/CMakeLists.txt

@@ -7,6 +7,7 @@ add_subdirectory( Classic-compact )
 add_subdirectory( Dim )
 add_subdirectory( Efficient )
 add_subdirectory( Fresh )
+add_subdirectory( Fresh-dark )
 add_subdirectory( Pure )
 
 

data/chatstyles/Classic-compact/Classic-compact.css

@@ -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.

data/chatstyles/Classic-compact/Classic-compact.xsl

@@ -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>
 

data/chatstyles/Classic/Classic.css

@@ -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.

data/chatstyles/Colourful-Enclosed/Colourful-Enclosed.css

@@ -195,3 +195,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;
+}

data/chatstyles/Dim/Dim.css

@@ -183,3 +183,14 @@ img.customEmoticonPlaceholder
   vertical-align: top;
 }
 
+
+
+/*
+ * Separator for the various chats within HTML files
+ */
+div.conversation
+{
+  margin-top: 3em;
+  margin-bottom: 1em;
+  color: purple;
+}

data/chatstyles/Efficient/Efficient.css

@@ -251,3 +251,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;
+}

data/chatstyles/Fresh-dark/CMakeLists.txt

@@ -0,0 +1,8 @@
+
+include_directories( ${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}  )
+
+
+########### install files ###############
+
+install( FILES  Fresh-dark.xsl Fresh-dark.css bg_gravatar.gif bg_gravatar_rtl.gif buddy_icon.png DESTINATION ${DATA_INSTALL_DIR}/kmess/styles/Fresh-dark/ )
+

data/chatstyles/Fresh-dark/Fresh-dark.css

@@ -0,0 +1,296 @@
+/*
+  'Fresh Dark' style for KMess.
+  Copyright (C) 2008, Valerio Pilo
+  Copyright (C) 2006, Diederik van der Boor
+  Copyright (c) 2006, Benjamin Deveze
+
+  Design based on 'Fresh' by Benjamin Deveze
+  http://www.kde-look.org/content/show.php?content=43099
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License
+  as published by the Free Software Foundation; either version 2
+  of the License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+*/
+
+
+
+/*
+ * the incoming and outgoing messages are implemented as definition-list (<dl>).
+ * each message type has a different background/border color.
+ *
+ * the header is added to the <dt> tag, the message body to the <dd> tag.
+ * this is easy to format with css, and easy to read without css markup.
+ */
+
+
+/*
+ * reset some default margins.
+ */
+dl, dt, dd
+{
+  margin:  0;
+  padding: 0;
+}
+
+
+/*
+ * make sure position: absolute stays in the message (for time).
+ */
+.incoming,
+.outgoing,
+.offlineIncoming
+{
+  position: relative;
+}
+
+
+/*
+ * general message layout and colors.
+ */
+.outgoing
+{
+  background-color: #120d00;
+  border-top:       1px solid #010700;
+  border-bottom:    1px solid #010700;
+}
+
+.avatar
+{
+  background-image:  url("bg_gravatar.gif");
+  background-repeat: no-repeat;
+  float:    left;
+  margin:   10px;
+  width:    93px;
+  height:   70px;
+  overflow: hidden;
+  /* instead of padding, use margin on img to align it.
+     makes the computation of width and height easier */
+}
+
+.rtl .avatar
+{
+  float: right;
+  background-image: url("bg_gravatar_rtl.gif");
+}
+
+.avatar img
+{
+  margin-left: 11px;
+  margin-top:  11px;
+  height: 48px;
+  width:  48px;
+  /* omitting the width auto scales, but it becomes ugly */
+}
+
+.rtl .avatar img
+{
+  margin-left: 34px;
+}
+
+.incoming,
+.outgoing,
+.offlineIncoming
+{
+  margin-top:    4px;
+  margin-bottom: 4px;
+  /* new messages should appear below the float */
+  clear: both;
+}
+
+.incoming dl,
+.outgoing dl,
+.offlineIncoming dl
+{
+  /* for alignment of lines under the float */
+  margin-left: 113px;  /* avatar width + margin */
+  margin-top:  11px;
+  padding-bottom: 0.7em;
+}
+
+div.application,
+div.notification,
+div.system
+{
+  margin-left:   11px;
+  margin-top:    0.7em;
+  margin-bottom: 0.7em;  /* no padding, so time also gets margin */
+  position:    relative; /* for time */
+}
+
+
+
+/*
+ * name in message title.
+ */
+dt span.name
+{
+  display:       block;
+  color:         #bbccdd;
+  font-weight:   bold;
+  margin-bottom: 0.3em;
+  margin-right:  2px;
+}
+
+.offlineIncoming dt span.name
+{
+  color: #485770;
+}
+
+
+
+/*
+ * time in message title and other messages.
+ */
+span.time
+{
+  position: absolute;
+  right:    5px;
+  bottom:   0;
+  color:       #ccddcc;
+  font-size:   8pt;
+
+  /* some margins to fix most ugly stuff when resizing */
+  margin-left:   5px;
+  margin-bottom: 0;
+}
+
+.rtl span.time
+{
+  /* reverse for right-to-left */
+  position: absolute;
+  left:     5px;
+  right:    auto;
+  margin-left:  0;
+  margin-right: 5px;
+}
+
+
+
+/*
+ * message body.
+ * reset spacing and default indent of dd element.
+ */
+dd
+{
+  margin:  0;
+  padding: 0;
+}
+
+dd div.messageContent
+{
+  /* avoid overlapping the time field */
+  padding-right: 5em;
+}
+
+
+
+/*
+ * grouped messages splitter effect
+ */
+.messagegroup dd.middle-child,
+.messagegroup dd.last-child
+{
+  margin-top:  0.4em;
+  padding-top: 0.4em;
+  border-top:  1px solid #000500;
+}
+
+.messagegroup dd.last-child
+{
+  padding-bottom: 5px;
+}
+
+.messagegroup dd
+{
+  position: relative; /* startpoint for absolute positions */
+}
+
+
+
+/*
+ * other messages;
+ * - application message (e.g. invitation)
+ * - notification message (e.g. file transfer complete)
+ * - system message (e.g. error, invitation not supported)
+ */
+div.application
+{
+  color: #0b0;
+}
+
+div.notification
+{
+  color: #bb0;
+}
+
+div.system
+{
+  color: #b00;
+}
+
+span.filename {
+  color: #0b0;
+}
+
+span.failedFilename,
+div.notification .filename {
+  color: #b00;
+}
+
+
+
+/**
+ * Draw a border arround emoticon placeholders.
+ */
+img.customEmoticonPlaceholder
+{
+  border: 1px dotted #ccc;
+}
+
+
+
+/*
+ * fix alignment of emoticons
+ */
+img.standardEmoticon,
+img.customEmoticon,
+img.customEmoticonPlaceholder
+{
+  vertical-align: top;
+}
+
+
+
+/*
+ * Set the standard body margins.
+ * The extra #ChatMessageView prefix is needed to overrule
+ * the inline rule added by the chat window.
+ */
+#ChatMessageView body
+{
+  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;
+}

data/chatstyles/Fresh-dark/Fresh-dark.xsl

@@ -0,0 +1,234 @@
+<?xml version='1.0'?>
+<!--
+  'Fresh Dark' style for KMess.
+  Copyright (C) 2008, Valerio Pilo
+  Copyright (C) 2006, Diederik van der Boor
+  Copyright (c) 2006, Benjamin Deveze
+
+  Design based on 'Fresh' by Benjamin Deveze
+  http://www.kde-look.org/content/show.php?content=43099
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License
+  as published by the Free Software Foundation; either version 2
+  of the License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+-->
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:kmess="http://www.kmess.org/xmlns/ChatStyles/v1/" >
+  <xsl:output method="html"
+              encoding="utf-8"
+              indent="no"
+              omit-xml-declaration="yes"
+              doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
+              doctype-system="http://www.w3.org/TR/html4/loose.dtd" />
+
+  <!--
+    Declare external parameters with default values
+  -->
+  <xsl:param name="basepath" select="'.'" />
+  <xsl:param name="csspath"  select="'Fresh-dark.css'" />
+
+
+  <!--
+    Template for the page body
+  -->
+  <xsl:template match="messageRoot">
+    <html id="ChatMessageView">
+      <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+        <base href="{$basepath}" />
+        <style type="text/css">
+          /* standard colors for compatibility with light color schemes */
+          body      { font-size: 10pt; margin: 0; padding: 5px; background-color: #333; color: #eee; }
+          a:link    { color: blue; }
+          a:visited { color: purple; }
+          a:hover   { color: red; }
+          a:active  { color: red; }
+        </style>
+        <style type="text/css">
+          /* import additional style */
+          @import "<xsl:value-of select="$csspath" />";
+        </style>
+      </head>
+      <body>
+        <div id="messageRoot">
+          <!-- chat messages are appended here by KMess -->
+          <xsl:apply-templates />
+        </div>
+      </body>
+    </html>
+  </xsl:template>
+
+  <!--
+    Template for normal messages
+  -->
+  <xsl:template match="message">
+    <xsl:choose>
+
+      <!--
+        normal chat message,
+        - incoming message from a contact.
+        - outgoing message from the user.
+        - incoming offline-im message from a contact.
+      -->
+      <xsl:when test="@type='incoming' or @type='outgoing' or @type='offlineIncoming'">
+        <div class="{body/@dir}">
+          <div class="{@type}">
+
+            <!-- user avatar -->
+            <div class="avatar">
+              <div class="avatarSpace">
+                <xsl:choose>
+                  <xsl:when test="from/contact/displayPicture/@url">
+                    <img src="{from/contact/displayPicture/@url}" height="48" alt="" />
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <img src="buddy_icon.png" height="48" width="48" alt="" />
+                  </xsl:otherwise>
+                </xsl:choose>
+              </div>
+            </div>
+
+            <dl>
+              <!-- message header -->
+              <dt dir="{from/contact/displayName/@dir}">
+                <!-- show name -->
+                <span class="name">
+                  <xsl:value-of disable-output-escaping="yes" select="from/contact/displayName/@text"/>
+                  <xsl:text>:</xsl:text>
+                </span>
+              </dt>
+
+              <!-- message body -->
+              <dd dir="{body/@dir}">
+                <!-- show time? -->
+                <xsl:if test="@time">
+                  <span class="time">
+                    <xsl:if test="@type='offlineIncoming'">
+                      <xsl:value-of select="@date"/> &#160;
+                    </xsl:if>
+                    <xsl:value-of select="@time"/>
+                  </span>
+                </xsl:if>
+
+                <div class="messageContent">
+                  <xsl:value-of disable-output-escaping="yes" select="body/@fontBefore"/>
+                  <xsl:value-of disable-output-escaping="yes" select="body"/>
+                  <xsl:value-of disable-output-escaping="yes" select="body/@fontAfter"/>
+                </div>
+              </dd>
+            </dl>
+
+            <!-- clear all floats -->
+            <div class="messageFooter" style="clear:both"></div>
+
+          </div>
+        </div>
+      </xsl:when>
+
+      <!--
+        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'">
+        <div class="{body/@dir}">
+          <div class="{@type}" dir="{body/@dir}">
+
+            <!-- this style also displays the time for other messages -->
+            <xsl:if test="@time">
+              <span class="time"><xsl:value-of select="@time"/></span>
+            </xsl:if>
+
+            <div class="messageContent">
+              <xsl:value-of disable-output-escaping="yes" select="body"/>
+            </div>
+          </div>
+        </div>
+      </xsl:when>
+
+    </xsl:choose>
+  </xsl:template>
+
+
+  <!--
+    Message group template
+    This is used to group follow-up messages from the same contact.
+  -->
+  <xsl:template match="messagegroup">
+    <div class="messagegroup">
+      <div class="{message[1]/body/@dir}">
+        <div class="{message[1]/@type}">
+
+          <!-- user avatar -->
+          <div class="avatar">
+            <div class="avatarSpace">
+              <!-- use the last message, so the icon updates when the buddy changes their icon
+                   with the commonly used "look at my icon now" message -->
+              <xsl:choose>
+                <xsl:when test="message[last()]/from/contact/displayPicture/@url">
+                  <img src="{message[last()]/from/contact/displayPicture/@url}" height="48" alt="" />
+                </xsl:when>
+                <xsl:otherwise>
+                  <img src="buddy_icon.png" height="48" width="48" alt="" />
+                </xsl:otherwise>
+              </xsl:choose>
+            </div>
+          </div>
+
+          <dl>
+            <!-- message header -->
+            <dt dir="{message[1]/from/contact/displayName/@dir}">
+              <!-- show name -->
+              <span class="name">
+                <xsl:value-of disable-output-escaping="yes" select="message[1]/from/contact/displayName/@text"/>
+                <xsl:text>:</xsl:text>
+              </span>
+            </dt>
+
+            <!-- message body -->
+            <xsl:for-each select="message">
+              <dd dir="{body/@dir}">
+                <!-- add extra attribute for css -->
+                <xsl:attribute name="class">
+                  <xsl:choose>
+                    <xsl:when test="position() = last()"><xsl:text>last-child</xsl:text></xsl:when>
+                    <xsl:when test="position() = 1"><xsl:text>first-child</xsl:text></xsl:when>
+                    <xsl:otherwise><xsl:text>middle-child</xsl:text></xsl:otherwise>
+                  </xsl:choose>
+                </xsl:attribute>
+
+                <!-- show time? -->
+                <xsl:if test="@time">
+                  <span class="time"><xsl:value-of select="@time"/></span>
+                </xsl:if>
+
+                <div class="messageContent">
+                  <xsl:value-of disable-output-escaping="yes" select="body/@fontBefore"/>
+                  <xsl:value-of disable-output-escaping="yes" select="body"/>
+                  <xsl:value-of disable-output-escaping="yes" select="body/@fontAfter"/>
+                </div>
+              </dd>
+            </xsl:for-each>
+          </dl>
+
+          <!-- clear all floats -->
+          <div class="messageFooter" style="clear:both"></div>
+
+        </div>
+      </div>
+    </div>
+  </xsl:template>
+
+</xsl:stylesheet>

data/chatstyles/Fresh/Fresh.css

@@ -280,3 +280,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;
+}

data/chatstyles/Pure/Pure.css

@@ -319,3 +319,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;
+}

data/emoticons/KMess2-new/emoticons.xml

@@ -226,10 +226,6 @@
 	<string>(bah)</string>
 </emoticon>
 
-<emoticon file="goat">
-	<string>(nah)</string>
-</emoticon>
-
 <emoticon file="bat">
 	<string>:[</string>
 	<string>:-[</string>

data/icons/CMakeLists.txt

@@ -1,4 +1,15 @@
 
 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 gnomemeeting.png DESTINATION ${KMESS_ICON_INSTALL_DIR}/apps )

data/kmess.desktop

@@ -8,7 +8,7 @@ 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[de]=MSN-Messenger-Klon für KDE 4
 Comment[nl]=MSN Messenger Kloon voor KDE 4
 GenericName=MSN Client
 GenericName[af]=Irc Kliënt
@@ -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]=MSN-Programm
 GenericName[el]=Πελάτης MSN
 GenericName[eo]=MSN-kliento
 GenericName[es]=Cliente de MSN

data/kmess.notifyrc

@@ -3,38 +3,50 @@ Name=KMess
 IconName=kmess
 Comment=KMess Messenger Client
 
-#[Event/contact online]
-#Name=Contact Online
-#Comment=A contact has come online
-#Sound=kmess_logon.ogg
-#Action=Sound|Popup|Taskbar
+[Event/contact online]
+Name=Contact Online
+Comment=A contact has come online
+Sound=kmess_logon.ogg
+Action=Sound|Popup
 
-#[Event/contact status]
-#Name=Contact Status
-#Comment=A contact has changed its MSN status
-#Sound=kmess_logon.ogg
-#Action=Sound|Popup|Taskbar
+[Event/contact status]
+Name=Contact Status
+Comment=A contact has changed its MSN status
+Sound=kmess_logon.ogg
+Action=
 
-#[Event/contact offline]
-#Name=Contact Offline
-#Comment=A contact has gone offline
-#Sound=kmess_logoff.ogg
-#Action=Sound|Popup|Taskbar
+[Event/contact offline]
+Name=Contact Offline
+Comment=A contact has gone offline
+Sound=kmess_logoff.ogg
+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/new email]
-#Name=New Email
-#Comment=You have received a new email
-#Sound=kmess_msg.ogg
-#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|Popup|Taskbar
+
+[Event/status]
+Name=KMess and Network Status
+Comment=Information on network and application status
+Sound=KDE-Sys-Special.ogg
+Action=Sound|Popup

data/kmesschatstyles.knsrc

@@ -0,0 +1,4 @@
+[KNewStuff2]
+ProvidersUrl=http://kmess.org/newstuff/chatstyles/providers.xml
+TargetDir=kmess/styles
+Uncompress=true

data/pics/CMakeLists.txt

@@ -8,16 +8,17 @@ 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
    onthephone.png
    unknown.png
-   ox16-action-contact_food_overlay.png
-   ox16-action-contact_phone_overlay.png
+   contact_food_overlay.png
+   contact_phone_overlay.png
+   contact_busy_overlay.png
 )
 
 INSTALL( FILES ${kmess_PICS} DESTINATION ${DATA_INSTALL_DIR}/kmess/pics )

doc/en/CMakeLists.txt

@@ -5,5 +5,5 @@ include_directories( ${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}  )
 ########### install files ###############
 
 
-kde4_create_handbook( index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR "kmess" )
+kde4_create_handbook( index.docbook INSTALL_DESTINATION "${HTML_INSTALL_DIR}/en" SUBDIR "kmess" )
 

kmess.lsm

@@ -1,6 +1,6 @@
 Begin4
 Title:          KMess
-Version:        2.0alpha
+Version:        2.0beta1
 Entered-date:   2005-05-05
 Description:    A MSN Messenger / Windows Live Messenger client for KDE
 Keywords:       KDE X11 desktop MSN Messenger

kmess.spec

@@ -13,8 +13,8 @@
 
 # PACKAGE SETTINGS
 #
-%define kmess_version     2.0alpha
-%define kmess_tar_version 2.0alpha
+%define kmess_version     2.0beta1
+%define kmess_tar_version 2.0beta1
 %define rpm_release 1
 %define with_debug  0
 %define doc_files   AUTHORS COPYING FEATURES INSTALL NEWS README TODO
@@ -67,6 +67,18 @@
 %define qtgui_package       %(rpm -qf %{qtlib_prefix}/libQtGui.so.4 | cut -f1 -d"-")
 %define kdelibs_dev_package %(rpm -qf %{kde_prefix}/lib/libkdeui.so | cut -f1-2 -d"-")
 %define qtgui_dev_package   %(rpm -qf %{qtlib_prefix}/libQtGui.so | cut -f1-2 -d"-")
+%if ! %(echo %{kdelibs_package} | grep -q 'not owned by any package' ; echo $?)
+  %define kdelibs_package   libkde4
+%endif
+%if ! %(echo %{qtgui_package} | grep -q 'not owned by any package' ; echo $?)
+  %define qtgui_package   libqt4
+%endif
+%if ! %(echo %{kdelibs_dev_package} | grep -q 'not owned by any package' ; echo $?)
+  %define kdelibs_dev_package   libkde4-devel
+%endif
+%if ! %(echo %{qtgui_dev_package} | grep -q 'not owned by any package' ; echo $?)
+  %define qtgui_dev_package   libqt4-devel
+%endif
 
 
 
@@ -178,7 +190,6 @@ Requires:       %{qtgui_dev_package} >= 4.3
 BuildRequires:  %{qtgui_package} >= 4.3
 %endif
 
-
 %description
 KMess is a MSN Messenger / Windows Live Messenger client for Linux.
 It enables Linux users to chat with friends online who are using
@@ -283,9 +294,9 @@ mkdir "${RPM_BUILD_ROOT}"  # required by some distro's, slackware for always bui
 %{name}: MSN Messenger in Windows or Mac OS. The strength of KMess is it's
 %{name}: integration with the KDE desktop environment, focus on MSN Messenger
 %{name}: specific features and an easy-to-use interface.
-%{name}: 
+%{name}:
 %{name}: Package Created By: KMess development team
-%{name}: 
+%{name}:
 END
 %endif
 ##' fix syntax for vim

po/maketrans

@@ -8,7 +8,7 @@
 #
 
 
-BASEDIR="../kmess/"   # root of translatable sources
+BASEDIR="../src/"     # root of translatable sources
 PROJECT="kmess"       # project name
 BUGADDR="http://www.kmess.org/board/"
 WDIR=`pwd`
@@ -31,7 +31,7 @@ xargs --arg-file=$RC_LIST ${EXTRACTRC} > $RC_CPP
 
 # Parse .xsl files
 echo "extracting translations from *.xsl files.."
-sh ./styles/extract-xsl-messages >> $RC_CPP
+sh ../data/chatstyles/extract-xsl-messages >> $RC_CPP
 
 # Parse .cpp files
 echo "extracting translations from *.cpp files.."
@@ -41,14 +41,14 @@ find . -name '*.cpp' -o -name '*.h' -o -name '*.c' | sort >> $IN_LIST
 cd $WDIR
 xgettext --from-code=UTF-8 --language=C++ -kde \
          -ci18n \
-		 -ki18n:1 -ki18nc:1c,2 -ki18np:1,2 -ki18ncp:1c,2,3 -ktr2i18n:1 \
-		 -kki18n:1 -kki18nc:1c,2 -kki18np:1,2 -kki18ncp:1c,2,3 \
+         -ki18n:1 -ki18nc:1c,2 -ki18np:1,2 -ki18ncp:1c,2,3 -ktr2i18n:1 \
+         -kki18n:1 -kki18nc:1c,2 -kki18np:1,2 -kki18ncp:1c,2,3 \
          -kI18N_NOOP:1 -kI18N_NOOP2:1c,2 -kaliasLocale \
-		 --debug \
+         --debug \
          --msgid-bugs-address="$BUGADDR" \
-		 --exclude-file=kmess.pot.ignore \
+         --exclude-file=kmess.pot.ignore \
          --files-from=$IN_LIST -D $BASEDIR -D $WDIR \
-		 -o $PROJECT.pot || { echo "error while calling xgettext. aborting."; exit 1; }
+         -o $PROJECT.pot || { echo "error while calling xgettext. aborting."; exit 1; }
 
 # Cleanup
 rm $IN_LIST

po/mergetrans

@@ -3,13 +3,13 @@
 # List all the languages
 #langs="`find . -name '*.po' -printf '%P ' `"
 langs="`find . -name '*.po' | sort | xargs `"
-langs="${langs//.po/}"
 
 # Merge kmess.pot messages for each language
 # (same as "cd po; make merge" if you have the Makefiles
 #  generated in the same folder Makefile.in lives)
 for lang in $langs
 do
+	lang=`basename $lang .po`
 	echo $lang
 	mv "$lang.po" "$lang.po.bak"
 	msgmerge -o "$lang.po" "$lang.po.bak" "kmess.pot" && rm "$lang.po.bak"