projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #168 from esainane/irssi-msg-escape
[quassel.git]
/
src
/
common
/
ircuser.cpp
diff --git
a/src/common/ircuser.cpp
b/src/common/ircuser.cpp
index
64f1bcd
..
15220f7
100644
(file)
--- a/
src/common/ircuser.cpp
+++ b/
src/common/ircuser.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
4
by the Quassel Project *
+ * Copyright (C) 2005-201
5
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-87,7
+87,7
@@
QStringList IrcUser::channels() const
void IrcUser::setCodecForEncoding(const QString &name)
{
void IrcUser::setCodecForEncoding(const QString &name)
{
- setCodecForEncoding(QTextCodec::codecForName(name.to
Ascii
()));
+ setCodecForEncoding(QTextCodec::codecForName(name.to
Latin1
()));
}
}
@@
-99,7
+99,7
@@
void IrcUser::setCodecForEncoding(QTextCodec *codec)
void IrcUser::setCodecForDecoding(const QString &name)
{
void IrcUser::setCodecForDecoding(const QString &name)
{
- setCodecForDecoding(QTextCodec::codecForName(name.to
Ascii
()));
+ setCodecForDecoding(QTextCodec::codecForName(name.to
Latin1
()));
}
}
@@
-275,12
+275,13
@@
void IrcUser::updateHostmask(const QString &mask)
}
}
-void IrcUser::joinChannel(IrcChannel *channel)
+void IrcUser::joinChannel(IrcChannel *channel
, bool skip_channel_join
)
{
Q_ASSERT(channel);
if (!_channels.contains(channel)) {
_channels.insert(channel);
{
Q_ASSERT(channel);
if (!_channels.contains(channel)) {
_channels.insert(channel);
- channel->joinIrcUser(this);
+ if (!skip_channel_join)
+ channel->joinIrcUser(this);
}
}
}
}
@@
-345,9
+346,11
@@
void IrcUser::channelDestroyed()
void IrcUser::setUserModes(const QString &modes)
{
void IrcUser::setUserModes(const QString &modes)
{
- _userModes = modes;
- SYNC(ARG(modes))
- emit userModesSet(modes);
+ if (_userModes != modes) {
+ _userModes = modes;
+ SYNC(ARG(modes))
+ emit userModesSet(modes);
+ }
}
}
@@
-356,13
+359,19
@@
void IrcUser::addUserModes(const QString &modes)
if (modes.isEmpty())
return;
if (modes.isEmpty())
return;
+ // Don't needlessly sync when no changes are made
+ bool changesMade = false;
for (int i = 0; i < modes.count(); i++) {
for (int i = 0; i < modes.count(); i++) {
- if (!_userModes.contains(modes[i]))
+ if (!_userModes.contains(modes[i]))
{
_userModes += modes[i];
_userModes += modes[i];
+ changesMade = true;
+ }
}
}
- SYNC(ARG(modes))
- emit userModesAdded(modes);
+ if (changesMade) {
+ SYNC(ARG(modes))
+ emit userModesAdded(modes);
+ }
}
}