Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorvald Natvig <slicer@users.sourceforge.net>2009-04-24 16:11:07 +0400
committerThorvald Natvig <slicer@users.sourceforge.net>2009-04-24 16:11:07 +0400
commit031bf2bce54decc0123804f62f512db66cbaad70 (patch)
tree5f739156d77c64582f6811d200a56c6f2230a961 /src/murmur/RPC.cpp
parent139d4e0dac87569916d75086bc6829618e21fa51 (diff)
Export channel description over Ice
Diffstat (limited to 'src/murmur/RPC.cpp')
-rw-r--r--src/murmur/RPC.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/murmur/RPC.cpp b/src/murmur/RPC.cpp
index 5f1fc4d6e..10f7df30a 100644
--- a/src/murmur/RPC.cpp
+++ b/src/murmur/RPC.cpp
@@ -83,7 +83,7 @@ void Server::setPlayerState(Player *pPlayer, Channel *cChannel, bool mute, bool
}
}
-bool Server::setChannelState(Channel *cChannel, Channel *cParent, const QString &qsName, const QSet<Channel *> &links) {
+bool Server::setChannelState(Channel *cChannel, Channel *cParent, const QString &qsName, const QSet<Channel *> &links, const QString &desc) {
bool changed = false;
bool updated = false;
@@ -135,6 +135,13 @@ bool Server::setChannelState(Channel *cChannel, Channel *cParent, const QString
changed = true;
}
+
+ if (! desc.isNull() && desc != cChannel->qsDesc) {
+ updated = true;
+ changed = true;
+ cChannel->qsDesc = desc;
+ mpcs.set_description(u8(desc));
+ }
if (updated)
updateChannel(cChannel);