[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:13:48 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=eb1fa83
The following commit has been merged in the master branch:
commit eb1fa83cf6be357194f4eff284f61839d832ff52
Author: David Edmundson <kde at davidedmundson.co.uk>
Date: Thu Aug 29 00:26:39 2013 +0100
Test for kpeople at runtime
REVIEW: 112346
---
contact-list-widget.cpp | 24 ++++----
context-menu.cpp | 148 +++++++++++++++++++++++++-----------------------
2 files changed, 89 insertions(+), 83 deletions(-)
diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index 98119a5..b290bab 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -735,18 +735,20 @@ void ContactListWidget::dropEvent(QDropEvent *event)
event->acceptProposedAction();
}
} else if (index.data(KTp::RowTypeRole).toInt() == KTp::ContactRowType && event->mimeData()->hasFormat("application/vnd.kpeople.uri")) {
-#ifdef HAVE_KPEOPLE
- QUrl droppedUri(index.data(KTp::NepomukUriRole).toUrl());
- QUrl draggedUri(event->mimeData()->data("application/vnd.kpeople.uri"));
-
- KMenu menu;
- QAction *mergeAction = menu.addAction(i18n("Merge contacts"));
- QAction *result = menu.exec(mapToGlobal(event->pos()));
- if (result == mergeAction) {
- KPeople::PersonsModel::createPersonFromUris(QList<QUrl>() << droppedUri << draggedUri);
+ if (KTp::kpeopleEnabled()) {
+ #ifdef HAVE_KPEOPLE
+ QUrl droppedUri(index.data(KTp::NepomukUriRole).toUrl());
+ QUrl draggedUri(event->mimeData()->data("application/vnd.kpeople.uri"));
+
+ KMenu menu;
+ QAction *mergeAction = menu.addAction(i18n("Merge contacts"));
+ QAction *result = menu.exec(mapToGlobal(event->pos()));
+ if (result == mergeAction) {
+ KPeople::PersonsModel::createPersonFromUris(QList<QUrl>() << droppedUri << draggedUri);
+ }
+ event->acceptProposedAction();
+ #endif
}
- event->acceptProposedAction();
-#endif
} else if (event->mimeData()->hasFormat("application/vnd.telepathy.contact")) {
kDebug() << "Contact dropped";
diff --git a/context-menu.cpp b/context-menu.cpp
index d3d84da..f20a159 100644
--- a/context-menu.cpp
+++ b/context-menu.cpp
@@ -100,72 +100,74 @@ KMenu* ContextMenu::contactContextMenu(const QModelIndex &index)
QAction *action;
-#ifdef HAVE_KPEOPLE
- menu->addActions(KPeople::PersonPluginManager::actionsForPerson(
- KPeople::PersonData::createFromUri(index.data(KTp::NepomukUriRole).toString()), menu));
-#else
- //must be a QAction because menu->addAction returns QAction, breaks compilation otherwise
- action = menu->addAction(i18n("Start Chat..."));
- action->setIcon(KIcon("text-x-generic"));
- action->setDisabled(true);
- connect(action, SIGNAL(triggered(bool)),
- SLOT(onStartTextChatTriggered()));
-
- if (index.data(KTp::ContactCanTextChatRole).toBool()) {
- action->setEnabled(true);
- }
+ if (KTp::kpeopleEnabled()) {
+ #ifdef HAVE_KPEOPLE
+ menu->addActions(KPeople::PersonPluginManager::actionsForPerson(
+ KPeople::PersonData::createFromUri(index.data(KTp::NepomukUriRole).toString()), menu));
+ #endif
+ } else {
+ //must be a QAction because menu->addAction returns QAction, breaks compilation otherwise
+ action = menu->addAction(i18n("Start Chat..."));
+ action->setIcon(KIcon("text-x-generic"));
+ action->setDisabled(true);
+ connect(action, SIGNAL(triggered(bool)),
+ SLOT(onStartTextChatTriggered()));
+
+ if (index.data(KTp::ContactCanTextChatRole).toBool()) {
+ action->setEnabled(true);
+ }
- action = menu->addAction(i18n("Start Audio Call..."));
- action->setIcon(KIcon("audio-headset"));
- action->setDisabled(true);
- connect(action, SIGNAL(triggered(bool)),
- SLOT(onStartAudioChatTriggered()));
+ action = menu->addAction(i18n("Start Audio Call..."));
+ action->setIcon(KIcon("audio-headset"));
+ action->setDisabled(true);
+ connect(action, SIGNAL(triggered(bool)),
+ SLOT(onStartAudioChatTriggered()));
- if (index.data(KTp::ContactCanAudioCallRole).toBool()) {
- action->setEnabled(true);
- }
+ if (index.data(KTp::ContactCanAudioCallRole).toBool()) {
+ action->setEnabled(true);
+ }
- action = menu->addAction(i18n("Start Video Call..."));
- action->setIcon(KIcon("camera-web"));
- action->setDisabled(true);
- connect(action, SIGNAL(triggered(bool)),
- SLOT(onStartVideoChatTriggered()));
+ action = menu->addAction(i18n("Start Video Call..."));
+ action->setIcon(KIcon("camera-web"));
+ action->setDisabled(true);
+ connect(action, SIGNAL(triggered(bool)),
+ SLOT(onStartVideoChatTriggered()));
- if (index.data(KTp::ContactCanVideoCallRole).toBool()) {
- action->setEnabled(true);
- }
+ if (index.data(KTp::ContactCanVideoCallRole).toBool()) {
+ action->setEnabled(true);
+ }
- action = menu->addAction(i18n("Send File..."));
- action->setIcon(KIcon("mail-attachment"));
- action->setDisabled(true);
- connect(action, SIGNAL(triggered(bool)),
- SLOT(onStartFileTransferTriggered()));
+ action = menu->addAction(i18n("Send File..."));
+ action->setIcon(KIcon("mail-attachment"));
+ action->setDisabled(true);
+ connect(action, SIGNAL(triggered(bool)),
+ SLOT(onStartFileTransferTriggered()));
- if (index.data(KTp::ContactCanFileTransferRole).toBool()) {
- action->setEnabled(true);
- }
+ if (index.data(KTp::ContactCanFileTransferRole).toBool()) {
+ action->setEnabled(true);
+ }
- action = menu->addAction(i18n("Share my desktop..."));
- action->setIcon(KIcon("krfb"));
- action->setDisabled(true);
- connect(action, SIGNAL(triggered(bool)),
- SLOT(onStartDesktopSharingTriggered()));
+ action = menu->addAction(i18n("Share my desktop..."));
+ action->setIcon(KIcon("krfb"));
+ action->setDisabled(true);
+ connect(action, SIGNAL(triggered(bool)),
+ SLOT(onStartDesktopSharingTriggered()));
- if (index.data(KTp::ContactTubesRole).toStringList().contains(QLatin1String("rfb"))) {
- action->setEnabled(true);
- }
+ if (index.data(KTp::ContactTubesRole).toStringList().contains(QLatin1String("rfb"))) {
+ action->setEnabled(true);
+ }
- action = menu->addAction(i18n("Open Log Viewer..."));
- action->setIcon(KIcon("documentation"));
- action->setDisabled(true);
- connect(action, SIGNAL(triggered(bool)),
- SLOT(onOpenLogViewerTriggered()));
+ action = menu->addAction(i18n("Open Log Viewer..."));
+ action->setIcon(KIcon("documentation"));
+ action->setDisabled(true);
+ connect(action, SIGNAL(triggered(bool)),
+ SLOT(onOpenLogViewerTriggered()));
- KTp::LogEntity entity(Tp::HandleTypeContact, contact->id());
- if (KTp::LogManager::instance()->logsExist(account, entity)) {
- action->setEnabled(true);
+ KTp::LogEntity entity(Tp::HandleTypeContact, contact->id());
+ if (KTp::LogManager::instance()->logsExist(account, entity)) {
+ action->setEnabled(true);
+ }
}
-#endif
menu->addSeparator();
action = menu->addAction(KIcon("dialog-information"), i18n("Configure Notifications..."));
@@ -342,24 +344,26 @@ void ContextMenu::onShowInfoTriggered()
return;
}
-#ifdef HAVE_KPEOPLE
- const QUrl &uri = m_currentIndex.data(KTp::NepomukUriRole).toUrl();
- KPeople::PersonDataPtr person = KPeople::PersonData::createFromUri(uri);
- if (person->isValid()) {
- KPeople::PersonDetailsDialog *view = new KPeople::PersonDetailsDialog(m_mainWidget);
- view->setPerson(person);
- view->setAttribute(Qt::WA_DeleteOnClose);
- view->show();
- }
-#else
- const Tp::AccountPtr &account = m_currentIndex.data(KTp::AccountRole).value<Tp::AccountPtr>();
- const Tp::ContactPtr &contact = m_currentIndex.data(KTp::ContactRole).value<KTp::ContactPtr>();
- if (account && contact) {
- KTp::ContactInfoDialog* contactInfoDialog = new KTp::ContactInfoDialog(account, contact, m_mainWidget);
- contactInfoDialog->setAttribute(Qt::WA_DeleteOnClose);
- contactInfoDialog->show();
+ if (KTp::kpeopleEnabled()) {
+ #ifdef HAVE_KPEOPLE
+ const QUrl &uri = m_currentIndex.data(KTp::NepomukUriRole).toUrl();
+ KPeople::PersonDataPtr person = KPeople::PersonData::createFromUri(uri);
+ if (person->isValid()) {
+ KPeople::PersonDetailsDialog *view = new KPeople::PersonDetailsDialog(m_mainWidget);
+ view->setPerson(person);
+ view->setAttribute(Qt::WA_DeleteOnClose);
+ view->show();
+ }
+ #endif
+ } else {
+ const Tp::AccountPtr &account = m_currentIndex.data(KTp::AccountRole).value<Tp::AccountPtr>();
+ const Tp::ContactPtr &contact = m_currentIndex.data(KTp::ContactRole).value<KTp::ContactPtr>();
+ if (account && contact) {
+ KTp::ContactInfoDialog* contactInfoDialog = new KTp::ContactInfoDialog(account, contact, m_mainWidget);
+ contactInfoDialog->setAttribute(Qt::WA_DeleteOnClose);
+ contactInfoDialog->show();
+ }
}
-#endif
}
void ContextMenu::onStartTextChatTriggered()
--
ktp-contact-list packaging
More information about the pkg-kde-commits
mailing list