[SCM] Konversation packaging for Debian branch, debian/dbug_autoreplace, updated. upstream/1.2-alpha3-8-g7d4a907
Modestas Vainius
modax-guest at alioth.debian.org
Sat Jul 4 07:43:29 UTC 2009
The following commit has been merged in the debian/dbug_autoreplace branch:
commit 7d4a9079b86145f9d09da2e7e73981f62c69542c
Merge: 3411cd6ec4c06d83c06ce6856bf66cb64c95a61c cc79915edfe5a2d988dac71bef07c14b2cb07480
Author: Modestas Vainius <modestas at vainius.eu>
Date: Sat Jul 4 10:17:50 2009 +0300
Adapt to upstream changes.
Signed-off-by: Modestas Vainius <modestas at vainius.eu>
CMakeLists.txt | 5 +
ChangeLog | 259 +
README | 2 +-
TODO | 2 +-
config-konversation.h.cmake | 1 +
data/images/nickicons/alternative/index.desktop | 2 +
data/images/nickicons/christmas/index.desktop | 4 +
data/images/nickicons/classic/index.desktop | 4 +
data/images/nickicons/default/index.desktop | 13 +-
data/images/nickicons/simplistic/index.desktop | 13 +-
data/images/nickicons/smiling/index.desktop | 3 +
data/images/nickicons/square/index.desktop | 3 +
data/konversation.desktop | 2 +-
data/konversation.notifyrc | 104 +-
data/scripts/CMakeLists.txt | 2 +-
data/scripts/bug | 2 +-
data/scripts/media | 50 +-
doc-translations/CMakeLists.txt | 3 +
.../et_konversation/konversation/CMakeLists.txt | 1 +
.../et_konversation/konversation/index.docbook | 5981 ++++++++++++++
.../sv_konversation/konversation/CMakeLists.txt | 1 +
.../sv_konversation/konversation/index.docbook | 5966 +++++++++++++
.../uk_konversation/konversation/CMakeLists.txt | 1 +
.../uk_konversation/konversation/index.docbook | 5935 +++++++++++++
doc/index.docbook | 13 +-
po/CMakeLists.txt | 4 +-
po/ar/konversation.po | 5717 +++++++------
po/bg/konversation.po | 5676 +++++++------
po/ca/CMakeLists.txt | 2 +
po/{he => ca}/konversation.po | 8234 ++++++++++---------
po/da/konversation.po | 5731 +++++++-------
po/de/konversation.po | 5936 +++++++-------
po/el/konversation.po | 5706 +++++++------
po/en_GB/konversation.po | 5602 +++++++------
po/es/konversation.po | 6555 ++++++++--------
po/et/konversation.po | 5669 +++++++------
po/fr/konversation.po | 5705 +++++++------
po/gl/konversation.po | 7207 ++++++++--------
po/he/konversation.po | 5529 +++++++------
po/hu/CMakeLists.txt | 2 -
po/hu/konversation.po | 8728 --------------------
po/it/konversation.po | 5693 +++++++------
po/ja/konversation.po | 5668 +++++++------
po/ko/konversation.po | 5660 +++++++------
po/nds/CMakeLists.txt | 2 +
po/nds/konversation.po | 8380 +++++++++++++++++++
po/nl/konversation.po | 5975 +++++++-------
po/pt/konversation.po | 5613 +++++++------
po/pt_BR/konversation.po | 6088 +++++++-------
po/ru/konversation.po | 6662 ++++++++--------
po/sr/CMakeLists.txt | 2 -
po/sr/konversation.po | 7380 -----------------
po/sv/konversation.po | 5640 +++++++------
po/tr/konversation.po | 5996 +++++++-------
po/uk/konversation.po | 5693 +++++++------
po/zh_CN/konversation.po | 6551 +++++++--------
po/zh_TW/konversation.po | 5617 +++++++------
src/CMakeLists.txt | 119 +-
src/application.cpp | 237 +-
src/application.h | 29 +-
src/awaymanager.cpp | 41 +-
src/awaymanager.h | 6 +-
src/blowfish/BlowfishCbc.cpp | 654 --
src/blowfish/BlowfishCbc.h | 228 -
src/blowfish/README | 3 -
src/blowfish/b64stuff.cpp | 218 -
src/blowfish/b64stuff.h | 53 -
src/blowfish/blowfish.cpp | 132 -
src/blowfish/blowfish.h | 30 -
src/blowfish/mc_blowfish.cpp | 63 -
src/blowfish/mc_blowfish.h | 34 -
src/blowfish/newblowfish.cpp | 208 -
src/blowfish/newblowfish.h | 32 -
src/blowfish/oldblowfish.cpp | 425 -
src/blowfish/oldblowfish1.h | 141 -
src/blowfish/oldblowfish2.h | 295 -
src/bookmarkhandler.cpp | 14 +-
src/bookmarkhandler.h | 6 +-
src/cipher.cpp | 458 +
src/cipher.h | 53 +
src/commit.h | 2 +-
src/common.cpp | 19 +-
.../alias_config.cpp} | 15 +-
.../alias_preferences.h => config/alias_config.h} | 9 +-
.../alias_configui.ui} | 0
.../autoreplace_config.cpp} | 29 +-
.../autoreplace_config.h} | 6 +-
.../autoreplace_configui.ui} | 7 +-
.../chatwindowappearance_config.ui} | 7 +-
.../chatwindowbehaviour_config.ui} | 2 +-
.../colorsappearance_config.ui} | 0
src/{ => config}/configdialog.cpp | 17 +-
src/{ => config}/configdialog.h | 6 +-
src/config/connectionbehavior_config.ui | 229 +
.../dcc_preferences.cpp => config/dcc_config.cpp} | 33 +-
.../dcc_preferences.h => config/dcc_config.h} | 10 +-
.../dcc_configui.ui} | 469 +-
.../fontappearance_config.ui} | 0
.../generalbehavior_config.ui} | 7 +-
.../highlight_config.cpp} | 29 +-
.../highlight_config.h} | 7 +-
.../highlight_configui.ui} | 0
.../ignore_config.cpp} | 18 +-
.../ignore_config.h} | 2 +-
.../ignore_configui.ui} | 7 +-
src/config/konversation.kcfg | 10 +-
.../log_preferences.ui => config/log_config.ui} | 0
.../nicklistbehavior_config.cpp} | 10 +-
.../nicklistbehavior_config.h} | 10 +-
.../nicklistbehavior_configui.ui} | 0
.../osd_preferences.cpp => config/osd_config.cpp} | 11 +-
.../osd_preferences.h => config/osd_config.h} | 12 +-
.../osd_configui.ui} | 0
src/config/preferences.cpp | 182 +-
src/config/preferences.h | 25 +-
.../quickbuttons_config.cpp} | 17 +-
.../quickbuttons_config.h} | 8 +-
.../quickbuttons_configui.ui} | 0
src/{ => config}/settingsdialog.cpp | 60 +-
src/{ => config}/settingsdialog.h | 37 +-
src/{ => config}/settingspage.h | 0
.../tabnotifications_config.ui} | 0
.../tabs_config.cpp} | 7 +-
.../tabs_preferences.h => config/tabs_config.h} | 6 +-
.../tabs_configui.ui} | 9 +-
.../theme_config.cpp} | 45 +-
.../theme_preferences.h => config/theme_config.h} | 13 +-
.../theme_configui.ui} | 0
.../warnings_config.cpp} | 9 +-
.../warnings_config.h} | 5 +-
.../warnings_configui.ui} | 0
.../watchednicknames_config.cpp} | 182 +-
.../watchednicknames_config.h} | 15 +-
.../watchednicknames_configui.ui} | 7 +-
src/connectionmanager.cpp | 34 +-
src/connectionmanager.h | 2 +-
src/connectionsettings.h | 2 +-
src/dbus.cpp | 47 +-
src/dbus.h | 2 +-
src/dcc/chat.cpp | 742 +-
src/dcc/chat.h | 111 +-
src/dcc/dcccommon.cpp | 177 +-
src/dcc/dcccommon.h | 44 +-
src/dcc/recipientdialog.cpp | 181 +-
src/dcc/recipientdialog.h | 46 +-
src/dcc/resumedialog.cpp | 315 +-
src/dcc/resumedialog.h | 61 +-
src/dcc/transfer.cpp | 655 +-
src/dcc/transfer.h | 342 +-
src/dcc/transferdetailedinfopanel.cpp | 405 +-
src/dcc/transferdetailedinfopanel.h | 60 +-
src/dcc/transferdetailedinfopanelui.ui | 8 +-
src/dcc/transfermanager.cpp | 408 +-
src/dcc/transfermanager.h | 132 +-
src/dcc/transferpanel.cpp | 817 +-
src/dcc/transferpanel.h | 137 +-
src/dcc/transferpanelitem.cpp | 679 +-
src/dcc/transferpanelitem.h | 112 +-
src/dcc/transferrecv.cpp | 1355 ++--
src/dcc/transferrecv.h | 298 +-
src/dcc/transfersend.cpp | 896 ++-
src/dcc/transfersend.h | 143 +-
src/decoder.h | 2 +-
src/identity.cpp | 5 +-
src/identity.h | 2 +-
src/identitydialog.cpp | 27 +-
src/irc/channel.cpp | 195 +-
src/irc/channel.h | 20 +-
src/irc/channeldialog.cpp | 92 -
src/irc/channeldialog.h | 46 -
src/irc/channeldialogui.ui | 67 +
src/irc/channellistpanel.cpp | 41 +-
src/irc/channellistpanel.h | 2 +-
src/irc/channellistviewitem.h | 4 +-
src/irc/channelnick.cpp | 2 -
src/irc/channeloptionsdialog.cpp | 180 +-
src/irc/channeloptionsdialog.h | 35 +-
src/irc/channeloptionsui.ui | 88 +-
src/irc/inputfilter.cpp | 108 +-
src/irc/inputfilter.h | 6 +-
src/irc/invitedialog.cpp | 178 +
src/irc/invitedialog.h | 76 +
src/irc/invitedialog.ui | 44 +
src/irc/irccharsets.cpp | 12 +-
src/irc/irccharsets.h | 2 +-
src/irc/ircqueue.cpp | 6 +-
src/irc/joinchanneldialog.cpp | 6 +-
src/irc/modebutton.h | 2 +-
src/irc/nick.cpp | 13 +-
src/irc/nick.h | 6 +-
src/irc/nickinfo.cpp | 6 +-
src/irc/nickinfo.h | 4 +-
src/irc/nicklistview.cpp | 24 +-
src/irc/nicklistview.h | 7 +-
src/irc/nicksonline.cpp | 46 +-
src/irc/nicksonline.h | 9 +-
src/irc/nicksonlineitem.h | 4 +-
src/irc/outputfilter.cpp | 204 +-
src/irc/outputfilter.h | 14 +-
src/irc/query.cpp | 84 +-
src/irc/query.h | 17 +-
src/irc/server.cpp | 385 +-
src/irc/server.h | 51 +-
src/irc/serverdialog.cpp | 116 -
src/irc/serverdialog.h | 49 -
src/irc/serverdialogui.ui | 107 +
src/irc/servergroupdialog.cpp | 142 +-
src/irc/servergroupdialog.h | 42 +-
src/irc/servergroupdialogui.ui | 33 +-
src/irc/servergroupsettings.cpp | 2 +-
src/irc/servergroupsettings.h | 4 +-
src/irc/serverison.cpp | 9 +-
src/irc/serverlistdialog.cpp | 196 +-
src/irc/serverlistdialog.h | 35 +-
src/irc/serverlistview.cpp | 40 +-
src/irc/serverlistview.h | 1 +
src/irc/serversettings.h | 2 +-
src/konsolepanel.cpp | 6 +-
src/linkaddressbook/addressbook.cpp | 10 +-
src/linkaddressbook/addressbook.h | 4 +-
src/linkaddressbook/addressbook_base.cpp | 19 +-
src/linkaddressbook/addressbook_base.h | 4 +-
src/linkaddressbook/addresseeitem.cpp | 9 +-
src/linkaddressbook/addresseeitem.h | 9 +-
src/linkaddressbook/kimiface.h | 9 +-
src/linkaddressbook/linkaddressbookui.cpp | 19 +-
src/linkaddressbook/linkaddressbookui.h | 2 -
src/main.cpp | 12 +-
src/mainwindow.cpp | 149 +-
src/mainwindow.h | 18 +-
src/notificationhandler.cpp | 29 +-
src/notificationhandler.h | 10 +-
src/preferences/connectionbehavior_preferences.ui | 178 -
src/preferences/valuelistviewitem.cpp | 41 -
src/preferences/valuelistviewitem.h | 33 -
src/queuetuner.cpp | 23 +-
src/queuetuner.h | 2 +-
src/quickconnectdialog.cpp | 11 +-
src/quickconnectdialog.h | 2 +-
src/scriptlauncher.cpp | 8 +-
src/scriptlauncher.h | 2 +-
src/sound.cpp | 80 +-
src/sound.h | 50 +-
src/ssllabel.h | 2 +-
src/statusbar.cpp | 362 +-
src/statusbar.h | 71 +-
src/upnp/soap.cpp | 49 +
src/upnp/soap.h | 58 +
src/upnp/upnpdescriptionparser.cpp | 231 +
src/upnp/upnpdescriptionparser.h | 56 +
src/upnp/upnpmcastsocket.cpp | 241 +
src/upnp/upnpmcastsocket.h | 84 +
src/upnp/upnprouter.cpp | 395 +
src/upnp/upnprouter.h | 200 +
src/urlcatcher.cpp | 35 +-
src/version.h | 2 +-
src/viewer/chatwindow.cpp | 81 +-
src/viewer/chatwindow.h | 4 +-
src/viewer/editnotifydialog.cpp | 39 +-
src/viewer/editnotifydialog.h | 4 +-
src/viewer/emoticons.cpp | 16 +-
src/viewer/emoticons.h | 12 +-
src/viewer/highlight.h | 4 +-
src/viewer/ignore.h | 2 +-
src/viewer/ignorelistviewitem.cpp | 3 +-
src/viewer/ignorelistviewitem.h | 10 +-
src/viewer/images.cpp | 9 +-
src/viewer/images.h | 6 +-
src/viewer/insertchardialog.cpp | 8 +-
src/viewer/irccolorchooser.cpp | 7 +-
src/viewer/ircinput.cpp | 74 +-
src/viewer/ircinput.h | 6 +-
src/viewer/ircview.cpp | 334 +-
src/viewer/ircview.h | 61 +-
src/viewer/ircviewbox.cpp | 34 +-
src/viewer/logfilereader.cpp | 36 +-
src/viewer/logfilereader.h | 5 +-
src/viewer/osd.cpp | 40 +-
src/viewer/osd.h | 10 +-
src/viewer/quickbutton.h | 2 +-
src/viewer/rawlog.cpp | 5 +-
src/viewer/searchbar.cpp | 22 +-
src/{ => viewer}/statuspanel.cpp | 31 +-
src/{ => viewer}/statuspanel.h | 5 +-
src/viewer/topiclabel.cpp | 59 +-
src/viewer/topiclabel.h | 1 +
src/viewer/trayicon.cpp | 9 +-
src/viewer/trayicon.h | 2 +-
src/viewer/viewcontainer.cpp | 90 +-
src/viewer/viewcontainer.h | 20 +-
src/viewer/viewtree.cpp | 103 +-
src/viewer/viewtree.h | 9 +-
src/viewer/viewtreeitem.cpp | 30 +-
src/viewer/viewtreeitem.h | 9 +-
294 files changed, 110811 insertions(+), 96111 deletions(-)
diff --combined src/config/preferences.cpp
index 4bd833d,f809202..07de2d2
--- a/src/config/preferences.cpp
+++ b/src/config/preferences.cpp
@@@ -14,24 -14,17 +14,17 @@@
*/
#include "config/preferences.h"
- #include "identity.h"
#include "ignore.h"
#include "highlight.h"
- #include "commit.h"
- #include "version.h"
- #include <ktoolbar.h>
- #include <kstandarddirs.h>
- #include <kdebug.h>
- #include <kapplication.h>
- #include <kconfig.h>
- #include <klocale.h>
- #include <kurl.h>
- #include <kuser.h>
+ #include <QPalette>
+ #include <QRegExp>
+ #include <QFileInfo>
+ #include <QHashIterator>
- #include <qpalette.h>
- #include <qregexp.h>
- #include <qfileinfo.h>
+ #include <KLocale>
+ #include <KUser>
+ #include <KStandardDirs>
struct PreferencesSingleton
@@@ -79,7 -72,7 +72,7 @@@ Preferences::Preferences(
channel.setName("#konversation");
serverGroup->addChannel(channel);
serverGroup->setExpanded(false);
- mServerGroupList.append(serverGroup);
+ mServerGroupHash.insert(0, serverGroup);
mQuickButtonList = defaultQuickButtonList();
mAutoreplaceList = defaultAutoreplaceList();
}
@@@ -90,9 -83,9 +83,9 @@@ Preferences::~Preferences(
qDeleteAll(mIgnoreList);
qDeleteAll(mHighlightList);
}
- const Konversation::ServerGroupList Preferences::serverGroupList()
+ const Konversation::ServerGroupHash Preferences::serverGroupHash()
{
- return self()->mServerGroupList;
+ return self()->mServerGroupHash;
}
const QStringList Preferences::defaultQuickButtonList()
@@@ -128,8 -121,7 +121,8 @@@ const QList<QStringList> Preferences::d
{
QList<QStringList> defaultList;
defaultList.append(QStringList() << "1" << "o" << "\\[\\[([^\\s]+)\\]\\]" << "http://en.wikipedia.org/wiki/Special:Search?go=Go&search=%1");
- defaultList.append(QStringList() << "1" << "o" << "(BUG:|bug:)([0-9]+)" << "http://bugs.kde.org/show_bug.cgi?id=%2");
+ defaultList.append(QStringList() << "1" << "o" << "(BUG:|bug:)([0-9]+)" << "https://bugs.kde.org/show_bug.cgi?id=%2");
+ defaultList.append(QStringList() << "1" << "o" << "([Dd][Bb][Uu][Gg]:)(\\w+)" << "http://bugs.debian.org/%2");
return defaultList;
}
@@@ -150,110 -142,69 +143,69 @@@ void Preferences::clearAutoreplaceList(
// --------------------------- AutoReplace ---------------------------
- void Preferences::setServerGroupList(const Konversation::ServerGroupList& list)
+ void Preferences::setServerGroupHash(const Konversation::ServerGroupHash& hash)
{
- self()->mServerGroupList.clear();
- self()->mServerGroupList = list;
-
- Konversation::ServerGroupList::iterator it;
+ self()->mServerGroupHash.clear();
+ self()->mServerGroupHash = hash;
}
void Preferences::addServerGroup(Konversation::ServerGroupSettingsPtr serverGroup)
{
- self()->mServerGroupList.append(serverGroup);
+ Konversation::ServerGroupHash hash = self()->mServerGroupHash;
+ hash.insert(serverGroup->id(), serverGroup);
+ self()->mServerGroupHash = hash;
}
const Konversation::ServerGroupSettingsPtr Preferences::serverGroupById(int id)
{
- if (!self()->mServerGroupList.count())
- {
- return Konversation::ServerGroupSettingsPtr();
- }
-
- Konversation::ServerGroupList::iterator it;
-
- for (it = self()->mServerGroupList.begin(); it != self()->mServerGroupList.end(); ++it)
- {
- if ((*it)->id() == id)
- {
- return (*it);
- }
- }
-
- return Konversation::ServerGroupSettingsPtr();
+ return self()->mServerGroupHash.value(id);
}
- const Konversation::ServerGroupSettingsPtr Preferences::serverGroupByServer(const QString& server)
+ const QList<Konversation::ServerGroupSettingsPtr> Preferences::serverGroupsByServer(const QString& server)
{
- if (!self()->mServerGroupList.count())
+ QList<Konversation::ServerGroupSettingsPtr> serverGroups;
+ QHashIterator<int, Konversation::ServerGroupSettingsPtr> it(self()->mServerGroupHash);
+ while(it.hasNext())
{
- return Konversation::ServerGroupSettingsPtr();
- }
-
- Konversation::ServerGroupList::iterator it;
-
- for (it = self()->mServerGroupList.begin(); it != self()->mServerGroupList.end(); ++it)
- {
- for (int i = 0; i != (*it)->serverList().count(); i++)
+ it.next();
+ for (int i=0; i != it.value()->serverList().count(); i++)
{
- if ((*it)->serverByIndex(i).host().toLower() == server)
- {
- return (*it);
- }
+ if(it.value()->serverByIndex(i).host().toLower() == server)
+ serverGroups.append(it.value());
}
}
-
- return Konversation::ServerGroupSettingsPtr();
+ return serverGroups;
}
- int Preferences::serverGroupIdByName(const QString& serverGroup)
+ QList<int> Preferences::serverGroupIdsByName(const QString& serverGroup)
{
- Konversation::ServerGroupList::iterator it;
-
- for (it = self()->mServerGroupList.begin(); it != self()->mServerGroupList.end(); ++it)
+ QList<int> serverIds;
+ QHashIterator<int, Konversation::ServerGroupSettingsPtr> it(self()->mServerGroupHash);
+ while(it.hasNext())
{
- if((*it)->name().toLower() == serverGroup.toLower())
- {
- return (*it)->id();
- }
+ if(it.next().value()->name().toLower() == serverGroup.toLower())
+ serverIds.append(it.key());
}
+ if (serverIds.isEmpty())
+ serverIds.append(-1);
- return -1;
+ return serverIds;
}
bool Preferences::isServerGroup(const QString& server)
{
- Konversation::ServerGroupList::iterator it;
-
- for(it = self()->mServerGroupList.begin(); it != self()->mServerGroupList.end(); ++it)
+ QHashIterator<int, Konversation::ServerGroupSettingsPtr> it(self()->mServerGroupHash);
+ while(it.hasNext())
{
- if((*it)->name().toLower() == server.toLower())
- {
+ if(it.next().value()->name().toLower() == server.toLower())
return true;
- }
}
-
return false;
}
void Preferences::removeServerGroup(int id)
{
- if (!self()->mServerGroupList.count())
- {
- return;
- }
-
- Konversation::ServerGroupList::iterator it;
-
- for (it = self()->mServerGroupList.begin(); it != self()->mServerGroupList.end(); ++it)
- {
- if ((*it)->id() == id)
- {
- self()->mServerGroupList.erase(it);
-
- return;
- }
- }
+ self()->mServerGroupHash.remove(id);
}
@@@ -324,18 -275,17 +276,17 @@@ void Preferences::setNotifyList(const Q
const QMap<int, QStringList> Preferences::notifyList() { return self()->mNotifyList; }
- const QStringList Preferences::notifyListByGroupName(const QString& groupName)
+ const QStringList Preferences::notifyListByGroupId(int serverGroupId)
{
- int id=serverGroupIdByName(groupName);
- if (id && self()->mNotifyList.find(id) != self()->mNotifyList.end())
- return self()->mNotifyList[id];
- else
+ if (serverGroupId && self()->mNotifyList.find(serverGroupId) != self()->mNotifyList.end())
+ return self()->mNotifyList.value(serverGroupId);
+ else
return QStringList();
}
- const QString Preferences::notifyStringByGroupName(const QString& groupName)
+ const QString Preferences::notifyStringByGroupId(int serverGroupId)
{
- return notifyListByGroupName(groupName).join(" ");
+ return notifyListByGroupId(serverGroupId).join(" ");
}
bool Preferences::addNotify(int serverGroupId, const QString& newPattern)
@@@ -350,19 -300,16 +301,16 @@@
return false;
}
- bool Preferences::removeNotify(const QString& groupName, const QString& pattern)
+ bool Preferences::removeNotify(int serverGroupId, const QString& pattern)
{
- int id=serverGroupIdByName(groupName);
- if(!id) return false;
-
- if (self()->mNotifyList.find(id) != self()->mNotifyList.end())
+ if (self()->mNotifyList.find(serverGroupId) != self()->mNotifyList.end())
{
- QStringList nicknameList = self()->mNotifyList[id];
+ QStringList nicknameList = self()->mNotifyList[serverGroupId];
nicknameList.removeAll(pattern); //FIXME: what semantics do you really want here?
if (nicknameList.isEmpty())
- self()->mNotifyList.remove(id);
+ self()->mNotifyList.remove(serverGroupId);
else
- self()->mNotifyList[id] = nicknameList;
+ self()->mNotifyList[serverGroupId] = nicknameList;
return true;
}
return false;
@@@ -550,7 -497,23 +498,23 @@@ void Preferences::setDialogFlag(const Q
// Channel Encodings
const QString Preferences::channelEncoding(const QString& server,const QString& channel)
{
- return channelEncoding(serverGroupIdByName(server),channel);
+ //check all matching server's encodings
+ //TODO when we rewrite dbus, allow for multiple encodings to be returned
+ //for true 'duplicity compatibility'
+ QList<int> serverIds = serverGroupIdsByName(server);
+ QString codec;
+ if(serverIds.count() > 1)
+ {
+ for (int i=0; i < serverIds.count(); i++)
+ {
+ codec = channelEncoding(serverIds.at(i),channel);
+ if(!codec.isEmpty())
+ return codec;
+ }
+ return QString();
+ }
+ else
+ return channelEncoding(serverIds.first(),channel);
}
const QString Preferences::channelEncoding(int serverGroupId,const QString& channel)
@@@ -563,7 -526,15 +527,15 @@@
void Preferences::setChannelEncoding(const QString& server,const QString& channel,const QString& encoding)
{
- setChannelEncoding(serverGroupIdByName(server),channel,encoding);
+ //set channel encoding for ALL matching servergroups
+ QList<int> serverIds = serverGroupIdsByName(server);
+ if(serverIds.count() > 1)
+ {
+ for(int i=0; i < serverIds.count(); i++)
+ setChannelEncoding(serverIds.at(i),channel,encoding);
+ }
+ else
+ setChannelEncoding(serverIds.first(),channel,encoding);
}
void Preferences::setChannelEncoding(int serverGroupId,const QString& channel,const QString& encoding)
--
Konversation packaging for Debian
More information about the pkg-kde-commits
mailing list