[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=1130cac

The following commit has been merged in the master branch:
commit 1130cac170562da7bd53d6ccd7e5e385664aacbf
Merge: 897a439a22f9c13c43a22964dc9bd3f12ea2130a cb378ba2f8b0fe31874b8b2ca7b210cc5ad9045a
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Thu Jan 10 10:17:42 2013 +0100

    Merge branch 'move_plasma'
    
    Conflicts:
    	plasmoid/org.kde.ktp-chatplasmoid/metadata.desktop

 CMakeLists.txt                                     |   3 -
 config/CMakeLists.txt                              |   1 +
 config/messages-config.cpp                         |   6 +-
 filters/emoticons/CMakeLists.txt                   |   1 +
 filters/emoticons/emoticon-filter.cpp              |   4 +-
 filters/emoticons/emoticon-filter.h                |   6 +-
 filters/formatting/CMakeLists.txt                  |   1 +
 filters/formatting/format-filter.cpp               |   4 +-
 filters/formatting/format-filter.h                 |   7 +-
 filters/images/CMakeLists.txt                      |   1 +
 filters/images/images-filter.cpp                   |   4 +-
 filters/images/images-filter.h                     |   7 +-
 filters/searchexpansion/CMakeLists.txt             |   1 +
 filters/searchexpansion/searchexpansion-filter.h   |   6 +-
 filters/texttospeech/CMakeLists.txt                |   1 +
 filters/texttospeech/tts-filter.cpp                |   4 +-
 filters/texttospeech/tts-filter.h                  |   6 +-
 lib/CMakeLists.txt                                 |   7 -
 lib/KTp/AbstractMessageFilter                      |   6 -
 lib/abstract-message-filter.cpp                    |  53 ----
 lib/abstract-message-filter.h                      |  51 ----
 lib/adium-theme-view.cpp                           |   5 +-
 lib/chat-widget.cpp                                |   7 +-
 lib/escape-filter.cpp                              |  41 ---
 lib/filters.h                                      |  40 ---
 lib/logmanager.cpp                                 |   7 +-
 lib/message-processor.cpp                          | 135 ---------
 lib/message-processor.h                            |  65 -----
 lib/message.cpp                                    | 116 --------
 lib/message.h                                      | 140 ----------
 lib/plugin-config-manager.cpp                      |  94 -------
 lib/plugin-config-manager.h                        |  46 ---
 lib/url-filter.cpp                                 |  60 ----
 logviewer/message-view.cpp                         |   4 +-
 plasmoid/CMakeLists.txt                            |   8 -
 plasmoid/declarative-plugin/CMakeLists.txt         |  36 ---
 plasmoid/declarative-plugin/channel-delegator.h    |  42 ---
 .../conversation-que-manager.cpp                   | 102 -------
 .../declarative-plugin/conversation-que-manager.h  |  64 -----
 .../declarative-plugin/conversation-target.cpp     | 131 ---------
 plasmoid/declarative-plugin/conversation-target.h  |  74 -----
 plasmoid/declarative-plugin/conversation.cpp       | 105 -------
 plasmoid/declarative-plugin/conversation.h         |  72 -----
 .../declarative-plugin/conversations-model.cpp     | 163 -----------
 plasmoid/declarative-plugin/conversations-model.h  |  63 -----
 .../declarative-plugin/hidewindowcomponent.cpp     |  30 --
 plasmoid/declarative-plugin/hidewindowcomponent.h  |  38 ---
 plasmoid/declarative-plugin/ktpchat_export.h       |  40 ---
 plasmoid/declarative-plugin/messages-model.cpp     | 311 ---------------------
 plasmoid/declarative-plugin/messages-model.h       |  91 ------
 plasmoid/declarative-plugin/qml-plugins.cpp        |  44 ---
 plasmoid/declarative-plugin/qml-plugins.h          |  31 --
 plasmoid/declarative-plugin/qmldir                 |   1 -
 .../declarative-plugin/telepathy-text-observer.cpp |  78 ------
 .../declarative-plugin/telepathy-text-observer.h   |  47 ----
 .../contents/ui/ActionDelegate.qml                 |  27 --
 .../contents/ui/ChatWidget.qml                     | 202 -------------
 .../contents/ui/ConversationDelegate.qml           |  72 -----
 .../contents/ui/OutgoingDelegate.qml               |  29 --
 .../contents/ui/TextDelegate.qml                   |  61 ----
 .../org.kde.ktp-chatplasmoid/contents/ui/main.qml  | 104 -------
 plasmoid/org.kde.ktp-chatplasmoid/metadata.desktop |  87 ------
 tests/CMakeLists.txt                               |  18 --
 tests/message-processor-basic-tests.cpp            | 219 ---------------
 tests/message-processor-basic-tests.h              |  55 ----
 tests/sync-processor.cpp                           |  53 ----
 tests/sync-processor.h                             |  40 ---
 version.h.in                                       |   1 -
 68 files changed, 47 insertions(+), 3432 deletions(-)

-- 
ktp-text-ui packaging