Commit 13ea7de4 authored by Laurent Montel's avatar Laurent Montel 😁

Reactivate openxchange

parent f356f91e
......@@ -31,7 +31,7 @@ find_package(KF5AkonadiMime ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5PimIdentities ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5MailTransport ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5Mime ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5AkonadiContact ${KF5_VERSION} CONFIG REQUIRED)
# Xsltproc
find_package(Xsltproc)
......@@ -118,7 +118,7 @@ add_subdirectory( localbookmarks )
#add_subdirectory( maildir )
#add_subdirectory( openxchange )
add_subdirectory( openxchange )
add_subdirectory( pop3 )
#if( LibKGAPI2_FOUND )
......
kde_enable_exceptions()
set( openxchangeresource_SRCS
oxa/connectiontestjob.cpp
oxa/contactutils.cpp
......@@ -44,7 +46,7 @@ qt5_add_dbus_adaptor(openxchangeresource_SRCS
${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.OpenXchange.Settings.xml settings.h Settings
)
add_executable(akonadi_openxchange_resource RUN_UNINSTALLED ${openxchangeresource_SRCS})
add_executable(akonadi_openxchange_resource ${openxchangeresource_SRCS})
if (Q_WS_MAC)
set_target_properties(akonadi_openxchange_resource PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/../Info.plist.template)
......@@ -53,7 +55,7 @@ if (Q_WS_MAC)
endif ()
target_link_libraries(akonadi_openxchange_resource KF5::AkonadiCore ${KDEPIMLIBS_KABC_LIBS} ${KDE4_KDECORE_LIBS} KF5::KIOCore KF5::CalendarCore ${KDEPIMLIBS_AKONADI_CONTACT_LIBS} )
target_link_libraries(akonadi_openxchange_resource KF5::AkonadiAgentBase KF5::AkonadiCore KF5::Abc KF5::KIOCore KF5::CalendarCore KF5::AkonadiContact )
install(TARGETS akonadi_openxchange_resource ${INSTALL_TARGETS_DEFAULT_ARGS})
......
......@@ -28,6 +28,7 @@
#include <kconfigdialogmanager.h>
#include <kmessagebox.h>
#include <kwindowsystem.h>
#include <KLocalizedString>
ConfigDialog::ConfigDialog( WId windowId )
: KDialog()
......@@ -72,6 +73,7 @@ void ConfigDialog::save()
void ConfigDialog::showAboutDialog()
{
#if 0 //QT5
KAboutData aboutData( "ox", "", ki18n( "Open-Xchange" ), "0.1",
ki18n( "Akonadi Open-Xchange Resource" ),
KAboutData::License_LGPL,
......@@ -81,6 +83,7 @@ void ConfigDialog::showAboutDialog()
KAboutApplicationDialog dlg( &aboutData, this );
dlg.exec();
#endif
}
void ConfigDialog::updateButtonState()
......
......@@ -25,7 +25,7 @@
#include "oxutils.h"
#include "users.h"
#include <contact/contactgroupexpandjob.h>
#include <Akonadi/Contact/contactgroupexpandjob.h>
#include <QtCore/QBuffer>
#include <QtXml/QDomElement>
......@@ -167,7 +167,7 @@ void OXA::ContactUtils::parseContact( const QDomElement &propElement, Object &ob
} else if ( tagName == QLatin1String( "note" ) ) {
contact.setNote( text );
} else if ( tagName == QLatin1String( "url" ) ) {
contact.setUrl( text );
contact.setUrl( QUrl(text) );
} else if ( tagName == QLatin1String( "image1" ) ) {
const QByteArray data = text.toUtf8();
contact.setPhoto( KABC::Picture( QImage::fromData( QByteArray::fromBase64( data ) ) ) );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment