[SCM] ktp-common-internals packaging branch, master, updated. debian/0.4.0-1-12-ga6d3431
Ritesh Raj Sarraf
rrs at alioth.debian.org
Sun Apr 7 18:24:49 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/ktp-common-internals.git;a=commitdiff;h=a6d3431
The following commit has been merged in the master branch:
commit a6d3431dd91f312cf09ea65848b94dca817450e2
Merge: 2094185bcb46c5a8b83a89e627bcd3afd901a115 f431d21ff91b305d50fd9d6a6f83b642be36362e
Author: Ritesh Raj Sarraf <rrs at debian.org>
Date: Sun Apr 7 23:38:43 2013 +0530
Merge tag 'upstream/0.6.0'
Upstream version 0.6.0
* tag 'upstream/0.6.0':
Imported Upstream version 0.6.0
CMakeLists.txt | 15 +-
KTp/CMakeLists.txt | 45 +
KTp/Declarative/CMakeLists.txt | 36 +
KTp/Declarative/channel-delegator.h | 42 +
KTp/Declarative/contact-list.cpp | 93 +++
.../contact-list.h} | 54 +-
KTp/Declarative/contact-pin.cpp | 80 ++
KTp/Declarative/contact-pin.h | 58 ++
KTp/Declarative/conversation-queue-manager.cpp | 103 +++
KTp/Declarative/conversation-queue-manager.h | 64 ++
KTp/Declarative/conversation-target.cpp | 139 ++++
KTp/Declarative/conversation-target.h | 73 ++
KTp/Declarative/conversation.cpp | 105 +++
KTp/Declarative/conversation.h | 71 ++
KTp/Declarative/conversations-model.cpp | 209 +++++
KTp/Declarative/conversations-model.h | 76 ++
KTp/Declarative/declarative-ktp-actions.cpp | 55 ++
KTp/Declarative/declarative-ktp-actions.h | 56 ++
.../filtered-pinned-contacts-proxy-model.cpp} | 27 +-
.../filtered-pinned-contacts-proxy-model.h} | 28 +-
.../hide-window-component.cpp} | 23 +-
.../hide-window-component.h} | 30 +-
KTp/Declarative/messages-model.cpp | 291 +++++++
KTp/Declarative/messages-model.h | 95 +++
KTp/Declarative/pinned-contacts-model.cpp | 284 +++++++
KTp/Declarative/pinned-contacts-model.h | 83 ++
KTp/Declarative/qml-plugins.cpp | 66 ++
KTp/{wallet-utils.h => Declarative/qml-plugins.h} | 23 +-
KTp/Declarative/qmldir | 1 +
KTp/Declarative/telepathy-text-observer.cpp | 89 ++
KTp/Declarative/telepathy-text-observer.h | 48 ++
KTp/Doxyfile.cmake | 244 ++++++
KTp/Models/CMakeLists.txt | 37 +-
KTp/Models/abstract-grouping-proxy-model.cpp | 358 ++++++++
KTp/Models/abstract-grouping-proxy-model.h | 78 ++
KTp/Models/accounts-list-model.cpp | 289 +++++++
KTp/Models/accounts-list-model.h | 82 ++
KTp/Models/accounts-model-item.cpp | 429 ----------
KTp/Models/accounts-model-item.h | 83 --
KTp/Models/accounts-model.cpp | 323 --------
KTp/Models/accounts-model.h | 142 ----
KTp/Models/accounts-tree-proxy-model.cpp | 110 +++
.../accounts-tree-proxy-model.h} | 37 +-
KTp/Models/contact-model-item.cpp | 266 ------
KTp/Models/contact-model-item.h | 66 --
...-filter-model.cpp => contacts-filter-model.cpp} | 630 +++++++-------
...unts-filter-model.h => contacts-filter-model.h} | 102 ++-
KTp/Models/contacts-list-model.cpp | 244 ++++++
KTp/Models/contacts-list-model.h | 56 ++
KTp/Models/contacts-model.cpp | 166 ++++
KTp/Models/contacts-model.h | 94 +++
KTp/Models/flat-model-proxy.cpp | 188 -----
KTp/Models/flat-model-proxy.h | 65 --
KTp/Models/groups-model-item.cpp | 123 ---
KTp/Models/groups-model-item.h | 68 --
KTp/Models/groups-model.cpp | 360 --------
KTp/Models/groups-model.h | 96 ---
KTp/Models/groups-tree-proxy-model.cpp | 69 ++
.../groups-tree-proxy-model.h} | 27 +-
KTp/Models/proxy-tree-node.cpp | 92 ---
KTp/Models/proxy-tree-node.h | 59 --
KTp/Models/rooms-model.cpp | 254 ++++++
KTp/Models/rooms-model.h | 135 +++
KTp/Models/text-channel-watcher-proxy-model.cpp | 187 +++++
KTp/Models/text-channel-watcher-proxy-model.h | 61 ++
KTp/Models/tree-node.cpp | 130 ---
KTp/Models/tree-node.h | 68 --
KTp/Widgets/CMakeLists.txt | 8 +
KTp/Widgets/accounts-combo-box.cpp | 68 ++
KTp/Widgets/accounts-combo-box.h | 66 ++
KTp/Widgets/add-contact-dialog.cpp | 54 +-
KTp/Widgets/add-contact-dialog.h | 3 +-
KTp/Widgets/add-contact-dialog.ui | 11 +-
KTp/Widgets/contact-grid-dialog.cpp | 23 +-
KTp/Widgets/contact-grid-dialog.h | 6 +-
KTp/Widgets/contact-grid-widget.cpp | 37 +-
KTp/Widgets/contact-grid-widget.h | 9 +-
KTp/Widgets/join-chat-room-dialog.cpp | 480 +++++++++++
KTp/Widgets/join-chat-room-dialog.h | 91 ++
KTp/Widgets/join-chat-room-dialog.ui | 244 ++++++
KTp/Widgets/notificationconfigdialog.cpp | 132 +++
.../notificationconfigdialog.h} | 37 +-
KTp/abstract-message-filter.cpp | 57 ++
KTp/abstract-message-filter.h | 58 ++
KTp/actions.cpp | 178 ++++
KTp/actions.h | 67 ++
KTp/{Models => }/capabilities-hack-private.cpp | 0
KTp/{Models => }/capabilities-hack-private.h | 0
KTp/{debug.h => contact-factory.cpp} | 32 +-
KTp/{debug.h => contact-factory.h} | 34 +-
KTp/contact-info-dialog.cpp | 426 ++++++++++
...contact-grid-dialog.h => contact-info-dialog.h} | 51 +-
KTp/contact.cpp | 199 +++++
KTp/contact.h | 70 ++
KTp/debug.cpp | 6 +-
KTp/error-dictionary.h | 18 +-
KTp/global-contact-manager.cpp | 146 ++++
KTp/global-contact-manager.h | 64 ++
KTp/logs-importer-private.cpp | 368 +++++++++
KTp/logs-importer-private.h | 78 ++
KTp/{pending-wallet.h => logs-importer.cpp} | 41 +-
KTp/logs-importer.h | 89 ++
KTp/{debug.h => message-context.cpp} | 45 +-
KTp/{debug.h => message-context.h} | 45 +-
KTp/message-escape-filter.cpp | 40 +
KTp/message-filter-config-manager.cpp | 114 +++
KTp/message-filter-config-manager.h | 51 ++
...rror-dictionary.h => message-filters-private.h} | 34 +-
KTp/message-processor.cpp | 198 +++++
KTp/message-processor.h | 77 ++
KTp/message-url-filter.cpp | 60 ++
KTp/message.cpp | 248 ++++++
KTp/message.h | 167 ++++
KTp/outgoing-message.cpp | 80 ++
KTp/outgoing-message.h | 71 ++
KTp/persistent-contact.cpp | 115 +++
KTp/persistent-contact.h | 73 ++
KTp/telepathy-handler-application.cpp | 2 +
KTp/types.h | 88 ++
KTp/wallet-interface.h | 2 +-
Mainpage.dox | 46 +
data/ktelepathy.notifyrc | 331 ++++++++-
po/CMakeLists.txt | 4 +
po/bs/ktp-common-internals.po | 238 +++++-
po/ca/ktp-common-internals.po | 277 ++++++-
po/ca at valencia/CMakeLists.txt | 2 +
po/{ca => ca at valencia}/ktp-common-internals.po | 345 +++++++--
po/cs/ktp-common-internals.po | 234 +++++-
po/da/ktp-common-internals.po | 260 ++++++-
po/de/ktp-common-internals.po | 249 ++++++-
po/el/ktp-common-internals.po | 249 ++++++-
po/es/ktp-common-internals.po | 251 ++++++-
po/et/ktp-common-internals.po | 252 ++++++-
po/fi/ktp-common-internals.po | 240 ++++++-
po/fr/ktp-common-internals.po | 260 ++++++-
po/ga/ktp-common-internals.po | 234 +++++-
po/gl/ktp-common-internals.po | 242 ++++++-
po/hu/ktp-common-internals.po | 245 ++++++-
po/ia/CMakeLists.txt | 2 +
po/{sv => ia}/ktp-common-internals.po | 550 ++++++++-----
po/it/ktp-common-internals.po | 244 ++++++-
po/ja/ktp-common-internals.po | 232 +++++-
po/kk/CMakeLists.txt | 2 +
po/kk/ktp-common-internals.po | 859 ++++++++++++++++++++
po/lt/ktp-common-internals.po | 240 ++++++-
po/mr/CMakeLists.txt | 2 +
po/{nds => mr}/ktp-common-internals.po | 269 ++++++-
po/nb/ktp-common-internals.po | 234 +++++-
po/nds/ktp-common-internals.po | 232 +++++-
po/nl/ktp-common-internals.po | 254 ++++++-
po/pl/ktp-common-internals.po | 250 ++++++-
po/pt/ktp-common-internals.po | 244 ++++++-
po/pt_BR/ktp-common-internals.po | 268 ++++++-
po/ro/ktp-common-internals.po | 246 +++++-
po/ru/ktp-common-internals.po | 450 ++++++++---
po/sk/ktp-common-internals.po | 238 +++++-
po/sl/ktp-common-internals.po | 240 ++++++-
po/sr/ktp-common-internals.po | 250 ++++++-
po/sr at ijekavian/ktp-common-internals.po | 250 ++++++-
po/sr at ijekavianlatin/ktp-common-internals.po | 250 ++++++-
po/sr at latin/ktp-common-internals.po | 250 ++++++-
po/sv/ktp-common-internals.po | 244 ++++++-
po/uk/ktp-common-internals.po | 245 ++++++-
po/zh_CN/ktp-common-internals.po | 249 ++++++-
po/zh_TW/ktp-common-internals.po | 248 ++++++-
tests/CMakeLists.txt | 54 ++
tests/contact-list-model-view-main.cpp | 99 +++
KTp/pending-wallet.h => tests/model-view.cpp | 36 +-
KTp/pending-wallet.h => tests/model-view.h | 37 +-
tests/model-view.ui | 24 +
tests/pinned-contacts-model-view-main.cpp | 68 ++
tests/roles-proxy-model.cpp | 170 ++++
tests/roles-proxy-model.h | 59 ++
tools/CMakeLists.txt | 2 +-
tools/debugger/debug-message-view.cpp | 35 +
tools/debugger/debug-message-view.h | 5 +
tools/debugger/main-window.cpp | 6 +
tools/debugger/main.cpp | 4 +-
version.h.in | 2 +
179 files changed, 20394 insertions(+), 4249 deletions(-)
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list