[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/16.04.2-1-53-gf68d114
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Sep 12 14:06:42 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=5e36a77
The following commit has been merged in the master branch:
commit 5e36a773bc4540eab0d389b2c74a5d000e5128fa
Author: Björn Bidar <theodorstormgrade at gmail.com>
Date: Sat Jan 21 01:25:39 2017 +0100
port salut plugin to kf5
REVIEW: 128561
---
.../{ktp-jabber-im.service.in => ktp-salut-im.service.in} | 10 +++++-----
data/kaccounts/ktp-salut.provider.in | 8 ++++++++
plugins/CMakeLists.txt | 2 +-
plugins/salut/CMakeLists.txt | 10 +++++-----
plugins/salut/salut-account-ui-plugin.cpp | 8 --------
plugins/salut/salut-advanced-options-widget.ui | 11 +++--------
plugins/salut/salut-main-options-widget.ui | 11 +++--------
7 files changed, 25 insertions(+), 35 deletions(-)
diff --git a/data/kaccounts/ktp-jabber-im.service.in b/data/kaccounts/ktp-salut-im.service.in
similarity index 70%
copy from data/kaccounts/ktp-jabber-im.service.in
copy to data/kaccounts/ktp-salut-im.service.in
index ba3454b..c83ec62 100644
--- a/data/kaccounts/ktp-jabber-im.service.in
+++ b/data/kaccounts/ktp-salut-im.service.in
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<service id="ktp-jabber-im">
+<service id="ktp-salut-im">
<type>IM</type>
<!-- Jabber/XMPP - The string below is being displayed as a checkbox label to enable/disable this service -->
<_name>Chat</_name>
- <icon>im-jabber-talk</icon>
- <provider>ktp-jabber</provider>
+ <icon>im-local-xmpp</icon>
+ <provider>ktp-salut</provider>
<translations>kaccounts-providers</translations>
<template>
<group name="telepathy">
- <setting name="manager">gabble</setting>
- <setting name="protocol">jabber</setting>
+ <setting name="manager">salut</setting>
+ <setting name="protocol">local-xmpp</setting>
</group>
<group name="auth">
<setting name="method">password</setting>
diff --git a/data/kaccounts/ktp-salut.provider.in b/data/kaccounts/ktp-salut.provider.in
new file mode 100644
index 0000000..41c4475
--- /dev/null
+++ b/data/kaccounts/ktp-salut.provider.in
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<provider id="ktp-salut">
+ <name>Bonjour/Salut</name>
+ <icon>im-local-xmpp</icon>
+ <description>Bonjour/Salut chat account</description>
+ <translations>kaccounts-providers</translations>
+ <plugin>ktpaccountskcm_plugin_kaccounts</plugin>
+</provider>
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index db9bfc4..ccc8698 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -3,7 +3,7 @@ add_subdirectory (haze)
add_subdirectory (idle)
# macro_optional_add_subdirectory (butterfly)
# macro_optional_add_subdirectory (rakia)
-# macro_optional_add_subdirectory (salut)
+add_subdirectory (salut)
add_subdirectory (sunshine)
# macro_optional_add_subdirectory (pintxo)
add_subdirectory (morse)
diff --git a/plugins/salut/CMakeLists.txt b/plugins/salut/CMakeLists.txt
index 32a428e..15c0580 100644
--- a/plugins/salut/CMakeLists.txt
+++ b/plugins/salut/CMakeLists.txt
@@ -11,20 +11,20 @@ set (ktpaccountskcm_plugin_salut_SRCS
salut-advanced-options-widget.cpp
)
-kde4_add_ui_files (ktpaccountskcm_plugin_salut_SRCS
+ki18n_wrap_ui (ktpaccountskcm_plugin_salut_SRCS
salut-main-options-widget.ui
salut-advanced-options-widget.ui
)
-kde4_add_plugin (ktpaccountskcm_plugin_salut
+add_library (ktpaccountskcm_plugin_salut MODULE
${ktpaccountskcm_plugin_salut_SRCS}
)
target_link_libraries (ktpaccountskcm_plugin_salut
ktpaccountskcminternal
- ${QT_LIBRARIES}
- ${KDE4_KDEUI_LIBS}
- ${TELEPATHY_QT4_LIBRARIES}
+ Qt5::Core
+ Qt5::Widgets
+ ${TELEPATHY_QT5LIBRARIES}
)
# Install:
diff --git a/plugins/salut/salut-account-ui-plugin.cpp b/plugins/salut/salut-account-ui-plugin.cpp
index 79c969a..1d83bc3 100644
--- a/plugins/salut/salut-account-ui-plugin.cpp
+++ b/plugins/salut/salut-account-ui-plugin.cpp
@@ -21,10 +21,7 @@
#include "salut-account-ui-plugin.h"
#include "salut-account-ui.h"
-#include <KCMTelepathyAccounts/PluginMacros>
-
#include <KPluginFactory>
-#include <KDebug>
#include <QtCore/QVariantList>
@@ -43,10 +40,6 @@ AbstractAccountUi* SalutAccountUiPlugin::accountUi(const QString &connectionMana
const QString &protocol,
const QString &serviceName)
{
- kDebug() << "connectionManager: " << connectionManager <<
- ", protocol: " << protocol <<
- ", servicename: " << serviceName;
-
// We support salut/local-xmpp
if (connectionManager == QLatin1String("salut") && protocol == QLatin1String("local-xmpp")) {
return new SalutAccountUi;
@@ -56,6 +49,5 @@ AbstractAccountUi* SalutAccountUiPlugin::accountUi(const QString &connectionMana
}
K_PLUGIN_FACTORY(factory, registerPlugin<SalutAccountUiPlugin>();)
-K_EXPORT_PLUGIN(factory("kcmtelepathyaccounts_plugin_salut"))
#include "salut-account-ui-plugin.moc"
diff --git a/plugins/salut/salut-advanced-options-widget.ui b/plugins/salut/salut-advanced-options-widget.ui
index 9b05f76..2cffbdb 100644
--- a/plugins/salut/salut-advanced-options-widget.ui
+++ b/plugins/salut/salut-advanced-options-widget.ui
@@ -28,7 +28,7 @@
</widget>
</item>
<item row="0" column="1">
- <widget class="KLineEdit" name="pubnameLineEdit">
+ <widget class="QLineEdit" name="pubnameLineEdit">
<property name="toolTip">
<string/>
</property>
@@ -42,7 +42,7 @@
</widget>
</item>
<item row="1" column="1">
- <widget class="KLineEdit" name="emailLineEdit">
+ <widget class="QLineEdit" name="emailLineEdit">
<property name="toolTip">
<string/>
</property>
@@ -56,7 +56,7 @@
</widget>
</item>
<item row="2" column="1">
- <widget class="KLineEdit" name="jidLineEdit">
+ <widget class="QLineEdit" name="jidLineEdit">
<property name="toolTip">
<string/>
</property>
@@ -68,11 +68,6 @@
</layout>
</widget>
<customwidgets>
- <customwidget>
- <class>KLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
</customwidgets>
<resources/>
<connections/>
diff --git a/plugins/salut/salut-main-options-widget.ui b/plugins/salut/salut-main-options-widget.ui
index 75d74e3..29c0e2b 100644
--- a/plugins/salut/salut-main-options-widget.ui
+++ b/plugins/salut/salut-main-options-widget.ui
@@ -30,7 +30,7 @@
</widget>
</item>
<item row="0" column="1">
- <widget class="KLineEdit" name="firstnameLineEdit"/>
+ <widget class="QLineEdit" name="firstnameLineEdit"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="lastnameLabel">
@@ -43,7 +43,7 @@
</widget>
</item>
<item row="1" column="1">
- <widget class="KLineEdit" name="lastnameLineEdit"/>
+ <widget class="QLineEdit" name="lastnameLineEdit"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="nicknameLabel">
@@ -53,18 +53,13 @@
</widget>
</item>
<item row="2" column="1">
- <widget class="KLineEdit" name="nicknameLineEdit" />
+ <widget class="QLineEdit" name="nicknameLineEdit" />
</item>
</layout>
</item>
</layout>
</widget>
<customwidgets>
- <customwidget>
- <class>KLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
</customwidgets>
<resources/>
<connections/>
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list