[SCM] Konversation packaging for Debian branch, master, updated. debian/1.5-2-10-g2efa544

Diane Trout diane at moszumanska.debian.org
Mon Aug 31 06:14:13 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/konversation.git;a=commitdiff;h=370e3b3

The following commit has been merged in the master branch:
commit 370e3b3d5f557b98146d30a3c0d49797ee58ba7b
Merge: 61a24eaadd4908475d5ca4781d2177457cf28a96 369f86deb02e86070bf55aba8882c282d7acc313
Author: Diane Trout <diane at ghic.org>
Date:   Thu Aug 27 22:24:09 2015 -0700

    Merge branch 'upstream/1.6'

 .gitignore                                         |    4 +
 CMakeLists.txt                                     |   91 +-
 ChangeLog                                          |  121 +
 NEWS                                               |    3 +
 TODO                                               |    3 -
 data/CMakeLists.txt                                |    6 +-
 ...-konversation.png => 128-apps-konversation.png} |  Bin
 ...p-konversation.png => 16-apps-konversation.png} |  Bin
 ...onv_message.png => 22-actions-konv_message.png} |  Bin
 ...p-konversation.png => 22-apps-konversation.png} |  Bin
 ...p-konversation.png => 32-apps-konversation.png} |  Bin
 ...p-konversation.png => 48-apps-konversation.png} |  Bin
 ...p-konversation.png => 64-apps-konversation.png} |  Bin
 data/images/icons/CMakeLists.txt                   |    2 +-
 data/images/icons/README-kimproxy                  |    2 -
 data/images/icons/hi16-action-kimproxyaway.png     |  Bin 522 -> 0 bytes
 data/images/icons/hi16-action-kimproxyoffline.png  |  Bin 541 -> 0 bytes
 data/images/icons/hi16-action-kimproxyonline.png   |  Bin 461 -> 0 bytes
 data/images/icons/hi22-action-kimproxyaway.png     |  Bin 686 -> 0 bytes
 data/images/icons/hi22-action-kimproxyoffline.png  |  Bin 712 -> 0 bytes
 data/images/icons/hi22-action-kimproxyonline.png   |  Bin 591 -> 0 bytes
 data/images/icons/hi32-action-kimproxyaway.png     |  Bin 1008 -> 0 bytes
 data/images/icons/hi32-action-kimproxyoffline.png  |  Bin 1031 -> 0 bytes
 data/images/icons/hi32-action-kimproxyonline.png   |  Bin 817 -> 0 bytes
 data/images/icons/hisc-action-kimproxyaway.svgz    |  Bin 1272 -> 0 bytes
 data/images/icons/hisc-action-kimproxyoffline.svgz |  Bin 1284 -> 0 bytes
 data/images/icons/hisc-action-kimproxyonline.svgz  |  Bin 1305 -> 0 bytes
 ...message.svgz => hisc-actions-konv_message.svgz} |  Bin
 ...nversation.svgz => hisc-apps-konversation.svgz} |  Bin
 data/images/nickicons/alternative/index.desktop    |   12 +-
 data/images/nickicons/christmas/index.desktop      |    8 +-
 data/images/nickicons/classic/index.desktop        |   12 +-
 data/images/nickicons/default/.directory           |    5 +
 data/images/nickicons/default/CMakeLists.txt       |    2 +-
 data/images/nickicons/default/index.desktop        |   74 +-
 data/images/nickicons/default/irc_admin.png        |  Bin 755 -> 350 bytes
 data/images/nickicons/default/irc_away.png         |  Bin 473 -> 260 bytes
 data/images/nickicons/default/irc_away_stacked.png |  Bin 0 -> 266 bytes
 data/images/nickicons/default/irc_halfop.png       |  Bin 751 -> 189 bytes
 data/images/nickicons/default/irc_normal.png       |  Bin 744 -> 333 bytes
 data/images/nickicons/default/irc_op.png           |  Bin 753 -> 190 bytes
 data/images/nickicons/default/irc_owner.png        |  Bin 740 -> 348 bytes
 data/images/nickicons/default/irc_voice.png        |  Bin 744 -> 221 bytes
 data/images/nickicons/oxygen/.directory            |    5 +
 .../nickicons/{square => oxygen}/CMakeLists.txt    |    2 +-
 .../nickicons/{default => oxygen}/index.desktop    |   78 +-
 .../nickicons/{default => oxygen}/irc_admin.png    |  Bin
 .../nickicons/{default => oxygen}/irc_away.png     |  Bin
 .../nickicons/{default => oxygen}/irc_halfop.png   |  Bin
 .../nickicons/{default => oxygen}/irc_normal.png   |  Bin
 .../nickicons/{default => oxygen}/irc_op.png       |  Bin
 .../nickicons/{default => oxygen}/irc_owner.png    |  Bin
 .../nickicons/{default => oxygen}/irc_voice.png    |  Bin
 data/images/nickicons/simplistic/index.desktop     |    8 +-
 data/images/nickicons/smiling/index.desktop        |    6 +-
 data/images/nickicons/square/index.desktop         |    8 +-
 data/konversation.notifyrc                         |  114 +-
 ...sation.desktop => org.kde.konversation.desktop} |    8 +-
 data/scripts/bug                                   |    2 +-
 data/scripts/cmd                                   |    4 +-
 data/scripts/media                                 |    6 +-
 data/scripts/sysinfo                               |   29 +-
 doc-translations/CMakeLists.txt                    |   10 -
 .../ca_konversation/konversation/CMakeLists.txt    |    1 -
 .../ca_konversation/konversation/index.docbook     | 6353 ----------------
 .../de_konversation/konversation/CMakeLists.txt    |    1 -
 .../es_konversation/konversation/CMakeLists.txt    |    1 -
 .../es_konversation/konversation/index.docbook     | 6355 ----------------
 .../et_konversation/konversation/CMakeLists.txt    |    1 -
 .../et_konversation/konversation/index.docbook     | 6370 ----------------
 .../fr_konversation/konversation/CMakeLists.txt    |    1 -
 .../fr_konversation/konversation/index.docbook     | 6339 ----------------
 .../it_konversation/konversation/CMakeLists.txt    |    1 -
 .../nl_konversation/konversation/CMakeLists.txt    |    1 -
 .../pt_BR_konversation/konversation/CMakeLists.txt |    1 -
 .../sv_konversation/konversation/CMakeLists.txt    |    1 -
 .../uk_konversation/konversation/CMakeLists.txt    |    1 -
 doc/CMakeLists.txt                                 |    8 +-
 doc/de/CMakeLists.txt                              |    4 +
 .../konversation => doc/de}/index.docbook          |  193 +-
 doc/en/CMakeLists.txt                              |    4 +
 doc/{ => en}/addchannel.png                        |  Bin
 doc/{ => en}/addnetwork_co.png                     |  Bin
 doc/{ => en}/addserver_co.png                      |  Bin
 doc/{ => en}/channel_screen_tour_co.png            |  Bin
 doc/{ => en}/channellist_screen_co.png             |  Bin
 doc/{ => en}/checkidentities.png                   |  Bin
 doc/{ => en}/colorchooser_screen.png               |  Bin
 doc/{ => en}/dccstatus_screen_co.png               |  Bin
 doc/{ => en}/first_channel_co.png                  |  Bin
 doc/{ => en}/first_serverlist_co.png               |  Bin
 doc/{ => en}/format-text-color.png                 |  Bin
 doc/{ => en}/highlighting_screen_co.png            |  Bin
 doc/{ => en}/identities_adv_co.png                 |  Bin
 doc/{ => en}/identities_away_co.png                |  Bin
 doc/{ => en}/identities_gen_co.png                 |  Bin
 doc/{ => en}/index.docbook                         |  180 +-
 doc/{ => en}/irc_admin.png                         |  Bin
 doc/{ => en}/irc_away.png                          |  Bin
 doc/{ => en}/irc_halfop.png                        |  Bin
 doc/{ => en}/irc_normal.png                        |  Bin
 doc/{ => en}/irc_op.png                            |  Bin
 doc/{ => en}/irc_owner.png                         |  Bin
 doc/{ => en}/irc_voice.png                         |  Bin
 doc/{ => en}/led_blue_on.png                       |  Bin
 doc/{ => en}/led_green_on.png                      |  Bin
 doc/{ => en}/led_red_on.png                        |  Bin
 doc/{ => en}/led_yellow_on.png                     |  Bin
 doc/{ => en}/logviewer_co.png                      |  Bin
 doc/{ => en}/nicksonline_co.png                    |  Bin
 doc/{ => en}/nickthemes_screen_co.png              |  Bin
 doc/{ => en}/notification_screen_co.png            |  Bin
 doc/{ => en}/notifylist_screen_co.png              |  Bin
 doc/{ => en}/osd_demo.png                          |  Bin
 doc/{ => en}/osd_screen_co.png                     |  Bin
 doc/{ => en}/quickbuttons_screen.png               |  Bin
 doc/{ => en}/quickconnect_screen.png               |  Bin
 doc/{ => en}/serverlist_co.png                     |  Bin
 doc/{ => en}/urlcatcher_screen_co.png              |  Bin
 doc/{ => en}/webbrowser_screen_co.png              |  Bin
 doc/it/CMakeLists.txt                              |    4 +
 .../konversation => doc/it}/index.docbook          |  203 +-
 doc/kaddressbook.png                               |  Bin 673 -> 0 bytes
 doc/kimproxy_create_screen2.png                    |  Bin 24230 -> 0 bytes
 doc/kimproxy_create_screen_co.png                  |  Bin 61438 -> 0 bytes
 doc/nl/CMakeLists.txt                              |    4 +
 .../konversation => doc/nl}/index.docbook          |  201 +-
 doc/pt_BR/CMakeLists.txt                           |    4 +
 .../konversation => doc/pt_BR}/index.docbook       |  209 +-
 doc/sv/CMakeLists.txt                              |    4 +
 doc/sv/addchannel.png                              |  Bin 0 -> 3985 bytes
 doc/sv/addnetwork_co.png                           |  Bin 0 -> 11970 bytes
 doc/sv/addserver_co.png                            |  Bin 0 -> 5902 bytes
 doc/sv/channel_screen_tour_co.png                  |  Bin 0 -> 27272 bytes
 doc/sv/channellist_screen_co.png                   |  Bin 0 -> 28918 bytes
 doc/sv/checkidentities.png                         |  Bin 0 -> 5653 bytes
 doc/sv/colorchooser_screen.png                     |  Bin 0 -> 5193 bytes
 doc/sv/dccstatus_screen_co.png                     |  Bin 0 -> 14110 bytes
 doc/sv/first_channel_co.png                        |  Bin 0 -> 20622 bytes
 doc/sv/first_serverlist_co.png                     |  Bin 0 -> 6883 bytes
 doc/sv/highlighting_screen_co.png                  |  Bin 0 -> 25708 bytes
 doc/sv/identities_adv_co.png                       |  Bin 0 -> 10427 bytes
 doc/sv/identities_away_co.png                      |  Bin 0 -> 11281 bytes
 doc/sv/identities_gen_co.png                       |  Bin 0 -> 11732 bytes
 .../konversation => doc/sv}/index.docbook          |  195 +-
 doc/sv/kimproxy_create_screen2.png                 |  Bin 0 -> 9386 bytes
 doc/sv/kimproxy_create_screen_co.png               |  Bin 0 -> 19640 bytes
 doc/sv/logviewer_co.png                            |  Bin 0 -> 18171 bytes
 doc/sv/nicksonline_co.png                          |  Bin 0 -> 20765 bytes
 doc/sv/nickthemes_screen_co.png                    |  Bin 0 -> 22363 bytes
 doc/sv/notification_screen_co.png                  |  Bin 0 -> 19050 bytes
 doc/sv/notifylist_screen_co.png                    |  Bin 0 -> 24738 bytes
 doc/sv/osd_demo.png                                |  Bin 0 -> 23487 bytes
 doc/sv/osd_screen_co.png                           |  Bin 0 -> 26121 bytes
 doc/sv/quickbuttons_screen.png                     |  Bin 0 -> 27271 bytes
 doc/sv/quickconnect_screen.png                     |  Bin 0 -> 5646 bytes
 doc/sv/serverlist_co.png                           |  Bin 0 -> 9386 bytes
 doc/sv/urlcatcher_screen_co.png                    |  Bin 0 -> 12774 bytes
 doc/sv/webbrowser_screen_co.png                    |  Bin 0 -> 28893 bytes
 doc/uk/CMakeLists.txt                              |    4 +
 .../konversation => doc/uk}/index.docbook          |  197 +-
 po/CMakeLists.txt                                  |   39 -
 po/{cs => ar}/konversation.po                      | 6402 ++++++++--------
 po/bg/CMakeLists.txt                               |    2 -
 po/bg/konversation.po                              | 4165 +++++------
 po/bs/CMakeLists.txt                               |    2 -
 po/bs/konversation.po                              | 3593 ++++-----
 po/ca/CMakeLists.txt                               |    2 -
 po/ca/konversation.po                              | 3668 ++++-----
 po/ca at valencia/CMakeLists.txt                      |    2 -
 po/ca at valencia/konversation.po                     | 3666 +++++----
 po/cs/CMakeLists.txt                               |    2 -
 po/cs/konversation.po                              | 3392 ++++-----
 po/da/CMakeLists.txt                               |    2 -
 po/da/konversation.po                              | 4133 ++++-------
 po/de/CMakeLists.txt                               |    2 -
 po/de/konversation.po                              | 4084 ++++------
 po/el/CMakeLists.txt                               |    2 -
 po/el/konversation.po                              | 4057 ++++------
 po/en_GB/CMakeLists.txt                            |    2 -
 po/en_GB/konversation.po                           | 4560 +++++-------
 po/es/CMakeLists.txt                               |    2 -
 po/es/konversation.po                              | 3880 ++++------
 po/et/CMakeLists.txt                               |    2 -
 po/et/konversation.po                              | 3860 ++++------
 po/fi/CMakeLists.txt                               |    2 -
 po/fi/konversation.po                              | 4066 +++++-----
 po/fr/CMakeLists.txt                               |    2 -
 po/fr/konversation.po                              | 3787 ++++------
 po/gl/CMakeLists.txt                               |    2 -
 po/gl/konversation.po                              | 3575 ++++-----
 po/he/CMakeLists.txt                               |    2 -
 po/he/konversation.po                              | 3852 +++++-----
 po/hu/CMakeLists.txt                               |    2 -
 po/hu/konversation.po                              | 3952 ++++------
 po/it/CMakeLists.txt                               |    2 -
 po/it/konversation.po                              | 4083 ++++------
 po/{tr => ja}/konversation.po                      | 7849 +++++++++-----------
 po/kk/CMakeLists.txt                               |    2 -
 po/kk/konversation.po                              | 3504 ++++-----
 po/km/CMakeLists.txt                               |    2 -
 po/km/konversation.po                              | 3496 ++++-----
 po/{cs => ko}/konversation.po                      | 7090 +++++++++---------
 po/lt/CMakeLists.txt                               |    2 -
 po/lt/konversation.po                              | 3513 ++++-----
 po/nb/CMakeLists.txt                               |    2 -
 po/nb/konversation.po                              | 3421 ++++-----
 po/nds/CMakeLists.txt                              |    2 -
 po/nds/konversation.po                             | 4191 +++++------
 po/nl/CMakeLists.txt                               |    2 -
 po/nl/konversation.po                              | 3895 ++++------
 po/{cs => pa}/konversation.po                      | 6148 ++++++++-------
 po/pl/CMakeLists.txt                               |    2 -
 po/pl/konversation.po                              | 4024 ++++------
 po/pt/CMakeLists.txt                               |    2 -
 po/pt/konversation.po                              | 3496 ++++-----
 po/pt_BR/CMakeLists.txt                            |    2 -
 po/pt_BR/konversation.po                           | 3494 ++++-----
 po/ru/CMakeLists.txt                               |    2 -
 po/ru/konversation.po                              | 4037 +++++-----
 po/si/CMakeLists.txt                               |    2 -
 po/si/konversation.po                              | 3626 +++++----
 po/sk/CMakeLists.txt                               |    2 -
 po/sk/konversation.po                              | 3480 ++++-----
 po/sl/CMakeLists.txt                               |    2 -
 po/sl/konversation.po                              | 3524 ++++-----
 po/sr/CMakeLists.txt                               |    2 -
 po/sr/konversation.po                              | 3480 ++++-----
 po/sr at ijekavian/CMakeLists.txt                     |    2 -
 po/sr at ijekavian/konversation.po                    | 3481 ++++-----
 po/sr at ijekavianlatin/CMakeLists.txt                |    2 -
 po/sr at ijekavianlatin/konversation.po               | 3482 ++++-----
 po/sr at latin/CMakeLists.txt                         |    2 -
 po/sr at latin/konversation.po                        | 3482 ++++-----
 po/sv/CMakeLists.txt                               |    2 -
 po/sv/konversation.po                              | 3843 ++++------
 po/tr/CMakeLists.txt                               |    2 -
 po/tr/konversation.po                              | 5659 ++++++--------
 po/uk/CMakeLists.txt                               |    2 -
 po/uk/konversation.po                              | 4101 ++++------
 po/zh_CN/CMakeLists.txt                            |    2 -
 po/zh_CN/konversation.po                           | 3945 +++++-----
 po/zh_TW/CMakeLists.txt                            |    2 -
 po/zh_TW/konversation.po                           | 4010 ++++------
 src/CMakeLists.txt                                 |  132 +-
 src/application.cpp                                |  346 +-
 src/application.h                                  |   27 +-
 src/awaymanager.cpp                                |   13 +-
 src/awaymanager.h                                  |    6 +-
 src/bookmarkhandler.cpp                            |   35 +-
 src/bookmarkhandler.h                              |   11 +-
 src/cipher.cpp                                     |   34 +-
 src/commit.h                                       |    2 +-
 src/common.cpp                                     |   68 +-
 src/common.h                                       |   10 +-
 src/config/alias_config.cpp                        |   13 +-
 src/config/alias_config.h                          |    4 +-
 src/config/alias_configui.ui                       |    1 -
 src/config/autoreplace_config.cpp                  |   67 +-
 src/config/autoreplace_config.h                    |    5 +-
 src/config/autoreplace_configui.ui                 |   64 +-
 src/config/chatwindowappearance_config.ui          |    9 +-
 src/config/chatwindowbehaviour_config.ui           |   16 +-
 src/config/colorsappearance_config.ui              |    1 -
 src/config/configdialog.cpp                        |  454 +-
 src/config/configdialog.h                          |  357 +-
 src/config/connectionbehavior_config.cpp           |    7 +-
 src/config/connectionbehavior_config.h             |    2 +-
 src/config/connectionbehavior_config.ui            |   31 +-
 src/config/dcc_config.cpp                          |   20 +-
 src/config/dcc_config.h                            |    2 +-
 src/config/dcc_configui.ui                         |   15 +-
 src/config/fontappearance_config.ui                |    1 -
 src/config/generalbehavior_configui.ui             |    1 -
 src/config/highlight_config.cpp                    |  103 +-
 src/config/highlight_config.h                      |    5 +-
 src/config/highlight_configui.ui                   |  139 +-
 src/config/ignore_config.cpp                       |   32 +-
 src/config/ignore_config.h                         |    8 +-
 src/config/ignore_configui.ui                      |   17 +-
 src/config/konversation.kcfg                       |   35 +-
 src/config/log_config.ui                           |    2 -
 src/config/nicklistbehavior_config.cpp             |    2 +-
 src/config/nicklistbehavior_config.h               |    2 +-
 src/config/nicklistbehavior_configui.ui            |    1 -
 src/config/osd_config.cpp                          |   22 +-
 src/config/osd_config.h                            |    4 +-
 src/config/osd_configui.ui                         |    1 -
 src/config/preferences.cpp                         |  113 +-
 src/config/preferences.h                           |    6 +-
 src/config/quickbuttons_config.cpp                 |   15 +-
 src/config/quickbuttons_config.h                   |    4 +-
 src/config/settingsdialog.cpp                      |   91 +-
 src/config/settingsdialog.h                        |   10 +-
 src/config/tabs_config.cpp                         |   12 +-
 src/config/tabs_config.h                           |    2 +-
 src/config/tabs_configui.ui                        |    8 -
 src/config/theme_config.cpp                        |  129 +-
 src/config/theme_config.h                          |    4 +-
 src/config/theme_configui.ui                       |    1 -
 src/config/warnings_config.cpp                     |   16 +-
 src/config/warnings_config.h                       |    6 +-
 src/config/watchednicknames_configui.ui            |    9 +-
 src/connectionmanager.cpp                          |  105 +-
 src/connectionmanager.h                            |   17 +-
 src/dbus.cpp                                       |   82 +-
 src/dbus.h                                         |   17 +-
 src/dcc/chat.cpp                                   |   62 +-
 src/dcc/chat.h                                     |    6 +-
 src/dcc/chatcontainer.cpp                          |   30 +-
 src/dcc/chatcontainer.h                            |    7 +-
 src/dcc/dcccommon.cpp                              |   36 +-
 src/dcc/dcccommon.h                                |    3 -
 src/dcc/dccfiledialog.cpp                          |   48 +-
 src/dcc/dccfiledialog.h                            |   16 +-
 src/dcc/recipientdialog.cpp                        |   53 +-
 src/dcc/recipientdialog.h                          |    6 +-
 src/dcc/resumedialog.cpp                           |  131 +-
 src/dcc/resumedialog.h                             |   14 +-
 src/dcc/transfer.cpp                               |   18 +-
 src/dcc/transfer.h                                 |   17 +-
 src/dcc/transferdetailedinfopanel.cpp              |   42 +-
 src/dcc/transferdetailedinfopanel.h                |    7 +-
 src/dcc/transferdetailedinfopanelui.ui             |    1 -
 src/dcc/transferlistmodel.cpp                      |   23 +-
 src/dcc/transferlistmodel.h                        |   12 +-
 src/dcc/transfermanager.cpp                        |   43 +-
 src/dcc/transfermanager.h                          |   10 +-
 src/dcc/transferpanel.cpp                          |   79 +-
 src/dcc/transferpanel.h                            |   43 +-
 src/dcc/transferrecv.cpp                           |  168 +-
 src/dcc/transferrecv.h                             |   14 +-
 src/dcc/transfersend.cpp                           |  160 +-
 src/dcc/transfersend.h                             |   17 +-
 src/dcc/transferview.cpp                           |   63 +-
 src/dcc/transferview.h                             |   13 +-
 src/dcc/whiteboard.cpp                             |  143 +-
 src/dcc/whiteboard.h                               |    4 +-
 src/dcc/whiteboardcolorchooser.cpp                 |   22 +-
 src/dcc/whiteboardcolorchooser.h                   |    4 +-
 src/dcc/whiteboardfontchooser.cpp                  |   31 +-
 src/dcc/whiteboardfontchooser.h                    |    4 +-
 src/dcc/whiteboardfontchooserui.ui                 |    7 +-
 src/dcc/whiteboardglobals.h                        |    1 +
 src/dcc/whiteboardpaintarea.cpp                    |   21 +-
 src/dcc/whiteboardpaintarea.h                      |    4 +-
 src/dcc/whiteboardtoolbar.cpp                      |  138 +-
 src/dcc/whiteboardtoolbar.h                        |   14 +-
 src/dcc/whiteboardtoolbarui.ui                     |   29 +-
 src/identity.cpp                                   |   24 +-
 src/identity.h                                     |   14 +-
 src/identitydialog.cpp                             |   86 +-
 src/identitydialog.h                               |   12 +-
 src/identitydialog.ui                              |   29 +-
 src/irc/channel.cpp                                |  189 +-
 src/irc/channel.h                                  |   31 +-
 src/irc/channellistpanel.cpp                       |   74 +-
 src/irc/channellistpanel.h                         |    8 +-
 src/irc/channellistpanelui.ui                      |    6 +-
 src/irc/channelnick.cpp                            |   10 +-
 src/irc/channelnick.h                              |   10 +-
 src/irc/inputfilter.cpp                            |  455 +-
 src/irc/inputfilter.h                              |    3 +-
 src/irc/invitedialog.cpp                           |   75 +-
 src/irc/invitedialog.h                             |   12 +-
 src/irc/irccharsets.cpp                            |   45 +-
 src/irc/ircqueue.cpp                               |   12 +-
 src/irc/ircqueue.h                                 |    2 +-
 src/irc/joinchanneldialog.cpp                      |   51 +-
 src/irc/joinchanneldialog.h                        |   10 +-
 src/irc/joinchannelui.ui                           |    1 -
 src/irc/modebutton.cpp                             |    4 +-
 src/irc/modebutton.h                               |    4 +-
 src/irc/nick.cpp                                   |   24 +-
 src/irc/nickinfo.cpp                               |  147 +-
 src/irc/nickinfo.h                                 |   24 +-
 src/irc/nicklistview.cpp                           |   21 +-
 src/irc/nicklistview.h                             |    2 +-
 src/irc/nicksonline.cpp                            |  310 +-
 src/irc/nicksonline.h                              |   46 +-
 src/irc/outputfilter.cpp                           |   74 +-
 src/irc/outputfilter.h                             |   19 +-
 src/irc/outputfilterresolvejob.h                   |    2 +-
 src/irc/query.cpp                                  |  106 +-
 src/irc/query.h                                    |   10 +-
 src/irc/server.cpp                                 |  498 +-
 src/irc/server.h                                   |   36 +-
 src/irc/servergroupdialog.cpp                      |  140 +-
 src/irc/servergroupdialog.h                        |   20 +-
 src/irc/servergroupdialogui.ui                     |   28 +-
 src/irc/servergroupsettings.cpp                    |    8 +-
 src/irc/servergroupsettings.h                      |    6 +-
 src/irc/serverison.cpp                             |  122 +-
 src/irc/serverison.h                               |   46 +-
 src/irc/serverlistdialog.cpp                       |   64 +-
 src/irc/serverlistdialog.h                         |   12 +-
 src/irc/serverlistdialogui.ui                      |  113 +-
 src/irc/serverlistview.cpp                         |    2 +-
 src/irc/serverlistview.h                           |    2 +-
 src/irc/topichistorymodel.cpp                      |    9 +-
 src/irc/topichistorymodel.h                        |    2 +-
 src/konsolepanel.cpp                               |   32 +-
 src/konsolepanel.h                                 |    9 +-
 src/linkaddressbook/addressbook.cpp                |  337 -
 src/linkaddressbook/addressbook.h                  |  103 -
 src/linkaddressbook/addressbook_base.cpp           |  517 --
 src/linkaddressbook/addressbook_base.h             |  125 -
 src/linkaddressbook/addresseeitem.cpp              |   58 -
 src/linkaddressbook/addresseeitem.h                |   65 -
 src/linkaddressbook/kimiface.h                     |  192 -
 src/linkaddressbook/linkaddressbookui.cpp          |  168 -
 src/linkaddressbook/linkaddressbookui.h            |   64 -
 src/linkaddressbook/linkaddressbookui_base.ui      |  150 -
 src/main.cpp                                       |  189 +-
 src/mainwindow.cpp                                 |  479 +-
 src/mainwindow.h                                   |   12 +-
 src/notificationhandler.cpp                        |   81 +-
 src/notificationhandler.h                          |    2 +-
 src/queuetuner.cpp                                 |   32 +-
 src/queuetuner.h                                   |    4 +-
 src/quickconnectdialog.cpp                         |   53 +-
 src/quickconnectdialog.h                           |   13 +-
 src/scriptlauncher.cpp                             |   21 +-
 src/scriptlauncher.h                               |    4 +-
 src/sound.cpp                                      |   13 +-
 src/sound.h                                        |   14 +-
 src/ssllabel.cpp                                   |    2 +-
 src/ssllabel.h                                     |    2 +-
 src/statusbar.cpp                                  |   21 +-
 src/statusbar.h                                    |    2 +-
 src/unicode.cpp                                    |    4 +-
 src/upnp/upnpdescriptionparser.cpp                 |   10 +-
 src/upnp/upnpmcastsocket.cpp                       |   47 +-
 src/upnp/upnpmcastsocket.h                         |    8 +-
 src/upnp/upnprouter.cpp                            |   77 +-
 src/upnp/upnprouter.h                              |   18 +-
 src/urlcatcher.cpp                                 |   95 +-
 src/urlcatcher.h                                   |    8 +-
 src/version.h                                      |    2 +-
 src/viewer/awaylabel.cpp                           |   12 +-
 src/viewer/awaylabel.h                             |    4 +-
 src/viewer/channeloptionsdialog.cpp                |   83 +-
 src/viewer/channeloptionsdialog.h                  |    9 +-
 src/viewer/channeloptionsui.ui                     |   39 +-
 src/viewer/chatwindow.cpp                          |   71 +-
 src/viewer/chatwindow.h                            |   21 +-
 src/viewer/editnotifydialog.cpp                    |   42 +-
 src/viewer/editnotifydialog.h                      |   11 +-
 src/viewer/emoticons.cpp                           |    4 +-
 src/viewer/highlight.cpp                           |    6 +-
 src/viewer/highlight.h                             |   10 +-
 src/viewer/highlightviewitem.cpp                   |    8 +-
 src/viewer/highlightviewitem.h                     |    8 +-
 src/viewer/ignorelistviewitem.cpp                  |    2 +-
 src/viewer/images.cpp                              |   90 +-
 src/viewer/images.h                                |   10 -
 src/viewer/insertchardialog.cpp                    |   42 +-
 src/viewer/insertchardialog.h                      |   10 +-
 src/viewer/irccolorchooser.cpp                     |   19 +-
 src/viewer/irccolorchooser.h                       |    6 +-
 src/viewer/irccolorchooserui.ui                    |   18 +-
 src/viewer/irccontextmenus.cpp                     |  315 +-
 src/viewer/irccontextmenus.h                       |   34 +-
 src/viewer/ircinput.cpp                            |   48 +-
 src/viewer/ircinput.h                              |    7 +-
 src/viewer/ircview.cpp                             |  107 +-
 src/viewer/ircview.h                               |   24 +-
 src/viewer/ircviewbox.cpp                          |   28 +-
 src/viewer/ircviewbox.h                            |    8 +-
 src/viewer/logfilereader.cpp                       |   40 +-
 src/viewer/logfilereader.h                         |    2 +-
 src/viewer/osd.cpp                                 |   17 +-
 src/viewer/osd.h                                   |    8 +-
 src/viewer/pasteeditor.cpp                         |   27 +-
 src/viewer/pasteeditor.h                           |    8 +-
 src/viewer/pasteeditor.ui                          |   30 +-
 src/viewer/quickbutton.cpp                         |    2 +-
 src/viewer/quickbutton.h                           |    4 +-
 src/viewer/rawlog.cpp                              |    3 +-
 src/viewer/rawlog.h                                |    2 +-
 src/viewer/searchbar.cpp                           |   42 +-
 src/viewer/searchbar.h                             |   15 +-
 src/viewer/searchbarbase.ui                        |   29 +-
 src/viewer/statuspanel.cpp                         |   24 +-
 src/viewer/statuspanel.h                           |    6 +-
 src/viewer/topicedit.cpp                           |   13 +-
 src/viewer/topicedit.h                             |    4 +-
 src/viewer/topichistoryview.cpp                    |   38 +-
 src/viewer/topichistoryview.h                      |   12 +-
 src/viewer/topiclabel.cpp                          |   23 +-
 src/viewer/topiclabel.h                            |    6 +-
 src/viewer/trayicon.cpp                            |    2 +-
 src/viewer/trayicon.h                              |    2 +-
 src/viewer/viewcontainer.cpp                       | 1630 ++--
 src/viewer/viewcontainer.h                         |   86 +-
 src/viewer/viewspringloader.cpp                    |   23 +-
 src/viewer/viewspringloader.h                      |    2 +-
 src/viewer/viewtree.cpp                            | 1048 +--
 src/viewer/viewtree.h                              |  130 +-
 src/viewer/viewtreeitem.cpp                        |  462 --
 src/viewer/viewtreeitem.h                          |   90 -
 501 files changed, 84144 insertions(+), 135842 deletions(-)

-- 
Konversation packaging for Debian



More information about the pkg-kde-commits mailing list