[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:00:36 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=504e4c7
The following commit has been merged in the master branch:
commit 504e4c759ba122f8a5dd063f6d615f2f7da14020
Author: Dario Freddi <dario.freddi at collabora.com>
Date: Thu Nov 24 20:07:28 2011 +0100
Finish porting
---
CMakeLists.txt | 14 +++-----------
src/CMakeLists.txt | 4 +---
src/account-item.cpp | 4 ++--
src/add-account-assistant.cpp | 4 ++--
src/common | 1 -
src/edit-account-dialog.cpp | 6 +++---
src/kcm-telepathy-accounts.cpp | 5 +++--
src/salut-message-widget.cpp | 4 ++--
8 files changed, 16 insertions(+), 26 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e4c3e95..85e72d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,9 +3,11 @@ project (telepathy-accounts-kcm)
# Add the modules we ship to the module path
SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})
+set(IS_TELEPATHY_KDE_INTERNAL_MODULE TRUE)
set(KDE_MIN_VERSION "4.7.0")
find_package (KDE4 REQUIRED)
find_package (TelepathyQt4 REQUIRED)
+find_package (KTelepathy REQUIRED)
# set some default settings
include (KDE4Defaults)
@@ -17,20 +19,10 @@ add_definitions (${KDE4_DEFINITIONS})
include_directories (${KDE4_INCLUDES}
${TELEPATHY_QT4_INCLUDE_DIR}
+ ${KTELEPATHY_INCLUDE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/src
)
-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.gitmodules)
-execute_process(COMMAND git submodule init
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-execute_process(COMMAND git submodule update
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-)
-endif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.gitmodules)
-
-
add_subdirectory (src)
add_subdirectory (data)
add_subdirectory (plugins)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8ca9b7c..60542b2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -9,9 +9,6 @@ project (telepathy-accounts-kcm)
set (telepathy_accounts_kcm_SRCS
salut-enabler.cpp
salut-message-widget.cpp
- common/circular-countdown.cpp
- common/error-dictionary.cpp
- common/wallet-interface.cpp
kcm-telepathy-accounts.cpp
accounts-list-model.cpp
account-item.cpp
@@ -34,6 +31,7 @@ target_link_libraries (kcm_telepathy_accounts
${QT_LIBRARIES}
${KDE4_KDEUI_LIBS}
${TELEPATHY_QT4_LIBRARIES}
+ ${KTELEPATHY_LIBRARIES}
)
# Install:
diff --git a/src/account-item.cpp b/src/account-item.cpp
index f98b723..417fad7 100644
--- a/src/account-item.cpp
+++ b/src/account-item.cpp
@@ -23,7 +23,7 @@
#include "accounts-list-model.h"
#include "edit-account-dialog.h"
-#include "common/error-dictionary.h"
+#include <KTelepathy/error-dictionary.h>
#include <KApplication>
#include <KDebug>
@@ -134,7 +134,7 @@ const QString AccountItem::connectionStatusReason() const
return QString();
}
else {
- return ErrorDictionary::instance()->displayShortErrorMessage(m_account->connectionError());
+ return KTp::ErrorDictionary::displayShortErrorMessage(m_account->connectionError());
}
}
diff --git a/src/add-account-assistant.cpp b/src/add-account-assistant.cpp
index 7d532ba..e4c5036 100644
--- a/src/add-account-assistant.cpp
+++ b/src/add-account-assistant.cpp
@@ -22,7 +22,7 @@
#include "add-account-assistant.h"
-#include "common/wallet-interface.h"
+#include <KTelepathy/wallet-interface.h>
#include "KCMTelepathyAccounts/abstract-account-parameters-widget.h"
#include "KCMTelepathyAccounts/abstract-account-ui.h"
@@ -248,7 +248,7 @@ void AddAccountAssistant::onAccountCreated(Tp::PendingOperation *op)
//save password to KWallet if needed
QVariantMap values = d->accountEditWidget->parametersSet();
if (values.contains(QLatin1String("password"))) {
- KTelepathy::WalletInterface wallet(this->effectiveWinId());
+ KTp::WalletInterface wallet(this->effectiveWinId());
wallet.setPassword(account, values["password"].toString());
}
diff --git a/src/common b/src/common
deleted file mode 160000
index e2b86ae..0000000
--- a/src/common
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e2b86ae292fbf5ebe2604640cc0301d60a8caae5
diff --git a/src/edit-account-dialog.cpp b/src/edit-account-dialog.cpp
index 6456a73..6419ffe 100644
--- a/src/edit-account-dialog.cpp
+++ b/src/edit-account-dialog.cpp
@@ -21,7 +21,7 @@
#include "edit-account-dialog.h"
-#include "common/wallet-interface.h"
+#include <KTelepathy/wallet-interface.h>
#include "KCMTelepathyAccounts/dictionary.h"
#include "KCMTelepathyAccounts/abstract-account-parameters-widget.h"
@@ -74,7 +74,7 @@ EditAccountDialog::EditAccountDialog(AccountItem *item, QWidget *parent)
//update the parameter model with the password from kwallet (if applicable)
Tp::ProtocolParameter passwordParameter = parameterModel->parameter(QLatin1String("password"));
- KTelepathy::WalletInterface wallet(this->effectiveWinId());
+ KTp::WalletInterface wallet(this->effectiveWinId());
if (passwordParameter.isValid() && wallet.hasPassword(d->item->account())) {
QModelIndex index = parameterModel->indexForParameter(passwordParameter);
QString password = wallet.password(d->item->account());
@@ -148,7 +148,7 @@ void EditAccountDialog::onParametersUpdated(Tp::PendingOperation *op)
QVariantMap values = d->widget->parametersSet();
- KTelepathy::WalletInterface wallet(this->effectiveWinId());
+ KTp::WalletInterface wallet(this->effectiveWinId());
if (values.contains(QLatin1String("password"))) {
wallet.setPassword(d->item->account(), values["password"].toString());
} else {
diff --git a/src/kcm-telepathy-accounts.cpp b/src/kcm-telepathy-accounts.cpp
index f57605f..fe64c73 100644
--- a/src/kcm-telepathy-accounts.cpp
+++ b/src/kcm-telepathy-accounts.cpp
@@ -27,7 +27,8 @@
#include "add-account-assistant.h"
#include "edit-account-dialog.h"
#include "accounts-list-delegate.h"
-#include "common/wallet-interface.h"
+
+#include <KTelepathy/wallet-interface.h>
#include <QLabel>
#include <QSortFilterProxyModel>
@@ -319,7 +320,7 @@ void KCMTelepathyAccounts::onRemoveAccountClicked()
QString(), KMessageBox::Notify | KMessageBox::Dangerous) == KMessageBox::Continue)
{
AccountItem *item = m_accountsListModel->itemForIndex(m_currentModel->mapToSource(index));
- KTelepathy::WalletInterface wallet(this->effectiveWinId());
+ KTp::WalletInterface wallet(this->effectiveWinId());
wallet.removeAccount(item->account());
m_accountsListModel->removeAccount(m_currentModel->mapToSource(index));
diff --git a/src/salut-message-widget.cpp b/src/salut-message-widget.cpp
index fc54e14..af9be19 100644
--- a/src/salut-message-widget.cpp
+++ b/src/salut-message-widget.cpp
@@ -20,7 +20,7 @@
#include "salut-message-widget.h"
-#include "common/circular-countdown.h"
+#include <KTelepathy/circular-countdown.h>
#include <KLocalizedString>
#include <KIcon>
@@ -41,7 +41,7 @@ SalutMessageWidget::SalutMessageWidget(QWidget *parent)
setCloseButtonVisible(false);
- CircularCountdown *circCountdown = new CircularCountdown(8000, this);
+ KTp::CircularCountdown *circCountdown = new KTp::CircularCountdown(8000, this);
connect(circCountdown, SIGNAL(timeout()), this, SIGNAL(timeout()));
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list