[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9
Maximiliano Curia
maxy at moszumanska.debian.org
Mon May 9 09:08:31 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=be7652f
The following commit has been merged in the master branch:
commit be7652f009a8df7cd98a4475f060e3a072780b56
Merge: 734c666f51bcb166b7bf3cf795b619542a20e990 eb1d021715c96908af4dcd003a6e73e6217f1eaa
Author: Aleix Pol <aleixpol at kde.org>
Date: Thu Nov 13 13:40:40 2014 +0100
Merge branch 'frameworks'
CMakeLists.txt | 126 ++++++---
KTp/CMakeLists.txt | 57 ++--
KTp/Declarative/CMakeLists.txt | 23 +-
KTp/Declarative/conversation.cpp | 10 +-
KTp/Declarative/conversation.h | 3 +-
KTp/Declarative/conversations-model.cpp | 7 +
KTp/Declarative/conversations-model.h | 2 +
KTp/Declarative/messages-model.cpp | 3 +
KTp/Declarative/pinned-contacts-model.cpp | 9 +-
KTp/Declarative/qml-plugins.cpp | 10 +-
KTp/Declarative/qml-plugins.h | 9 +-
KTp/Declarative/telepathy-manager.cpp | 8 +-
KTp/Logger/CMakeLists.txt | 39 +--
KTp/Logger/abstract-logger-plugin.h | 4 +-
KTp/Logger/log-entity.h | 4 +-
KTp/Logger/log-manager.cpp | 1 -
KTp/Logger/log-manager.h | 4 +-
KTp/Logger/log-message.h | 4 +-
KTp/Logger/log-search-hit.h | 4 +-
KTp/Logger/pending-logger-dates.h | 4 +-
KTp/Logger/pending-logger-entities.h | 4 +-
KTp/Logger/pending-logger-logs.h | 4 +-
KTp/Logger/pending-logger-operation.cpp | 2 +-
KTp/Logger/pending-logger-operation.h | 4 +-
KTp/Logger/pending-logger-search.h | 4 +-
KTp/Logger/plugins/CMakeLists.txt | 4 +-
KTp/Logger/plugins/tplogger/CMakeLists.txt | 14 +-
KTp/Logger/scrollback-manager.h | 2 +-
KTp/Models/CMakeLists.txt | 52 ++--
KTp/Models/abstract-grouping-proxy-model.h | 4 +-
KTp/Models/accounts-list-model.cpp | 14 +-
KTp/Models/accounts-list-model.h | 8 +-
KTp/Models/accounts-tree-proxy-model.cpp | 5 +-
KTp/Models/accounts-tree-proxy-model.h | 4 +-
KTp/Models/contacts-filter-model.cpp | 39 +--
KTp/Models/contacts-filter-model.h | 6 +-
KTp/Models/contacts-list-model.cpp | 1 +
KTp/Models/contacts-list-model.h | 4 +-
KTp/Models/contacts-model.h | 4 +-
KTp/Models/groups-tree-proxy-model.h | 4 +-
KTp/Models/kpeopletranslationproxy.cpp | 26 +-
KTp/Models/kpeopletranslationproxy.h | 4 +-
KTp/Models/presence-model.cpp | 16 +-
KTp/Models/presence-model.h | 3 +-
KTp/Models/rooms-model.cpp | 12 +-
KTp/Models/rooms-model.h | 6 +-
KTp/Models/text-channel-watcher-proxy-model.h | 4 +-
KTp/OTR/CMakeLists.txt | 43 +--
KTp/OTR/channel-adapter.h | 4 +-
KTp/OTR/channel-proxy-interface.h | 4 +-
KTp/OTR/proxy-service-interface.h | 4 +-
KTp/OTR/types.h | 12 +-
KTp/OTR/utils.h | 14 +-
KTp/Widgets/CMakeLists.txt | 44 +--
KTp/Widgets/accounts-combo-box.h | 4 +-
KTp/Widgets/add-contact-dialog.cpp | 5 +-
KTp/Widgets/add-contact-dialog.h | 12 +-
KTp/Widgets/contact-grid-dialog.cpp | 14 +-
KTp/Widgets/contact-grid-dialog.h | 4 +-
KTp/Widgets/contact-grid-widget.h | 2 +-
KTp/Widgets/contact-view-widget.cpp | 17 +-
KTp/Widgets/contact-view-widget.h | 12 +-
KTp/Widgets/join-chat-room-dialog.cpp | 11 +-
KTp/Widgets/join-chat-room-dialog.h | 4 +-
KTp/Widgets/notification-config-dialog.cpp | 1 +
KTp/Widgets/notification-config-dialog.h | 4 +-
KTp/Widgets/settings-kcm-dialog.cpp | 5 +-
KTp/Widgets/settings-kcm-dialog.h | 4 +-
KTp/Widgets/start-chat-dialog.cpp | 3 +-
KTp/Widgets/start-chat-dialog.h | 10 +-
KTp/abstract-message-filter.h | 4 +-
KTp/account-factory_p.h | 2 +-
KTp/actions.cpp | 3 +-
KTp/actions.h | 31 ++-
KTp/capabilities-hack-private.h | 6 +-
KTp/circular-countdown.h | 4 +-
KTp/contact-factory.h | 4 +-
KTp/contact-info-dialog.cpp | 14 +-
KTp/contact-info-dialog.h | 4 +-
KTp/contact.h | 4 +-
KTp/core.cpp | 5 +-
KTp/core.h | 16 +-
KTp/debug.cpp | 2 +-
KTp/debug.h | 4 +-
KTp/error-dictionary.cpp | 1 -
KTp/error-dictionary.h | 6 +-
KTp/global-contact-manager.cpp | 7 +
KTp/global-contact-manager.h | 4 +-
KTp/global-presence.h | 5 +-
KTp/ktp-export.h | 45 ----
KTp/logs-importer-private.cpp | 10 +-
KTp/logs-importer.h | 4 +-
KTp/message-context.h | 4 +-
KTp/message-escape-filter.cpp | 2 +-
KTp/message-filter-config-manager.cpp | 2 -
KTp/message-filter-config-manager.h | 5 +-
KTp/message-processor.cpp | 5 +-
KTp/message-processor.h | 4 +-
KTp/message.h | 4 +-
KTp/outgoing-message.h | 4 +-
KTp/pending-wallet.h | 4 +-
KTp/persistent-contact.h | 6 +-
KTp/presence.cpp | 15 +-
KTp/presence.h | 10 +-
KTp/service-availability-checker.h | 4 +-
KTp/telepathy-handler-application.cpp | 83 ++----
KTp/telepathy-handler-application.h | 16 +-
KTp/text-parser.h | 6 +-
KTp/types.h | 2 +-
KTp/wallet-interface.cpp | 7 +-
KTp/wallet-interface.h | 6 +-
KTp/wallet-utils.h | 6 +-
KTpConfig.cmake.in | 7 +
cmake/modules/FindKAccounts.cmake | 30 +++
cmake/modules/FindLibOTR.cmake | 11 +-
data/CMakeLists.txt | 2 +-
data/icons/CMakeLists.txt | 56 +++-
...groupwise.png => hi16-actions-im-groupwise.png} | Bin
...6-action-im-irc.png => hi16-actions-im-irc.png} | Bin
...cal-xmpp.png => hi16-actions-im-local-xmpp.png} | Bin
...2-action-im-aim.png => hi22-actions-im-aim.png} | Bin
...m-facebook.png => hi22-actions-im-facebook.png} | Bin
...m-gadugadu.png => hi22-actions-im-gadugadu.png} | Bin
...le-talk.png => hi22-actions-im-google-talk.png} | Bin
...groupwise.png => hi22-actions-im-groupwise.png} | Bin
...2-action-im-icq.png => hi22-actions-im-icq.png} | Bin
...on-im-jabber.png => hi22-actions-im-jabber.png} | Bin
...cal-xmpp.png => hi22-actions-im-local-xmpp.png} | Bin
...2-action-im-msn.png => hi22-actions-im-msn.png} | Bin
...i22-action-im-qq.png => hi22-actions-im-qq.png} | Bin
...tion-im-skype.png => hi22-actions-im-skype.png} | Bin
...tion-im-yahoo.png => hi22-actions-im-yahoo.png} | Bin
...w-offline.png => hi22-actions-show-offline.png} | Bin
...on-sort-name.png => hi22-actions-sort-name.png} | Bin
...presence.png => hi22-actions-sort-presence.png} | Bin
...2-action-im-aim.png => hi32-actions-im-aim.png} | Bin
...m-facebook.png => hi32-actions-im-facebook.png} | Bin
...m-gadugadu.png => hi32-actions-im-gadugadu.png} | Bin
...le-talk.png => hi32-actions-im-google-talk.png} | Bin
...groupwise.png => hi32-actions-im-groupwise.png} | Bin
...2-action-im-icq.png => hi32-actions-im-icq.png} | Bin
...2-action-im-irc.png => hi32-actions-im-irc.png} | Bin
...on-im-jabber.png => hi32-actions-im-jabber.png} | Bin
...cal-xmpp.png => hi32-actions-im-local-xmpp.png} | Bin
...2-action-im-msn.png => hi32-actions-im-msn.png} | Bin
...i32-action-im-qq.png => hi32-actions-im-qq.png} | Bin
...tion-im-skype.png => hi32-actions-im-skype.png} | Bin
...tion-im-yahoo.png => hi32-actions-im-yahoo.png} | Bin
...8-action-im-aim.png => hi48-actions-im-aim.png} | Bin
...m-facebook.png => hi48-actions-im-facebook.png} | Bin
...m-gadugadu.png => hi48-actions-im-gadugadu.png} | Bin
...le-talk.png => hi48-actions-im-google-talk.png} | Bin
...groupwise.png => hi48-actions-im-groupwise.png} | Bin
...8-action-im-icq.png => hi48-actions-im-icq.png} | Bin
...on-im-jabber.png => hi48-actions-im-jabber.png} | Bin
...cal-xmpp.png => hi48-actions-im-local-xmpp.png} | Bin
...8-action-im-msn.png => hi48-actions-im-msn.png} | Bin
...i48-action-im-qq.png => hi48-actions-im-qq.png} | Bin
...tion-im-skype.png => hi48-actions-im-skype.png} | Bin
...tion-im-yahoo.png => hi48-actions-im-yahoo.png} | Bin
global.cpp | 24 --
kaccounts/CMakeLists.txt | 27 ++
kaccounts/kaccounts-ktp-plugin.cpp | 298 +++++++++++++++++++++
kaccounts/kaccounts-ktp-plugin.h | 57 ++++
kpeople/actionsplugin/CMakeLists.txt | 12 +-
kpeople/actionsplugin/kpeople-actions-plugin.cpp | 40 ++-
kpeople/actionsplugin/kpeople-actions-plugin.h | 4 +-
kpeople/datasourceplugin/CMakeLists.txt | 22 +-
.../datasourceplugin/im-persons-data-source.cpp | 34 +--
kpeople/datasourceplugin/im-persons-data-source.h | 4 +-
kpeople/uiplugins/CMakeLists.txt | 16 +-
kpeople/uiplugins/chatplugin/CMakeLists.txt | 17 +-
.../uiplugins/chatplugin/kpeople_chat_plugin.cpp | 11 +-
kpeople/uiplugins/chatplugin/kpeople_chat_plugin.h | 2 +-
kpeople/uiplugins/imdetailswidget.cpp | 7 +-
kpeople/uiplugins/imdetailswidget.h | 2 +-
otr-proxy/KTpProxy/CMakeLists.txt | 17 +-
otr-proxy/KTpProxy/main.cpp | 2 +-
otr-proxy/KTpProxy/otr-config.cpp | 9 +-
otr-proxy/test/CMakeLists.txt | 11 +-
tests/CMakeLists.txt | 34 ++-
tests/contact-list-model-view-main.cpp | 26 +-
tests/kpeople-model-view-main.cpp | 6 +-
tests/roles-proxy-model.cpp | 2 +-
tools/debugger/CMakeLists.txt | 18 +-
tools/debugger/debug-message-view.cpp | 20 +-
tools/debugger/main-window.cpp | 6 +-
tools/debugger/main.cpp | 33 ++-
version.h.in | 2 -
189 files changed, 1215 insertions(+), 856 deletions(-)
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list