[SCM] ktp-common-internals packaging branch, master, updated. debian/0.9.0-1-21-gd17320f
Diane Trout
diane at moszumanska.debian.org
Tue Jul 7 06:16:30 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/ktp-common-internals.git;a=commitdiff;h=cf57228
The following commit has been merged in the master branch:
commit cf572280c553727de5512036c5678b6d48f01382
Merge: d63928c8aee5327bfa3a0dc840fa0214ab95a5ac 1c62039cba9101c34854a98acfb2d9e74e5b6dcc
Author: Diane Trout <diane at ghic.org>
Date: Sat Jul 4 09:50:20 2015 -0700
Merge tag 'upstream/15.04.3'
Upstream version 15.04.3
.gitignore | 9 +
.reviewboardrc | 2 +
CMakeLists.txt | 141 ++-
KTp/CMakeLists.txt | 67 +-
KTp/Declarative/CMakeLists.txt | 26 +-
KTp/Declarative/conversation.cpp | 25 +-
KTp/Declarative/conversation.h | 3 +-
KTp/Declarative/conversations-model.cpp | 24 +-
KTp/Declarative/conversations-model.h | 7 +-
.../debug.cpp} | 16 +-
.../debug.h} | 21 +-
KTp/Declarative/hide-window-component.cpp | 31 -
KTp/Declarative/hide-window-component.h | 38 -
KTp/Declarative/messages-model.cpp | 66 +-
KTp/Declarative/messages-model.h | 5 +-
KTp/Declarative/pinned-contacts-model.cpp | 69 +-
KTp/Declarative/pinned-contacts-model.h | 8 +-
KTp/Declarative/qml-plugins.cpp | 12 +-
KTp/Declarative/qml-plugins.h | 9 +-
KTp/Declarative/telepathy-manager.cpp | 23 +-
KTp/Logger/CMakeLists.txt | 40 +-
KTp/Logger/abstract-logger-plugin.h | 4 +-
.../contact-grid-widget.cpp => Logger/debug.cpp} | 16 +-
.../contact-grid-widget.cpp => Logger/debug.h} | 21 +-
KTp/Logger/log-entity.h | 4 +-
KTp/Logger/log-manager.cpp | 9 +-
KTp/Logger/log-manager.h | 4 +-
KTp/Logger/log-message.h | 4 +-
KTp/Logger/log-search-hit.h | 4 +-
KTp/Logger/pending-logger-dates-impl.cpp | 4 +-
KTp/Logger/pending-logger-dates.h | 4 +-
KTp/Logger/pending-logger-entities-impl.cpp | 4 +-
KTp/Logger/pending-logger-entities.h | 4 +-
KTp/Logger/pending-logger-logs-impl.cpp | 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-impl.cpp | 4 +-
KTp/Logger/pending-logger-search.h | 4 +-
KTp/Logger/plugins/CMakeLists.txt | 4 +-
KTp/Logger/plugins/tplogger/CMakeLists.txt | 16 +-
.../ktploggerplugin_tplogger.desktop.cmake | 6 +-
.../plugins/tplogger/pending-tp-logger-dates.cpp | 6 +-
.../tplogger/pending-tp-logger-entities.cpp | 6 +-
.../plugins/tplogger/pending-tp-logger-logs.cpp | 12 +-
.../plugins/tplogger/pending-tp-logger-search.cpp | 8 +-
KTp/Logger/plugins/tplogger/tp-logger-plugin.cpp | 12 +-
KTp/Logger/plugins/tplogger/utils.h | 2 +-
KTp/Logger/scrollback-manager.cpp | 10 +-
KTp/Logger/scrollback-manager.h | 2 +-
KTp/Models/CMakeLists.txt | 56 +-
KTp/Models/abstract-grouping-proxy-model.cpp | 15 +-
KTp/Models/abstract-grouping-proxy-model.h | 6 +-
KTp/Models/accounts-list-model.cpp | 43 +-
KTp/Models/accounts-list-model.h | 9 +-
KTp/Models/accounts-tree-proxy-model.cpp | 5 +-
KTp/Models/accounts-tree-proxy-model.h | 4 +-
KTp/Models/contacts-filter-model.cpp | 45 +-
KTp/Models/contacts-filter-model.h | 6 +-
KTp/Models/contacts-list-model.cpp | 3 +-
KTp/Models/contacts-list-model.h | 4 +-
KTp/Models/contacts-model.cpp | 32 +-
KTp/Models/contacts-model.h | 9 +-
.../contact-grid-widget.cpp => Models/debug.cpp} | 16 +-
.../contact-grid-widget.cpp => Models/debug.h} | 21 +-
KTp/Models/groups-tree-proxy-model.h | 4 +-
KTp/Models/kpeopletranslationproxy.cpp | 113 +-
KTp/Models/kpeopletranslationproxy.h | 4 +-
KTp/Models/presence-model.cpp | 23 +-
KTp/Models/presence-model.h | 3 +-
KTp/Models/rooms-model.cpp | 14 +-
KTp/Models/rooms-model.h | 6 +-
KTp/Models/text-channel-watcher-proxy-model.h | 4 +-
KTp/OTR/CMakeLists.txt | 43 +-
KTp/OTR/channel-adapter.cpp | 31 +-
KTp/OTR/channel-adapter.h | 4 +-
KTp/OTR/channel-proxy-interface.h | 4 +-
.../contact-grid-widget.cpp => OTR/debug.cpp} | 16 +-
.../contact-grid-widget.cpp => OTR/debug.h} | 21 +-
KTp/OTR/proxy-service-interface.h | 4 +-
KTp/OTR/types.h | 12 +-
KTp/OTR/utils.h | 14 +-
KTp/Widgets/CMakeLists.txt | 57 +-
KTp/Widgets/accounts-combo-box.h | 4 +-
KTp/Widgets/add-contact-dialog.cpp | 40 +-
KTp/Widgets/add-contact-dialog.h | 14 +-
KTp/Widgets/add-contact-dialog.ui | 11 +-
KTp/Widgets/contact-grid-dialog.cpp | 37 +-
KTp/Widgets/contact-grid-dialog.h | 6 +-
KTp/Widgets/contact-grid-widget.h | 2 +-
KTp/{ => Widgets}/contact-info-dialog.cpp | 77 +-
KTp/{ => Widgets}/contact-info-dialog.h | 12 +-
KTp/Widgets/contact-view-widget.cpp | 25 +-
KTp/Widgets/contact-view-widget.h | 12 +-
KTp/Widgets/{contact-grid-widget.cpp => debug.cpp} | 16 +-
KTp/Widgets/{contact-grid-widget.cpp => debug.h} | 20 +-
KTp/Widgets/join-chat-room-dialog.cpp | 341 +++---
KTp/Widgets/join-chat-room-dialog.h | 22 +-
KTp/Widgets/join-chat-room-dialog.ui | 28 +-
KTp/Widgets/notification-config-dialog.cpp | 67 +-
KTp/Widgets/notification-config-dialog.h | 23 +-
KTp/Widgets/settings-kcm-dialog.cpp | 11 +-
KTp/Widgets/settings-kcm-dialog.h | 6 +-
KTp/Widgets/start-chat-dialog.cpp | 32 +-
KTp/Widgets/start-chat-dialog.h | 12 +-
KTp/Widgets/start-chat-dialog.ui | 7 +-
KTp/abstract-message-filter.cpp | 4 +-
KTp/abstract-message-filter.h | 4 +-
KTp/account-factory_p.h | 2 +-
KTp/actions.cpp | 56 +-
KTp/actions.h | 31 +-
KTp/capabilities-hack-private.h | 6 +-
KTp/circular-countdown.h | 4 +-
KTp/contact-factory.h | 4 +-
KTp/contact.cpp | 26 +-
KTp/contact.h | 5 +-
KTp/core.cpp | 5 +-
KTp/core.h | 16 +-
KTp/debug.cpp | 11 +-
KTp/debug.h | 4 +-
KTp/error-dictionary.cpp | 6 +-
KTp/error-dictionary.h | 6 +-
KTp/global-contact-manager.cpp | 15 +-
KTp/global-contact-manager.h | 4 +-
KTp/global-presence.cpp | 39 +-
KTp/global-presence.h | 13 +-
.../contact-grid-widget.cpp => ktp-debug.h} | 21 +-
KTp/ktp-export.h | 45 -
KTp/logs-importer-private.cpp | 39 +-
KTp/logs-importer-private.h | 3 +-
KTp/logs-importer.h | 4 +-
KTp/message-context.h | 4 +-
KTp/message-escape-filter.cpp | 11 +-
KTp/message-filter-config-manager.cpp | 4 +-
KTp/message-filter-config-manager.h | 5 +-
KTp/message-processor.cpp | 25 +-
KTp/message-processor.h | 4 +-
KTp/message.cpp | 6 +-
KTp/message.h | 4 +-
KTp/outgoing-message.cpp | 2 +-
KTp/outgoing-message.h | 4 +-
KTp/pending-wallet.h | 4 +-
KTp/persistent-contact.cpp | 6 +-
KTp/persistent-contact.h | 6 +-
KTp/presence.cpp | 15 +-
KTp/presence.h | 10 +-
KTp/service-availability-checker.cpp | 4 +-
KTp/service-availability-checker.h | 4 +-
KTp/telepathy-handler-application.cpp | 92 +-
KTp/telepathy-handler-application.h | 16 +-
KTp/text-parser.h | 6 +-
KTp/types.h | 21 +-
KTp/wallet-interface.cpp | 21 +-
KTp/wallet-interface.h | 6 +-
KTp/wallet-utils.h | 6 +-
KTpConfig.cmake.in | 10 +
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
data/ktelepathy.notifyrc | 145 ++-
doc-translations/CMakeLists.txt | 0
global.cpp | 24 -
kaccounts/CMakeLists.txt | 27 +
kaccounts/kaccounts-ktp-plugin.cpp | 380 +++++++
kaccounts/kaccounts-ktp-plugin.h | 58 +
kpeople/CMakeLists.txt | 2 +-
kpeople/actionsplugin/CMakeLists.txt | 22 +-
kpeople/actionsplugin/kpeople-actions-plugin.cpp | 204 ++--
kpeople/actionsplugin/kpeople-actions-plugin.h | 7 +-
kpeople/datasourceplugin/CMakeLists.txt | 23 +-
.../datasourceplugin/debug.cpp | 16 +-
.../datasourceplugin/debug.h | 21 +-
.../datasourceplugin/im-persons-data-source.cpp | 253 +++--
kpeople/datasourceplugin/im-persons-data-source.h | 6 +-
kpeople/uiplugins/CMakeLists.txt | 19 +-
kpeople/uiplugins/chatplugin/CMakeLists.txt | 18 +-
.../uiplugins/chatplugin/kpeople_chat_plugin.cpp | 25 +-
kpeople/uiplugins/chatplugin/kpeople_chat_plugin.h | 2 +-
kpeople/uiplugins/imdetailswidget.cpp | 16 +-
kpeople/uiplugins/imdetailswidget.h | 2 +-
otr-proxy/KTpProxy/CMakeLists.txt | 18 +-
otr-proxy/KTpProxy/ktp-proxy-debug.cpp | 21 +
otr-proxy/KTpProxy/ktp-proxy-debug.h | 29 +
otr-proxy/KTpProxy/main.cpp | 7 +-
otr-proxy/KTpProxy/otr-config.cpp | 9 +-
otr-proxy/KTpProxy/otr-manager.cpp | 7 +-
otr-proxy/KTpProxy/otr-proxy-channel-adaptee.cpp | 44 +-
otr-proxy/KTpProxy/otr-utils.cpp | 3 +-
otr-proxy/KTpProxy/otr-utils.h | 2 -
otr-proxy/KTpProxy/proxy-observer.cpp | 5 +-
otr-proxy/KTpProxy/proxy-service.cpp | 21 +-
...eedesktop.Telepathy.Client.KTp.Proxy.service.in | 2 +-
otr-proxy/test/CMakeLists.txt | 13 +-
otr-proxy/test/lib/CMakeLists.txt | 2 +-
otr-proxy/test/otr-test.cpp | 4 +-
po/CMakeLists.txt | 40 -
po/bs/CMakeLists.txt | 2 -
po/bs/ktp-common-internals.po | 1067 ------------------
po/ca/CMakeLists.txt | 2 -
po/ca/ktp-common-internals.po | 1105 -------------------
po/ca at valencia/CMakeLists.txt | 2 -
po/ca at valencia/ktp-common-internals.po | 1122 -------------------
po/cs/CMakeLists.txt | 2 -
po/cs/ktp-common-internals.po | 1003 -----------------
po/da/CMakeLists.txt | 2 -
po/da/ktp-common-internals.po | 1139 -------------------
po/de/CMakeLists.txt | 2 -
po/de/ktp-common-internals.po | 1125 -------------------
po/el/CMakeLists.txt | 2 -
po/el/ktp-common-internals.po | 1109 -------------------
po/en_GB/CMakeLists.txt | 2 -
po/en_GB/ktp-common-internals.po | 1036 ------------------
po/es/CMakeLists.txt | 2 -
po/es/ktp-common-internals.po | 1111 -------------------
po/et/CMakeLists.txt | 2 -
po/et/ktp-common-internals.po | 1054 ------------------
po/fi/CMakeLists.txt | 2 -
po/fi/ktp-common-internals.po | 1077 ------------------
po/fr/CMakeLists.txt | 2 -
po/fr/ktp-common-internals.po | 1097 -------------------
po/ga/CMakeLists.txt | 2 -
po/ga/ktp-common-internals.po | 998 -----------------
po/gl/CMakeLists.txt | 2 -
po/gl/ktp-common-internals.po | 1082 ------------------
po/hu/CMakeLists.txt | 2 -
po/hu/ktp-common-internals.po | 1089 ------------------
po/ia/CMakeLists.txt | 2 -
po/ia/ktp-common-internals.po | 1081 ------------------
po/it/CMakeLists.txt | 2 -
po/it/ktp-common-internals.po | 1092 -------------------
po/ja/CMakeLists.txt | 2 -
po/ja/ktp-common-internals.po | 974 -----------------
po/kk/CMakeLists.txt | 2 -
po/kk/ktp-common-internals.po | 1055 ------------------
po/ko/CMakeLists.txt | 2 -
po/ko/ktp-common-internals.po | 1033 ------------------
po/lt/CMakeLists.txt | 2 -
po/lt/ktp-common-internals.po | 1042 ------------------
po/mr/CMakeLists.txt | 2 -
po/mr/ktp-common-internals.po | 996 -----------------
po/nb/CMakeLists.txt | 2 -
po/nb/ktp-common-internals.po | 1016 -----------------
po/nds/CMakeLists.txt | 2 -
po/nds/ktp-common-internals.po | 1038 ------------------
po/nl/CMakeLists.txt | 2 -
po/nl/ktp-common-internals.po | 1116 -------------------
po/pl/CMakeLists.txt | 2 -
po/pl/ktp-common-internals.po | 1078 ------------------
po/pt/CMakeLists.txt | 2 -
po/pt/ktp-common-internals.po | 1010 -----------------
po/pt_BR/CMakeLists.txt | 2 -
po/pt_BR/ktp-common-internals.po | 1013 -----------------
po/ro/CMakeLists.txt | 2 -
po/ro/ktp-common-internals.po | 1075 ------------------
po/ru/CMakeLists.txt | 2 -
po/ru/ktp-common-internals.po | 1078 ------------------
po/sk/CMakeLists.txt | 2 -
po/sk/ktp-common-internals.po | 1000 -----------------
po/sl/CMakeLists.txt | 2 -
po/sl/ktp-common-internals.po | 1067 ------------------
po/sr/CMakeLists.txt | 2 -
po/sr/ktp-common-internals.po | 1035 ------------------
po/sr at ijekavian/CMakeLists.txt | 2 -
po/sr at ijekavian/ktp-common-internals.po | 1036 ------------------
po/sr at ijekavianlatin/CMakeLists.txt | 2 -
po/sr at ijekavianlatin/ktp-common-internals.po | 1037 ------------------
po/sr at latin/CMakeLists.txt | 2 -
po/sr at latin/ktp-common-internals.po | 1036 ------------------
po/sv/CMakeLists.txt | 2 -
po/sv/ktp-common-internals.po | 1133 -------------------
po/uk/CMakeLists.txt | 2 -
po/uk/ktp-common-internals.po | 1151 --------------------
po/zh_CN/CMakeLists.txt | 2 -
po/zh_CN/ktp-common-internals.po | 1047 ------------------
po/zh_TW/CMakeLists.txt | 2 -
po/zh_TW/ktp-common-internals.po | 1071 ------------------
tests/CMakeLists.txt | 53 +-
tests/contact-list-model-view-main.cpp | 26 +-
tests/kpeople-model-view-main.cpp | 23 +-
tests/model-view.cpp | 92 +-
tests/roles-proxy-model.cpp | 8 +-
tools/debugger/CMakeLists.txt | 18 +-
tools/debugger/debug-message-view.cpp | 40 +-
tools/debugger/main-window.cpp | 10 +-
tools/debugger/main.cpp | 33 +-
version.h.in | 2 -
329 files changed, 2750 insertions(+), 44700 deletions(-)
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list