← Back to branch summary

~ubuntu-branches/ubuntu/wily/sflphone/wily

« back to all changes in this revision

Viewing changes to daemon/src/im/instant_messaging.cpp

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2014-01-28 18:23:36 UTC
  • mfrom: (1.1.11)
  • mto: This revision was merged to the branch mainline in revision 24.
  • Revision ID: package-import@ubuntu.com-20140128182336-3xenud1kbnwmf3mz
http://bugs.debian.org/735846
http://bugs.debian.org/727164
http://bugs.debian.org/718178
http://bugs.debian.org/736583
http://bugs.debian.org/722040
http://bugs.debian.org/736746
* New upstream release 
  - Fixes "New Upstream Release" (Closes: #735846)
  - Fixes "Ringtone does not stop" (Closes: #727164)
  - Fixes "[sflphone-kde] crash on startup" (Closes: #718178)
  - Fixes "sflphone GUI crashes when call is hung up" (Closes: #736583)
* Build-Depends: ensure GnuTLS 2.6
  - libucommon-dev (>= 6.0.7-1.1), libccrtp-dev (>= 2.0.6-3)
  - Fixes "FTBFS Build-Depends libgnutls{26,28}-dev" (Closes: #722040)
* Fix "boost 1.49 is going away" unversioned Build-Depends: (Closes: #736746)
* Add Build-Depends: libsndfile-dev, nepomuk-core-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemon/src/im/instant_messaging.cpp
1
1
/*
2
 
 *  Copyright (C) 2004-2012 Savoir-Faire Linux Inc.
 
2
 *  Copyright (C) 2004-2013 Savoir-Faire Linux Inc.
3
3
 *  Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
4
4
 *  Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
5
5
 *
31
31
 
32
32
#include "instant_messaging.h"
33
33
#include "logger.h"
34
 
#include "expat.h"
 
34
#include <expat.h>
35
35
 
36
36
namespace {
37
37
void XMLCALL
99
99
void InstantMessaging::send_sip_message(pjsip_inv_session *session, const std::string &id, const std::string &message)
100
100
{
101
101
    std::vector<std::string> msgs(split_message(message));
102
 
    std::vector<std::string>::const_iterator iter;
103
 
 
104
 
    for (iter = msgs.begin(); iter != msgs.end(); ++iter)
105
 
        sip_send(session, id, *iter);
 
102
    for (const auto &item : msgs)
 
103
        sip_send(session, id, item);
106
104
}
107
105
 
108
106
#if HAVE_IAX
109
107
void InstantMessaging::send_iax_message(iax_session *session, const std::string &/* id */, const std::string &message)
110
108
{
111
109
    std::vector<std::string> msgs(split_message(message));
112
 
    std::vector<std::string>::const_iterator iter;
113
110
 
114
 
    for (iter = msgs.begin(); iter != msgs.end(); ++iter)
115
 
        iax_send_text(session, (*iter).c_str());
 
111
    for (const auto &item : msgs)
 
112
        iax_send_text(session, item.c_str());
116
113
}
117
114
#endif
118
115
 
138
135
                                  "<resource-lists xmlns=\"urn:ietf:params:xml:ns:resource-lists\" xmlns:cp=\"urn:ietf:params:xml:ns:copycontrol\">"
139
136
                                  "<list>";
140
137
 
141
 
    for (UriList::iterator iter = list.begin(); iter != list.end(); ++iter)
142
 
        xmlbuffer += "<entry uri=" + (*iter)[sfl::IM_XML_URI] + " cp:copyControl=\"to\" />";
 
138
    for (auto &item : list)
 
139
        xmlbuffer += "<entry uri=" + item[sfl::IM_XML_URI] + " cp:copyControl=\"to\" />";
143
140
 
144
141
    return xmlbuffer + "</list></resource-lists>";
145
142
}