[SCM] ktp-text-ui packaging branch, master, updated. debian/0.4.0-1-7-g459ee64

Ritesh Raj Sarraf rrs at alioth.debian.org
Thu Dec 6 09:53:07 UTC 2012


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/ktp-text-ui.git;a=commitdiff;h=f26f2f7

The following commit has been merged in the master branch:
commit f26f2f704d7a7463b6ec7a72e8d5c62288c2a15e
Merge: db536b0679e2c0c02049ec6b225158b16d936bad a339a98df13d3dff048aef0a498b58eafec3cc17
Author: Ritesh Raj Sarraf <rrs at debian.org>
Date:   Wed Nov 28 00:11:00 2012 +0530

    Merge tag 'upstream/0.5.1'
    
    Upstream version 0.5.1
    
    * tag 'upstream/0.5.1':
      Imported Upstream version 0.5.1

 CMakeLists.txt                                     |    9 +
 README                                             |   17 --
 app/CMakeLists.txt                                 |    3 +
 app/chat-window.cpp                                |   58 ++++---
 app/chat-window.h                                  |   10 +-
 app/invite-contact-dialog.cpp                      |  103 +++++++++++
 app/invite-contact-dialog.h                        |   63 +++++++
 app/main.cpp                                       |    7 +-
 app/telepathy-chat-ui.cpp                          |    5 +
 config/CMakeLists.txt                              |   69 ++++----
 config/README                                      |   23 ---
 config/appearance-config.cpp                       |   81 ++++++---
 config/appearance-config.h                         |    4 +-
 config/kcm_ktp_chat_appearance.desktop             |    7 +-
 config/kcm_ktp_chat_behavior.desktop               |    4 +-
 config/kcm_ktp_chat_messages.desktop               |   57 ++++++
 config/messages-config.cpp                         |   47 +++++
 config/messages-config.h                           |   36 ++++
 data/Template.html                                 |    2 +-
 filters/CMakeLists.txt                             |    6 +
 filters/emoticons/CMakeLists.txt                   |   27 +++
 {lib => filters/emoticons}/emoticon-filter.cpp     |   12 +-
 .../emoticons/emoticon-filter.h                    |   29 ++-
 .../ktptextui_message_filter_emoticons.desktop     |   58 ++++++
 filters/formatting/CMakeLists.txt                  |   28 +++
 filters/formatting/format-filter.cpp               |   80 ++++++++
 filters/formatting/format-filter.h                 |   39 ++++
 .../ktptextui_message_filter_formatting.desktop    |   53 ++++++
 filters/images/CMakeLists.txt                      |   28 +++
 filters/images/images-filter.cpp                   |   76 ++++++++
 filters/images/images-filter.h                     |   37 ++++
 .../images/ktptextui_message_filter_images.desktop |   55 ++++++
 filters/searchexpansion/CMakeLists.txt             |   26 +++
 ...tptextui_message_filter_searchexpansion.desktop |   38 ++++
 filters/searchexpansion/searchexpansion-filter.cpp |   52 ++++++
 filters/searchexpansion/searchexpansion-filter.h   |   38 ++++
 lib/CMakeLists.txt                                 |   16 +-
 lib/KTp/AbstractMessageFilter                      |    6 +
 .../abstract-message-filter.cpp                    |   19 +-
 .../abstract-message-filter.h                      |   29 ++--
 lib/adium-theme-header-info.cpp                    |    7 +
 lib/adium-theme-view.cpp                           |    8 +-
 lib/adium-theme-view.h                             |    4 +-
 lib/chat-text-edit.cpp                             |    2 +-
 lib/chat-widget.cpp                                |  169 +++++++++++++++---
 lib/chat-widget.h                                  |    6 +
 lib/escape-filter.cpp                              |    1 +
 lib/filters.h                                      |   18 +--
 lib/ktptxtui_message_filter.desktop                |   23 +++
 lib/logmanager.cpp                                 |   24 +--
 lib/message-processor.cpp                          |   68 +++++---
 lib/message-processor.h                            |   34 ++--
 lib/message.cpp                                    |   28 +++-
 lib/message.h                                      |   76 ++++++++-
 lib/plugin-config-manager.cpp                      |   92 ++++++++++
 lib/plugin-config-manager.h                        |   46 +++++
 lib/url-filter.cpp                                 |   60 ++-----
 logviewer/CMakeLists.txt                           |    2 +
 logviewer/conversation-date-picker.cpp             |   92 +++++++++-
 logviewer/conversation-date-picker.h               |   16 ++-
 logviewer/entity-model-item.cpp                    |  120 ++++++++++++
 logviewer/{message-view.h => entity-model-item.h}  |   44 +++--
 logviewer/entity-model.cpp                         |  154 +++++++++++++---
 logviewer/entity-model.h                           |   26 ++--
 logviewer/entity-proxy-model.cpp                   |  103 +++++++++++
 ...ersation-date-picker.h => entity-proxy-model.h} |   35 ++--
 logviewer/entity-view.cpp                          |   21 ++-
 logviewer/entity-view.h                            |    4 +-
 logviewer/ktp-log-viewer.desktop                   |   36 ++++-
 logviewer/log-viewer.cpp                           |  119 +++++++++++--
 logviewer/log-viewer.h                             |   16 ++-
 logviewer/log-viewer.ui                            |   84 ++++++---
 logviewer/main.cpp                                 |    6 +-
 logviewer/message-view.cpp                         |  151 +++++++++++++---
 logviewer/message-view.h                           |   27 +++-
 plasmoid/declarative-plugin/CMakeLists.txt         |    1 +
 plasmoid/declarative-plugin/channel-delegator.h    |    2 +-
 .../declarative-plugin/conversation-target.cpp     |   10 +
 plasmoid/declarative-plugin/conversation-target.h  |    3 +
 .../declarative-plugin/conversations-model.cpp     |    4 +-
 plasmoid/declarative-plugin/conversations-model.h  |    2 +-
 .../{qml-plugins.h => hidewindowcomponent.cpp}     |   21 +--
 .../{qml-plugins.h => hidewindowcomponent.h}       |   23 ++-
 plasmoid/declarative-plugin/qml-plugins.cpp        |    2 +
 .../declarative-plugin/telepathy-text-observer.cpp |    2 +-
 .../contents/ui/ChatWidget.qml                     |   42 ++++-
 .../contents/ui/ConversationDelegate.qml           |   21 ++-
 .../org.kde.ktp-chatplasmoid/contents/ui/main.qml  |   45 +++--
 plasmoid/org.kde.ktp-chatplasmoid/metadata.desktop |   21 ++-
 po/ca/kcm_ktp_chat_appearance.po                   |  113 +++++++------
 po/ca/kcm_ktp_chat_behavior.po                     |   15 +-
 po/ca/ktp-adiumxtra-protocol-handler.po            |   22 +--
 po/ca/ktp-text-ui.po                               |   94 +++++-----
 po/ca/ktpchat.po                                   |   94 +++++-----
 po/cs/kcm_ktp_chat_appearance.po                   |  134 +++++++-------
 po/cs/kcm_ktp_chat_behavior.po                     |   15 +-
 po/cs/ktp-adiumxtra-protocol-handler.po            |   50 +++---
 po/cs/ktp-text-ui.po                               |  116 ++++++------
 po/cs/ktpchat.po                                   |  116 ++++++-------
 po/da/kcm_ktp_chat_appearance.po                   |  111 +++++++-----
 po/da/kcm_ktp_chat_behavior.po                     |   15 +-
 po/da/ktp-adiumxtra-protocol-handler.po            |   22 +--
 po/da/ktp-text-ui.po                               |   98 +++++-----
 po/da/ktpchat.po                                   |   95 +++++-----
 po/de/kcm_ktp_chat_appearance.po                   |  124 ++++++++------
 po/de/kcm_ktp_chat_behavior.po                     |   15 +-
 po/de/ktp-adiumxtra-protocol-handler.po            |   26 ++--
 po/de/ktp-text-ui.po                               |  100 ++++++-----
 po/de/ktpchat.po                                   |   99 +++++------
 po/el/kcm_ktp_chat_appearance.po                   |  117 +++++++------
 po/el/kcm_ktp_chat_behavior.po                     |   15 +-
 po/el/ktp-adiumxtra-protocol-handler.po            |   31 ++--
 po/el/ktp-text-ui.po                               |  102 ++++++-----
 po/el/ktpchat.po                                   |   95 +++++-----
 po/es/kcm_ktp_chat_appearance.po                   |  137 ++++++++-------
 po/es/kcm_ktp_chat_behavior.po                     |   15 +-
 po/es/ktp-adiumxtra-protocol-handler.po            |   39 ++---
 po/es/ktp-text-ui.po                               |  124 +++++++-------
 po/es/ktpchat.po                                   |  130 ++++++-------
 po/et/kcm_ktp_chat_appearance.po                   |  113 +++++++------
 po/et/kcm_ktp_chat_behavior.po                     |   15 +-
 po/et/ktp-adiumxtra-protocol-handler.po            |   22 +--
 po/et/ktp-text-ui.po                               |   98 ++++++-----
 po/et/ktpchat.po                                   |   97 +++++------
 po/fi/kcm_ktp_chat_appearance.po                   |  126 ++++++++------
 po/fi/kcm_ktp_chat_behavior.po                     |   22 +--
 po/fi/ktp-adiumxtra-protocol-handler.po            |   44 +++---
 po/fi/ktp-text-ui.po                               |  125 +++++++------
 po/fi/ktpchat.po                                   |  125 +++++++-------
 po/fr/kcm_ktp_chat_appearance.po                   |  133 +++++++++------
 po/fr/kcm_ktp_chat_behavior.po                     |   15 +-
 po/fr/ktp-adiumxtra-protocol-handler.po            |   24 ++--
 po/fr/ktp-text-ui.po                               |  118 +++++++------
 po/fr/ktpchat.po                                   |  108 +++++++-----
 po/ga/kcm_ktp_chat_appearance.po                   |  102 +++++++-----
 po/ga/kcm_ktp_chat_behavior.po                     |   17 +--
 po/ga/ktp-adiumxtra-protocol-handler.po            |   28 ++--
 po/ga/ktp-text-ui.po                               |  101 ++++++-----
 po/ga/ktpchat.po                                   |   86 +++++-----
 po/gl/kcm_ktp_chat_appearance.po                   |  121 +++++++------
 po/gl/kcm_ktp_chat_behavior.po                     |   15 +-
 po/gl/ktp-adiumxtra-protocol-handler.po            |   21 +--
 po/gl/ktp-text-ui.po                               |   90 +++++-----
 po/gl/ktpchat.po                                   |   98 +++++------
 po/hu/kcm_ktp_chat_appearance.po                   |  120 +++++++------
 po/hu/kcm_ktp_chat_behavior.po                     |   15 +-
 po/hu/ktp-adiumxtra-protocol-handler.po            |   28 ++--
 po/hu/ktp-text-ui.po                               |  120 +++++++------
 po/hu/ktpchat.po                                   |  119 ++++++-------
 po/it/kcm_ktp_chat_appearance.po                   |  121 +++++++------
 po/it/kcm_ktp_chat_behavior.po                     |   15 +-
 po/it/ktp-adiumxtra-protocol-handler.po            |   22 +--
 po/it/ktp-text-ui.po                               |   94 +++++-----
 po/it/ktpchat.po                                   |   90 +++++-----
 po/ja/kcm_ktp_chat_appearance.po                   |  100 ++++++----
 po/ja/kcm_ktp_chat_behavior.po                     |   15 +-
 po/ja/ktp-adiumxtra-protocol-handler.po            |   20 +--
 po/ja/ktp-text-ui.po                               |   90 +++++-----
 po/ja/ktpchat.po                                   |   81 ++++-----
 po/km/kcm_ktp_chat_appearance.po                   |  100 ++++++----
 po/km/kcm_ktp_chat_behavior.po                     |   15 +-
 po/km/ktp-adiumxtra-protocol-handler.po            |   25 ++--
 po/km/ktp-text-ui.po                               |   91 +++++-----
 po/lt/kcm_ktp_chat_appearance.po                   |  152 +++++++++-------
 po/lt/kcm_ktp_chat_behavior.po                     |   15 +-
 po/lt/ktp-adiumxtra-protocol-handler.po            |   60 +++---
 po/lt/ktp-text-ui.po                               |  112 ++++++------
 po/lt/ktpchat.po                                   |  141 ++++++++-------
 po/nb/kcm_ktp_chat_appearance.po                   |  100 ++++++----
 po/nb/kcm_ktp_chat_behavior.po                     |   15 +-
 po/nb/ktp-adiumxtra-protocol-handler.po            |   20 +--
 po/nb/ktp-text-ui.po                               |  112 ++++++------
 po/nb/ktpchat.po                                   |   81 ++++-----
 po/nds/kcm_ktp_chat_appearance.po                  |  122 +++++++------
 po/nds/kcm_ktp_chat_behavior.po                    |   15 +-
 po/nds/ktp-adiumxtra-protocol-handler.po           |   20 +--
 po/nds/ktp-text-ui.po                              |   91 +++++-----
 po/nds/ktpchat.po                                  |   87 ++++-----
 po/nl/kcm_ktp_chat_appearance.po                   |  120 +++++++------
 po/nl/kcm_ktp_chat_behavior.po                     |   15 +-
 po/nl/ktp-adiumxtra-protocol-handler.po            |   22 +--
 po/nl/ktp-text-ui.po                               |   98 +++++-----
 po/nl/ktpchat.po                                   |   94 +++++-----
 po/pl/kcm_ktp_chat_appearance.po                   |  117 +++++++------
 po/pl/kcm_ktp_chat_behavior.po                     |   15 +-
 po/pl/ktp-adiumxtra-protocol-handler.po            |   24 ++--
 po/pl/ktp-text-ui.po                               |   98 +++++-----
 po/pl/ktpchat.po                                   |   98 +++++------
 po/pt/kcm_ktp_chat_appearance.po                   |  102 +++++++-----
 po/pt/kcm_ktp_chat_behavior.po                     |   15 +-
 po/pt/ktp-adiumxtra-protocol-handler.po            |   22 +--
 po/pt/ktp-text-ui.po                               |   96 +++++-----
 po/pt/ktpchat.po                                   |   90 +++++-----
 po/pt_BR/kcm_ktp_chat_appearance.po                |  144 +++++++++++-----
 po/pt_BR/kcm_ktp_chat_behavior.po                  |   15 +-
 po/pt_BR/ktp-adiumxtra-protocol-handler.po         |   26 ++--
 po/pt_BR/ktp-text-ui.po                            |  102 ++++++-----
 po/pt_BR/ktpchat.po                                |   98 +++++-----
 po/sk/kcm_ktp_chat_appearance.po                   |  104 +++++++-----
 po/sk/kcm_ktp_chat_behavior.po                     |   32 ++--
 po/sk/ktp-adiumxtra-protocol-handler.po            |   28 ++--
 po/sk/ktp-text-ui.po                               |  118 ++++++------
 po/sk/ktpchat.po                                   |  172 +++++++++---------
 po/sr/kcm_ktp_chat_appearance.po                   |  104 +++++++-----
 po/sr/ktp-adiumxtra-protocol-handler.po            |    2 +-
 po/sr/ktp-text-ui.po                               |  114 ++++++------
 po/sr/ktpchat.po                                   |   98 +++++------
 po/sr at ijekavian/kcm_ktp_chat_appearance.po         |  104 +++++++-----
 po/sr at ijekavian/ktp-adiumxtra-protocol-handler.po  |    2 +-
 po/sr at ijekavian/ktp-text-ui.po                     |  114 ++++++------
 po/sr at ijekavian/ktpchat.po                         |   98 +++++------
 po/sr at ijekavianlatin/kcm_ktp_chat_appearance.po    |  104 +++++++-----
 .../ktp-adiumxtra-protocol-handler.po              |    2 +-
 po/sr at ijekavianlatin/ktp-text-ui.po                |  114 ++++++------
 po/sr at ijekavianlatin/ktpchat.po                    |   98 +++++------
 po/sr at latin/kcm_ktp_chat_appearance.po             |  104 +++++++-----
 po/sr at latin/ktp-adiumxtra-protocol-handler.po      |    2 +-
 po/sr at latin/ktp-text-ui.po                         |  114 ++++++------
 po/sr at latin/ktpchat.po                             |   98 +++++------
 po/sv/kcm_ktp_chat_appearance.po                   |  111 +++++++-----
 po/sv/kcm_ktp_chat_behavior.po                     |   15 +-
 po/sv/ktp-adiumxtra-protocol-handler.po            |   20 +--
 po/sv/ktp-text-ui.po                               |   94 +++++-----
 po/sv/ktpchat.po                                   |   93 +++++-----
 po/ug/kcm_ktp_chat_appearance.po                   |  100 ++++++----
 po/ug/kcm_ktp_chat_behavior.po                     |   15 +-
 po/ug/ktp-adiumxtra-protocol-handler.po            |   20 +--
 po/ug/ktp-text-ui.po                               |   91 +++++-----
 po/ug/ktpchat.po                                   |   88 +++++-----
 po/uk/kcm_ktp_chat_appearance.po                   |  111 +++++++-----
 po/uk/kcm_ktp_chat_behavior.po                     |   15 +-
 po/uk/ktp-adiumxtra-protocol-handler.po            |   20 +--
 po/uk/ktp-text-ui.po                               |   94 +++++-----
 po/uk/ktpchat.po                                   |   93 +++++-----
 po/zh_CN/kcm_ktp_chat_appearance.po                |  129 ++++++++------
 po/zh_CN/kcm_ktp_chat_behavior.po                  |   28 ++--
 po/zh_CN/ktp-adiumxtra-protocol-handler.po         |   21 +--
 po/zh_CN/ktp-text-ui.po                            |   98 +++++-----
 po/zh_CN/ktpchat.po                                |   97 +++++-----
 po/zh_TW/kcm_ktp_chat_appearance.po                |  118 +++++++------
 po/zh_TW/kcm_ktp_chat_behavior.po                  |   15 +-
 po/zh_TW/ktp-adiumxtra-protocol-handler.po         |   22 +--
 po/zh_TW/ktp-text-ui.po                            |  116 ++++++------
 po/zh_TW/ktpchat.po                                |   98 +++++-----
 tests/CMakeLists.txt                               |   18 ++
 tests/message-processor-basic-tests.cpp            |  190 ++++++++++++++++++++
 tests/message-processor-basic-tests.h              |   57 ++++++
 tests/sync-processor.cpp                           |   53 ++++++
 tests/sync-processor.h                             |   40 ++++
 249 files changed, 8969 insertions(+), 6093 deletions(-)

-- 
ktp-text-ui packaging



More information about the pkg-kde-commits mailing list