[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:06:13 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=9e890d5
The following commit has been merged in the master branch:
commit 9e890d5a18c74eca32b01ee3bf1b9563c9a9b713
Merge: 158f4111e58913c4e8cf3c62398ab87877659199 db3876a4c7ccbe30acc04b8ae9e29f0bc7b940d3
Author: Aleix Pol <aleixpol at kde.org>
Date: Thu Nov 13 13:33:17 2014 +0100
Merge branch 'frameworks'
Conflicts:
CMakeLists.txt
plugins/CMakeLists.txt
CMakeLists.txt | 42 ++--
cmake/modules/FindAccountsFileDir.cmake | 30 +++
cmake/modules/FindIntltool.cmake | 50 ++++
cmake/modules/FindKAccounts.cmake | 30 +++
cmake/modules/FindKTp.cmake | 40 ----
data/CMakeLists.txt | 2 +
data/kaccounts/CMakeLists.txt | 15 ++
data/kaccounts/facebook-im.service.in | 25 ++
data/kaccounts/google-im.service.in | 30 +++
data/kaccounts/ktp-haze-icq-im.service.in | 9 +
data/kaccounts/ktp-haze-icq.provider.in | 15 ++
data/kaccounts/ktp-jabber-im.service.in | 9 +
data/kaccounts/ktp-jabber.provider.in | 15 ++
data/kaccounts/ktp-kde-talk-im.service.in | 9 +
data/kaccounts/ktp-kde-talk.provider.in | 16 ++
plugins/CMakeLists.txt | 21 +-
plugins/gabble/CMakeLists.txt | 13 +-
plugins/gabble/gabble-account-ui-plugin.cpp | 1 -
plugins/gabble/main-options-widget-facebook.ui | 12 +-
plugins/gabble/main-options-widget-googletalk.ui | 12 +-
plugins/gabble/main-options-widget-kde-talk.ui | 12 +-
plugins/gabble/main-options-widget.ui | 12 +-
plugins/gabble/proxy-settings-widget.ui | 13 +-
plugins/gabble/server-settings-widget.ui | 9 +-
plugins/haze/CMakeLists.txt | 11 +-
plugins/haze/aim-main-options-widget.ui | 17 +-
plugins/haze/aim-server-settings-widget.ui | 19 +-
plugins/haze/groupwise-advanced-settings-widget.ui | 17 +-
plugins/haze/groupwise-main-options-widget.ui | 17 +-
plugins/haze/haze-account-ui-plugin.cpp | 1 -
plugins/haze/icq-main-options-widget.ui | 16 +-
plugins/haze/icq-server-settings-widget.cpp | 11 +-
plugins/haze/icq-server-settings-widget.ui | 24 +-
plugins/haze/msn-main-options-widget.ui | 17 +-
plugins/haze/myspaceim-advanced-settings-widget.ui | 17 +-
plugins/haze/myspaceim-main-options-widget.ui | 18 +-
plugins/haze/sipe-advanced-settings-widget.ui | 32 ++-
plugins/haze/sipe-main-options-widget.ui | 18 +-
plugins/haze/skype-main-options-widget.ui | 10 +-
plugins/haze/steam-main-options-widget.ui | 22 +-
plugins/haze/yahoo-main-options-widget.ui | 16 +-
plugins/haze/yahoo-server-settings-widget.cpp | 7 +-
plugins/haze/yahoo-server-settings-widget.ui | 28 +--
plugins/idle/CMakeLists.txt | 11 +-
plugins/idle/advanced-options-widget.ui | 24 +-
plugins/idle/idle-account-ui-plugin.cpp | 1 -
plugins/idle/main-options-widget.ui | 13 +-
plugins/kaccounts/CMakeLists.txt | 28 +++
plugins/kaccounts/kaccounts-ui-provider.cpp | 254 +++++++++++++++++++++
plugins/kaccounts/kaccounts-ui-provider.h | 60 +++++
src/CMakeLists.txt | 98 ++++----
src/KCMTelepathyAccounts/CMakeLists.txt | 42 ++--
.../abstract-account-parameters-widget.cpp | 22 +-
.../abstract-account-parameters-widget.h | 6 +-
.../abstract-account-ui-plugin.cpp | 4 +-
.../abstract-account-ui-plugin.h | 6 +-
src/KCMTelepathyAccounts/abstract-account-ui.cpp | 4 +-
src/KCMTelepathyAccounts/abstract-account-ui.h | 8 +-
src/KCMTelepathyAccounts/account-edit-widget.cpp | 17 +-
src/KCMTelepathyAccounts/account-edit-widget.h | 5 +-
src/KCMTelepathyAccounts/dictionary.cpp | 2 +-
src/KCMTelepathyAccounts/dictionary.h | 4 +-
src/KCMTelepathyAccounts/feedback-widget.cpp | 20 +-
.../generic-advanced-options-widget.cpp | 18 +-
.../kcm_telepathy_accounts_export.h | 9 +-
.../parameter-edit-delegate.cpp | 23 +-
src/KCMTelepathyAccounts/parameter-edit-delegate.h | 2 +-
src/KCMTelepathyAccounts/parameter-edit-model.cpp | 11 +-
src/KCMTelepathyAccounts/parameter-edit-model.h | 2 +-
src/KCMTelepathyAccounts/parameter-item.h | 6 +-
src/KCMTelepathyAccounts/plugin-manager.cpp | 8 +-
src/KCMTelepathyAccounts/plugin-manager.h | 4 +-
src/KCMTelepathyAccounts/profile-item.cpp | 17 +-
src/KCMTelepathyAccounts/profile-item.h | 8 +-
src/KCMTelepathyAccounts/profile-list-model.cpp | 7 +-
src/KCMTelepathyAccounts/profile-list-model.h | 2 +-
src/KCMTelepathyAccounts/profile-select-widget.cpp | 8 +-
src/KCMTelepathyAccounts/profile-select-widget.h | 2 +-
.../simple-profile-select-widget.cpp | 13 +-
.../simple-profile-select-widget.h | 2 +-
src/KCMTelepathyAccounts/unsigned-integer-edit.cpp | 7 +-
src/KCMTelepathyAccounts/unsigned-integer-edit.h | 8 +-
src/KCMTelepathyAccounts/validated-line-edit.cpp | 24 +-
src/KCMTelepathyAccounts/validated-line-edit.h | 7 +-
84 files changed, 974 insertions(+), 603 deletions(-)
diff --cc plugins/CMakeLists.txt
index 8d5edc6,3c6960d..1f8e34b
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@@ -1,10 -1,11 +1,11 @@@
- macro_optional_add_subdirectory (gabble)
- macro_optional_add_subdirectory (butterfly)
- macro_optional_add_subdirectory (idle)
- macro_optional_add_subdirectory (haze)
- macro_optional_add_subdirectory (rakia)
- macro_optional_add_subdirectory (salut)
- macro_optional_add_subdirectory (sunshine)
- macro_optional_add_subdirectory (pintxo)
- macro_optional_add_subdirectory (sipe)
- macro_optional_add_subdirectory (morse)
+ add_subdirectory (gabble)
+ add_subdirectory (haze)
+ add_subdirectory (idle)
+ # macro_optional_add_subdirectory (butterfly)
+ # macro_optional_add_subdirectory (rakia)
+ # macro_optional_add_subdirectory (salut)
+ # macro_optional_add_subdirectory (sunshine)
+ # macro_optional_add_subdirectory (pintxo)
+ # macro_optional_add_subdirectory (sipe)
-
++# macro_optional_add_subdirectory (morse)
+ add_subdirectory(kaccounts)
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list