[SCM] ktp-common-internals packaging branch, master, updated. debian/0.8.1-1-15-g81882f9
Diane Trout
diane-guest at moszumanska.debian.org
Tue Oct 7 05:27:30 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/ktp-common-internals.git;a=commitdiff;h=9443e03
The following commit has been merged in the master branch:
commit 9443e03b831a68fc3ab47c5861b1520cbf243ad9
Merge: fe5da4ec05282e642e75c21fcf91c8378b9f7b07 daacaba8b9522c4454cf970617105ae01924c766
Author: Diane Trout <diane at ghic.org>
Date: Tue Sep 16 21:57:44 2014 -0700
Merge tag 'upstream/0.8.80'
Upstream version 0.8.80
CMakeLists.txt | 26 +-
KTp/CMakeLists.txt | 1 +
KTp/Declarative/CMakeLists.txt | 1 +
KTp/Declarative/conversation.cpp | 25 +-
KTp/Declarative/conversation.h | 15 +-
KTp/Declarative/qml-plugins.cpp | 11 +-
KTp/Declarative/qmldir | 4 +-
KTp/Declarative/telepathy-manager.cpp | 64 ++
KTp/Declarative/telepathy-manager.h | 30 +
KTp/Logger/ktp_logger_plugin.desktop | 5 +-
.../ktploggerplugin_tplogger.desktop.cmake | 16 +-
KTp/Models/CMakeLists.txt | 2 +
KTp/Models/contacts-list-model.cpp | 6 +-
KTp/Models/contacts-list-model.h | 2 +-
KTp/Models/contacts-model.cpp | 8 +-
KTp/Models/contacts-model.h | 2 +-
KTp/Models/presence-model.cpp | 218 +++++
KTp/Models/presence-model.h | 90 ++
KTp/Models/rooms-model.cpp | 68 +-
KTp/Models/rooms-model.h | 15 +-
KTp/OTR/CMakeLists.txt | 43 +
KTp/OTR/channel-adapter.cpp | 454 ++++++++++
KTp/OTR/channel-adapter.h | 116 +++
KTp/OTR/channel-proxy-interface.cpp | 52 ++
KTp/OTR/channel-proxy-interface.h | 691 +++++++++++++++
KTp/OTR/constants.h | 121 +++
KTp/OTR/proxy-service-interface.cpp | 45 +
KTp/OTR/proxy-service-interface.h | 354 ++++++++
KTp/OTR/types.cpp | 67 ++
KTp/OTR/types.h | 82 ++
KTp/OTR/utils.cpp | 92 ++
KTp/OTR/utils.h | 51 ++
KTp/Widgets/CMakeLists.txt | 3 +
KTp/Widgets/add-contact-dialog.cpp | 17 +-
KTp/Widgets/add-contact-dialog.h | 1 +
KTp/Widgets/add-contact-dialog.ui | 31 +-
KTp/Widgets/contact-view-widget.cpp | 22 +-
KTp/Widgets/contact-view-widget.h | 5 +
KTp/Widgets/join-chat-room-dialog.cpp | 358 ++++----
KTp/Widgets/join-chat-room-dialog.h | 21 +-
KTp/Widgets/join-chat-room-dialog.ui | 388 ++++-----
KTp/Widgets/settings-kcm-dialog.cpp | 69 ++
.../settings-kcm-dialog.h} | 34 +-
KTp/actions.cpp | 24 +-
KTp/actions.h | 3 +
KTp/contact-info-dialog.cpp | 31 +-
KTp/contact-info-dialog.h | 1 +
KTp/contact.cpp | 9 +
KTp/contact.h | 1 +
KTp/global-presence.cpp | 94 +-
KTp/global-presence.h | 43 +-
KTp/presence.cpp | 2 +-
KTp/types.h | 6 +-
cmake/modules/FindLibOTR.cmake | 36 +
cmake/modules/FindLibgcrypt.cmake | 21 +
data/ktelepathy.notifyrc | 192 ++++-
kpeople/CMakeLists.txt | 2 +-
kpeople/actionsplugin/kpeople-actions-plugin.cpp | 19 +-
.../datasourceplugin/im-persons-data-source.cpp | 36 +-
kpeople/uiplugins/CMakeLists.txt | 2 +
kpeople/uiplugins/chatplugin/CMakeLists.txt | 17 +
.../uiplugins/chatplugin/chatlistviewdelegate.cpp | 60 ++
.../chatlistviewdelegate.h} | 33 +-
.../uiplugins/chatplugin/kpeople_chat_plugin.cpp | 166 ++++
.../chatplugin/kpeople_chat_plugin.desktop} | 8 +-
.../kpeople_chat_plugin.h} | 36 +-
otr-proxy/CMakeLists.txt | 6 +
otr-proxy/KTpProxy/CMakeLists.txt | 39 +
otr-proxy/KTpProxy/ktp-proxy-config.kcfg | 25 +
otr-proxy/KTpProxy/ktp-proxy-config.kcfgc | 7 +
otr-proxy/KTpProxy/main.cpp | 94 ++
otr-proxy/KTpProxy/otr-config.cpp | 76 ++
otr-proxy/KTpProxy/otr-config.h | 46 +
otr-proxy/KTpProxy/otr-constants.h | 61 ++
otr-proxy/KTpProxy/otr-manager.cpp | 623 ++++++++++++++
otr-proxy/KTpProxy/otr-manager.h | 121 +++
otr-proxy/KTpProxy/otr-message.cpp | 196 +++++
otr-proxy/KTpProxy/otr-message.h | 84 ++
otr-proxy/KTpProxy/otr-proxy-channel-adaptee.cpp | 526 ++++++++++++
otr-proxy/KTpProxy/otr-proxy-channel-adaptee.h | 126 +++
otr-proxy/KTpProxy/otr-proxy-channel.cpp | 78 ++
otr-proxy/KTpProxy/otr-proxy-channel.h | 76 ++
otr-proxy/KTpProxy/otr-session.cpp | 420 +++++++++
otr-proxy/KTpProxy/otr-session.h | 152 ++++
otr-proxy/KTpProxy/otr-utils.cpp | 96 +++
otr-proxy/KTpProxy/otr-utils.h | 97 +++
otr-proxy/KTpProxy/pending-curry-operation.cpp | 38 +
otr-proxy/KTpProxy/pending-curry-operation.h | 40 +
otr-proxy/KTpProxy/proxy-observer.cpp | 66 ++
otr-proxy/KTpProxy/proxy-observer.h | 49 ++
otr-proxy/KTpProxy/proxy-service-adaptee.cpp | 156 ++++
otr-proxy/KTpProxy/proxy-service-adaptee.h | 79 ++
otr-proxy/KTpProxy/proxy-service.cpp | 206 +++++
otr-proxy/KTpProxy/proxy-service.h | 87 ++
otr-proxy/KTpProxy/svc-channel-proxy.cpp | 198 +++++
otr-proxy/KTpProxy/svc-channel-proxy.h | 528 ++++++++++++
otr-proxy/KTpProxy/svc-proxy-service.cpp | 107 +++
otr-proxy/KTpProxy/svc-proxy-service.h | 280 ++++++
otr-proxy/KTpProxy/types.h | 34 +
otr-proxy/data/CMakeLists.txt | 7 +
otr-proxy/data/KTp.Proxy.client | 12 +
...eedesktop.Telepathy.Client.KTp.Proxy.service.in | 3 +
otr-proxy/spec/ChannelProxy_Interface_OTR.xml | 509 +++++++++++
otr-proxy/spec/ProxyService.xml | 258 ++++++
otr-proxy/test/CMakeLists.txt | 40 +
otr-proxy/test/lib/CMakeLists.txt | 7 +
otr-proxy/test/lib/test-config.cpp | 51 ++
otr-proxy/test/lib/test-config.h | 45 +
otr-proxy/test/lib/test-session.cpp | 49 ++
otr-proxy/test/lib/test-session.h | 45 +
otr-proxy/test/otr-test.cpp | 956 +++++++++++++++++++++
otr-proxy/test/resources/alice_id.instags | 2 +
otr-proxy/test/resources/alice_id.privkeys | 15 +
otr-proxy/test/resources/bob_id.instags | 2 +
otr-proxy/test/resources/bob_id.privkeys | 15 +
otr-proxy/test/resources/john_id.instags | 2 +
otr-proxy/test/resources/john_id.privkeys | 15 +
otr-proxy/test/utils-test.cpp | 76 ++
po/CMakeLists.txt | 1 +
po/cs/ktp-common-internals.po | 2 +
po/en_GB/CMakeLists.txt | 2 +
po/{mr => en_GB}/ktp-common-internals.po | 377 ++++----
po/es/ktp-common-internals.po | 6 +-
po/et/ktp-common-internals.po | 84 +-
po/fi/ktp-common-internals.po | 2 +-
po/fr/ktp-common-internals.po | 2 +-
po/hu/ktp-common-internals.po | 16 +-
po/ko/ktp-common-internals.po | 21 +-
po/nds/ktp-common-internals.po | 207 +++--
po/pl/ktp-common-internals.po | 8 +-
po/ro/ktp-common-internals.po | 12 +-
po/uk/ktp-common-internals.po | 2 +-
tools/debugger/debug-message-view.cpp | 7 +-
tools/debugger/debug-message-view.h | 1 +
tools/debugger/main-window.cpp | 73 +-
tools/debugger/main-window.h | 12 +
tools/debugger/main-window.ui | 46 +-
137 files changed, 11395 insertions(+), 980 deletions(-)
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list