kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix a bug with QString and switch_event_expand_headers(). Thanks MikeJ. 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16147 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
João Mesquita 2010-01-05 07:01:37 +00:00
parent c95d8882c4
commit 1dc7a3b4c4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fscomm/mod_qsettings/mod_qsettings.cpp
View File

@ -68,7 +68,7 @@ switch_xml_t XMLBinding::getConfigXML(QString tmpl)
}
/* Open template file and expand all strings based on QSettings */
QString tmplContents(tmplFile.readAll());
QByteArray tmplContents(tmplFile.readAll());
tmplFile.close();
_settings->beginGroup("FreeSIWTCH/conf");
_settings->beginGroup(tmpl);
@ -77,7 +77,7 @@ switch_xml_t XMLBinding::getConfigXML(QString tmpl)
switch_event_add_header_string(e, SWITCH_STACK_BOTTOM, k.toAscii().constData(), _settings->value(k).toByteArray().constData());
}
char *res = switch_event_expand_headers(e, tmplContents.toAscii().constData());
char *res = switch_event_expand_headers(e, tmplContents.data());
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Template %s as follows:\n%s", tmpl.toAscii().constData(), res);
switch_safe_free(e);
return switch_xml_parse_str(res, strlen(res));