SVN commit 884493 by mattr:

Enable the new WLM plugin for Kopete.

This new plugin replaces the MSN plugin and requires an external library
called libmsn which can be gotten from http://sourceforge.net/projects/libmsn
We're working towards a 0.4 release of that library but until then, please
download the beta versions.

The new WLM plugin provides support for the MSNP15 protocol version and in
general lays the groundwork for a better MSN plugin.

Thanks go to Tiago Salem Herrmann, Gustavo Boiko, and Roman Jarosz for doing
all the heavy lifting.

CCMAIL: kopete-devel@kde.org



 A             cmake/modules/FindLibmsn.cmake  
 M  +4 -0      kopete/CMakeLists.txt  
 M  +6 -1      kopete/protocols/CMakeLists.txt  
 M  +1 -13     kopete/protocols/wlm/CMakeLists.txt  


--- trunk/KDE/kdenetwork/kopete/CMakeLists.txt #884492:884493
@@ -29,6 +29,10 @@
 macro_bool_to_01(LIBOTR_FOUND HAVE_LIBOTR)
 macro_log_feature(LIBOTR_FOUND "libotr" "A library to encrypt messages with Off-the-Record encryption" "http://www.cypherpunks.ca/otr" FALSE "3.1.0" "Required for the Kopete otr plugin.")
 
+macro_optional_find_package(Libmsn)
+macro_bool_to_01(LIBMSN_FOUND HAVE_LIBMSN)
+macro_log_feature(LIBMSN_FOUND "libmsn" "A library providing support for the msn protocol" "http://sourceforge.net/projects/libmsn" FALSE "0.4.0" "Required for the Kopete wlm plugin")
+
 check_include_files(valgrind/valgrind.h HAVE_VALGRIND_H)
 check_include_files(stdint.h HAVE_STDINT_H)
 check_include_files(inttypes.h HAVE_INTTYPES_H)
--- trunk/KDE/kdenetwork/kopete/protocols/CMakeLists.txt #884492:884493
@@ -7,7 +7,7 @@
 
 option(WITH_testbed "Enable Kopete testbed protocol" ON)
 option(WITH_messenger "Enable Kopete MSN/Windows Live Messenger protocol" OFF)
-option(WITH_msn "Enable Kopete MSN protocol" ON)
+option(WITH_msn "Enable Kopete MSN protocol" OFF)
 option(WITH_oscar "Enable Kopete Oscar (ICQ and AIM) protocol" ON)
 option(WITH_yahoo "Enable Kopete Yahoo protocol" ON)
 option(WITH_qq "Enable Kopete QQ protocol" ON)
@@ -19,9 +19,14 @@
 option(WITH_jabber "Enable Kopete Jabber protocol" ON)
 option(WITH_bonjour "Enable Kopete Bonjour protocol" ON)
 option(WITH_irc "Enable Kopete IRC protocol" OFF)
+option(WITH_wlm "Enable Window Live Messenger support" ON)
 
 include_directories(${KOPETE_INCLUDES})
 
+if(WITH_wlm AND LIBMSN_FOUND)
+  add_subdirectory( wlm )
+endif(WITH_wlm AND LIBMSN_FOUND)
+
 if(WITH_msn)
   add_subdirectory( msn ) 
 endif(WITH_msn)
--- trunk/KDE/kdenetwork/kopete/protocols/wlm/CMakeLists.txt #884492:884493
@@ -1,19 +1,7 @@
 project(wlm)
 
-find_package(KDE4 REQUIRED)
-include(KDE4Defaults)
-include(MacroLibrary)
-
-find_package(Kopete REQUIRED)
-
-include_directories(${KDE4_INCLUDES})
-add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
-
 ADD_SUBDIRECTORY(icons)
 
-# FIXME: the libkopete source directory is only needed because of private/kopeteemoticons.h
-set(KOPETE_INCLUDES ${KOPETE_INCLUDE_DIR}/kopete/ ${KOPETE_INCLUDE_DIR}/kopete/ui/ /home/kde4/kdenetwork/kopete/libkopete)
-
 include_directories(
     ${KOPETE_INCLUDES}
     ${CMAKE_CURRENT_SOURCE_DIR}/ui
@@ -50,7 +38,7 @@
     ${QT_QTNETWORK_LIBRARY} 
     kopete 
     kopete_videodevice 
-    msn
+    ${LIBMSN_LIBRARIES}
 )
 
 install(TARGETS kopete_wlm  DESTINATION ${PLUGIN_INSTALL_DIR})
_______________________________________________
kopete-devel mailing list
kopete-devel@kde.org
https://mail.kde.org/mailman/listinfo/kopete-devel