[SCM] Konversation packaging for Debian branch, debian/debian_channel, updated. upstream/1.2-alpha6-10-g4aa8197
Modestas Vainius
modax-guest at alioth.debian.org
Mon Sep 21 16:36:49 UTC 2009
The following commit has been merged in the debian/debian_channel branch:
commit 4aa8197d33b583fc7ede86d807e6a19bcad5cf60
Merge: f4b5c23ac1a34c83f04302b2184143cf7aaaf6ed 02e5a8fdf2964d27ad9a79d7e1153910b636f62c
Author: Modestas Vainius <modestas at vainius.eu>
Date: Mon Sep 21 17:58:54 2009 +0300
Merge commit 'refs/top-bases/debian/debian_channel' into debian/debian_channel
ChangeLog | 112 +
data/images/nickicons/alternative/index.desktop | 15 +
data/images/nickicons/christmas/index.desktop | 6 +
data/images/nickicons/classic/index.desktop | 5 +
data/images/nickicons/default/index.desktop | 5 +
data/images/nickicons/simplistic/index.desktop | 4 +
data/images/nickicons/smiling/index.desktop | 5 +
data/images/nickicons/square/index.desktop | 5 +
data/konversation.desktop | 30 +
data/konversation.notifyrc | 90 +
doc-translations/CMakeLists.txt | 1 +
.../konversation/CMakeLists.txt | 2 +-
.../it_konversation/konversation/index.docbook | 6299 ++++++++++++++++++++
.../sv_konversation/konversation/index.docbook | 381 ++-
.../uk_konversation/konversation/index.docbook | 387 ++-
doc/index.docbook | 166 +-
po/CMakeLists.txt | 3 +-
po/ar/konversation.po | 2671 +++++----
po/bg/konversation.po | 2679 +++++----
po/ca/konversation.po | 2768 +++++-----
po/cs/CMakeLists.txt | 2 +
po/{he => cs}/konversation.po | 5480 ++++++++---------
po/da/konversation.po | 3150 +++++-----
po/de/konversation.po | 2767 +++++----
po/el/konversation.po | 2691 +++++----
po/en_GB/konversation.po | 2671 +++++----
po/es/konversation.po | 2852 +++++-----
po/et/konversation.po | 2890 +++++-----
po/fr/konversation.po | 2671 +++++----
po/gl/konversation.po | 3828 +++++++------
po/he/CMakeLists.txt | 2 -
po/hu/konversation.po | 2938 +++++-----
po/it/konversation.po | 2652 +++++----
po/ja/konversation.po | 2687 +++++----
po/nds/konversation.po | 2782 +++++----
po/nl/konversation.po | 3445 +++++------
po/pa/CMakeLists.txt | 2 +
po/{he => pa}/konversation.po | 5439 ++++++++---------
po/pt/konversation.po | 2621 +++++----
po/pt_BR/konversation.po | 2998 +++++-----
po/ru/konversation.po | 2659 +++++----
po/sv/konversation.po | 2646 +++++----
po/tr/konversation.po | 2826 +++++-----
po/uk/konversation.po | 2645 +++++----
po/zh_CN/konversation.po | 2667 +++++----
po/zh_TW/konversation.po | 2678 +++++----
src/CMakeLists.txt | 5 +-
src/application.cpp | 157 +-
src/application.h | 22 +
src/awaymanager.cpp | 2 -
src/awaymanager.h | 6 +-
src/bookmarkhandler.cpp | 1 -
src/commit.h | 2 +-
src/common.cpp | 7 +-
src/common.h | 5 +-
src/config/configdialog.cpp | 3 -
src/config/connectionbehavior_config.cpp | 96 +
src/config/connectionbehavior_config.h | 48 +
src/config/connectionbehavior_config.ui | 137 +-
src/config/highlight_config.cpp | 8 +-
src/config/konversation.kcfg | 51 +-
src/config/preferences.cpp | 3 -
src/config/quickbuttons_config.cpp | 1 -
src/config/quickbuttons_configui.ui | 3 +
src/config/settingsdialog.cpp | 16 +-
src/config/theme_config.cpp | 5 -
src/connectionmanager.cpp | 18 +-
src/dcc/chat.cpp | 32 +-
src/dcc/chat.h | 5 +-
src/dcc/dcccommon.cpp | 1 +
src/dcc/dcccommon.h | 1 +
src/dcc/recipientdialog.cpp | 3 +
src/dcc/recipientdialog.h | 3 +
src/dcc/resumedialog.cpp | 5 +-
src/dcc/resumedialog.h | 1 +
src/dcc/transfer.cpp | 55 +-
src/dcc/transfer.h | 16 +-
src/dcc/transferdetailedinfopanel.cpp | 242 +-
src/dcc/transferdetailedinfopanel.h | 24 +-
src/dcc/transferdetailedinfopanelui.ui | 566 +--
src/dcc/transferdetailedtimeinfopanelui.ui | 248 +
src/dcc/transferlistmodel.cpp | 627 ++
src/dcc/transferlistmodel.h | 166 +
src/dcc/transfermanager.cpp | 14 +-
src/dcc/transfermanager.h | 1 +
src/dcc/transferpanel.cpp | 628 ++-
src/dcc/transferpanel.h | 70 +-
src/dcc/transferpanelitem.cpp | 407 --
src/dcc/transferpanelitem.h | 98 -
src/dcc/transferrecv.cpp | 47 +-
src/dcc/transferrecv.h | 10 +-
src/dcc/transfersend.cpp | 65 +-
src/dcc/transfersend.h | 10 +-
src/dcc/transferview.cpp | 612 ++
src/dcc/transferview.h | 118 +
src/identitydialog.cpp | 2 +-
src/irc/channel.cpp | 32 +-
src/irc/channel.h | 3 +-
src/irc/channellistpanel.cpp | 9 +-
src/irc/channeloptionsdialog.cpp | 13 +-
src/irc/channeloptionsdialog.h | 2 +-
src/irc/inputfilter.cpp | 9 +-
src/irc/invitedialog.cpp | 2 -
src/irc/irccharsets.cpp | 2 +
src/irc/ircqueue.cpp | 13 +-
src/irc/ircqueue.h | 12 +-
src/irc/joinchanneldialog.cpp | 1 -
src/irc/nickinfo.h | 1 -
src/irc/nicklistview.cpp | 2 +-
src/irc/nicksonline.cpp | 3 -
src/irc/nicksonline.h | 1 -
src/irc/outputfilter.cpp | 1089 ++--
src/irc/outputfilter.h | 149 +-
src/irc/server.cpp | 88 +-
src/irc/server.h | 7 +-
src/irc/servergroupdialog.cpp | 6 -
src/irc/servergroupsettings.h | 1 -
src/konsolepanel.cpp | 33 +-
src/konsolepanel.h | 7 +
src/linkaddressbook/addressbook.cpp | 1 -
src/linkaddressbook/addressbook.h | 2 -
src/linkaddressbook/addressbook_base.h | 1 -
src/linkaddressbook/addresseeitem.cpp | 1 -
src/linkaddressbook/addresseeitem.h | 2 -
src/main.cpp | 1 +
src/mainwindow.cpp | 5 +-
src/notificationhandler.cpp | 4 +-
src/queuetuner.cpp | 4 +-
src/quickconnectdialog.cpp | 1 -
src/statusbar.cpp | 3 +-
src/upnp/upnpmcastsocket.cpp | 2 -
src/upnp/upnpmcastsocket.h | 2 +-
src/upnp/upnprouter.cpp | 114 +-
src/upnp/upnprouter.h | 30 +-
src/version.h | 2 +-
src/viewer/chatwindow.cpp | 26 +-
src/viewer/editnotifydialog.cpp | 1 -
src/viewer/irccolorchooser.cpp | 1 -
src/viewer/ircinput.cpp | 20 +-
src/viewer/ircview.cpp | 558 ++-
src/viewer/ircview.h | 109 +-
src/viewer/ircviewbox.cpp | 1 -
src/viewer/logfilereader.cpp | 4 +-
src/viewer/osd.cpp | 2 +-
src/viewer/pasteeditor.cpp | 2 -
src/viewer/statuspanel.cpp | 3 -
src/viewer/topiclabel.cpp | 8 +-
src/viewer/trayicon.cpp | 2 -
src/viewer/trayicon.h | 1 -
src/viewer/viewcontainer.cpp | 73 +-
src/viewer/viewcontainer.h | 23 +-
src/viewer/viewtree.cpp | 5 +-
src/viewer/viewtreeitem.cpp | 15 +-
src/viewer/viewtreeitem.h | 1 -
154 files changed, 52631 insertions(+), 40880 deletions(-)
diff --combined src/config/preferences.cpp
index dda420d,46b4964..eaf07a8
--- a/src/config/preferences.cpp
+++ b/src/config/preferences.cpp
@@@ -17,8 -17,6 +17,6 @@@
#include "ignore.h"
#include "highlight.h"
- #include <QPalette>
- #include <QRegExp>
#include <QFileInfo>
#include <QHashIterator>
@@@ -26,7 -24,6 +24,6 @@@
#include <KUser>
#include <KStandardDirs>
-
struct PreferencesSingleton
{
Preferences prefs;
@@@ -62,16 -59,14 +59,16 @@@ Preferences::Preferences(
mIdentity->setNicknameList(nickList);
Konversation::ServerGroupSettingsPtr serverGroup(new Konversation::ServerGroupSettings);
- serverGroup->setName("Freenode");
+ serverGroup->setName("Debian IRC");
Konversation::ServerSettings server;
- server.setHost("chat.freenode.net");
- server.setPort(8001);
+ server.setHost("irc.debian.org");
+ server.setPort(7000);
serverGroup->addServer(server);
serverGroup->setIdentityId(mIdentity->id());
Konversation::ChannelSettings channel;
- channel.setName("#konversation");
+ channel.setName("#debian");
+ serverGroup->addChannel(channel);
+ channel.setName("#debian-kde");
serverGroup->addChannel(channel);
serverGroup->setExpanded(false);
mServerGroupHash.insert(0, serverGroup);
--
Konversation packaging for Debian
More information about the pkg-kde-commits
mailing list