← Back to branch summary

~ubuntu-branches/ubuntu/raring/mumble/raring

« back to all changes in this revision

Viewing changes to src/murmur/MurmurIce.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Thorvald Natvig
  • Date: 2010-01-09 19:28:50 UTC
  • mfrom: (9.1.6 sid)
  • Revision ID: james.westby@ubuntu.com-20100109192850-zs4g5vwrrpd71kob
Tags: 1.2.1-2
Fix upgrade failure when upgrading mumble-server directly from 1.1.x
to 1.2.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/murmur/MurmurIce.cpp
1
 
/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
 
1
/* Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
2
2
 
3
3
   All rights reserved.
4
4
 
874
874
        cb->ice_response(recurseTree(server->qhChannels.value(0)));
875
875
}
876
876
 
 
877
static void impl_Server_getCertificateList(const ::Murmur::AMD_Server_getCertificateListPtr cb, int server_id, ::Ice::Int session) {
 
878
        NEED_SERVER;
 
879
        NEED_PLAYER;
 
880
 
 
881
        ::Murmur::CertificateList certs;
 
882
 
 
883
        const QList<QSslCertificate> &certlist = user->peerCertificateChain();
 
884
 
 
885
        certs.resize(certlist.size());
 
886
        for (int i=0;i<certlist.size();++i) {
 
887
                ::Murmur::CertificateDer der;
 
888
                QByteArray qba = certlist.at(i).toDer();
 
889
                der.resize(qba.size());
 
890
                const char *ptr = qba.constData();
 
891
                for (int j=0;j<qba.size();++j)
 
892
                        der[j] = ptr[j];
 
893
                certs[i] = der;
 
894
        }
 
895
        cb->ice_response(certs);
 
896
}
 
897
 
877
898
static void impl_Server_getBans(const ::Murmur::AMD_Server_getBansPtr cb, int server_id) {
878
899
        NEED_SERVER;
879
900
        ::Murmur::BanList bl;
1012
1033
        int channelid = state.id;
1013
1034
        NEED_SERVER;
1014
1035
        NEED_CHANNEL;
1015
 
        ::Channel *np;
1016
 
        NEED_CHANNEL_VAR(np, state.parent);
 
1036
        ::Channel *np = NULL;
 
1037
        if (channel->iId != 0) {
 
1038
                NEED_CHANNEL_VAR(np, state.parent);
 
1039
        }
1017
1040
 
1018
1041
        QString qsName = u8(state.name);
1019
1042