Commit 6b05a5f9dfd375715e62838cbc9e978ab1ee5c82 - ktp-accounts-kcm

+0

-9

CMakeLists.txt less more

10	10	set(KDE_MIN_VERSION "4.7.0")
11	11	find_package (KDE4 REQUIRED)
12	12	find_package (TelepathyQt4 0.8.9 REQUIRED)
13		find_package (TelepathyLoggerQt4 QUIET)
14	13	find_package (KTp REQUIRED)
15
16		macro_log_feature(TELEPATHY_LOGGER_QT4_FOUND "TelepatyLoggerQt4" "Qt bindings for TelepathyLogger. This is needed to provide access to chat logs. HIGHLY recommended" "http://projects.kde.org/telepathy-logger-qt" FALSE "" "")
17		macro_display_feature_log()
18	14
19	15	# set some default settings
20	16	include (KDE4Defaults)

33	29	${CMAKE_CURRENT_SOURCE_DIR}/src
34	30	)
35	31
36		if (TELEPATHY_LOGGER_QT4_FOUND)
37		add_definitions(${TELEPATHY_LOGGER_QT4_DEFINITIONS} -DHAVE_TPLOGGERQT)
38		include_directories(${TELEPATHY_LOGGER_QT4_INCLUDE_DIRS})
39		endif (TELEPATHY_LOGGER_QT4_FOUND)
40
41	32	add_subdirectory (src)
42	33	add_subdirectory (data)
43	34	add_subdirectory (plugins)

+2

-0

cmake/modules/FindKTp.cmake less more

3	3	# KTP_LIBRARIES
4	4	# KTP_MODELS_LIBRARIES
5	5	# KTP_WIDGETS_LIBRARIES
	6	# KTP_LOGGER_LIBRARIES
6	7
7	8	# Copyright (c) 2011, Dario Freddi <drf@kde.org>
8	9	#

27	28	find_library(KTP_LIBRARIES NAMES ktpcommoninternalsprivate )
28	29	find_library(KTP_MODELS_LIBRARIES NAMES ktpmodelsprivate )
29	30	find_library(KTP_WIDGETS_LIBRARIES NAMES ktpwidgetsprivate )
	31	find_library(KTP_LOGGER_LIBRARIES NAMES ktploggerprivate )
30	32
31	33	include(FindPackageHandleStandardArgs)
32	34	FIND_PACKAGE_HANDLE_STANDARD_ARGS(KTp DEFAULT_MSG

+1

-1

src/CMakeLists.txt less more

38	38	${TELEPATHY_QT4_LIBRARIES}
39	39	${KTP_LIBRARIES}
40	40	${KTP_MODELS_LIBRARIES}
	41	${KTP_LOGGER_LIBRARIES}
41	42	${KDE4_KIO_LIBS}
42		${TELEPATHY_LOGGER_QT4_LIBRARIES}
43	43	)
44	44
45	45	# Install:

+3

-18

src/kcm-telepathy-accounts.cpp less more

59	59	#include <TelepathyQt/PendingComposite>
60	60	#include <TelepathyQt/ConnectionManager>
61	61
62		#ifdef HAVE_TPLOGGERQT
63		#include <TelepathyLoggerQt4/LogManager>
64		#include <TelepathyLoggerQt4/Init>
65		#include <TelepathyLoggerQt4/PendingOperation>
66		#endif
	62	#include <KTp/Logger/log-manager.h>
67	63
68	64	K_PLUGIN_FACTORY(KCMTelepathyAccountsFactory, registerPlugin<KCMTelepathyAccounts>();)
69	65	K_EXPORT_PLUGIN(KCMTelepathyAccountsFactory("kcm_ktp_accounts", "kcm_ktp_accounts"))

90	86
91	87	// The first thing we must do is register Telepathy DBus Types.
92	88	Tp::registerTypes();
93		#ifdef HAVE_TPLOGGERQT
94		Tpl::init();
95		#endif
96	89
97	90	// Start setting up the Telepathy AccountManager.
98	91	Tp::AccountFactoryPtr accountFactory = Tp::AccountFactory::create(QDBusConnection::sessionBus(),

412	405	dialog->setButtonGuiItem(KDialog::Yes, KGuiItem(i18n("Remove Account"), QLatin1String("edit-delete")));
413	406	bool removeLogs = false;
414	407
415		// Don't show the 'Remove logs' checkbox when we don't support TpLogger
416		#ifdef HAVE_TPLOGGERQT
417	408	const QString msg = i18n("Remove conversations logs");
418		#else
419		const QString msg;
420		#endif
421
422	409	if (KMessageBox::createKMessageBox(dialog, QMessageBox::Warning, i18n("Are you sure you want to remove the account \"%1\"?", accountName),
423	410	QStringList(), msg , &removeLogs,
424	411	KMessageBox::Dangerous \| KMessageBox::Notify) == KDialog::Yes) {

428	415	return;
429	416	}
430	417
431		#ifdef HAVE_TPLOGGERQT
432	418	if (removeLogs) {
433		Tpl::LogManagerPtr logManager = Tpl::LogManager::instance();
434		logManager->clearAccountHistory(account);
	419	KTp::LogManager *logManager = KTp::LogManager::instance();
	420	logManager->clearAccountLogs(account);
435	421	}
436		#endif
437	422
438	423	QList<Tp::PendingOperation*> ops;
439	424	ops.append(KTp::WalletUtils::removeAccountPassword(account));