<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][16596] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=16596">16596</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2010-02-09 21:26:29 -0600 (Tue, 09 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre><a href="http://jira.freeswitch.org/browse/FSCOMM-5">FSCOMM-5</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkfscommpreferencesprefsofiacpp">freeswitch/trunk/fscomm/preferences/prefsofia.cpp</a></li>
<li><a href="#freeswitchtrunkfscommpreferencesprefsofiah">freeswitch/trunk/fscomm/preferences/prefsofia.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkfscommpreferencesprefsofiacpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/prefsofia.cpp (16595 => 16596)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/prefsofia.cpp 2010-02-09 19:49:27 UTC (rev 16595)
+++ freeswitch/trunk/fscomm/preferences/prefsofia.cpp 2010-02-10 03:26:29 UTC (rev 16596)
</span><span class="lines">@@ -6,71 +6,124 @@
</span><span class="cx"> QObject(parent),
</span><span class="cx"> _ui(ui)
</span><span class="cx"> {
</span><del>- _settings = new QSettings();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PrefSofia::readConfig()
</span><span class="cx"> {
</span><ins>+ QSettings settings;
</ins><span class="cx"> int guess_mask;
</span><span class="cx"> char guess_ip[80];
</span><span class="cx"> switch_find_local_ip(guess_ip, sizeof(guess_ip), &guess_mask, AF_INET);
</span><span class="cx"> _ui->sofiaRtpIpEdit->setText(QString(guess_ip));
</span><span class="cx"> _ui->sofiaSipIpEdit->setText(QString(guess_ip));
</span><ins>+
+ settings.beginGroup("FreeSWITCH/conf");
+ settings.beginGroup("sofia.conf");
+
+ /* General Settings */
+ settings.beginGroup("global_settings/params");
+ _ui->sofiaLogLevelSpin->setValue(settings.value("log-level").toInt());
+ _ui->sofiaAutoRestartCombo->setCurrentIndex(_ui->sofiaAutoRestartCombo->findText(settings.value("auto-restart").toString()));
+ _ui->sofiaDebugPresenceSpin->setValue(settings.value("debug-presence").toInt());
+ _ui->sofiaRewriteMulticastedFsPathCombo->setCurrentIndex(_ui->sofiaRewriteMulticastedFsPathCombo->findText(settings.value("rewrite-multicasted-fs-path").toString()));
+ settings.endGroup();
+
+ /* Profile settings */
+ settings.beginGroup("profiles");
+ settings.beginGroup("profile");
+
+
+ settings.beginGroup("settings/params");
+ _ui->sofiaUserAgentStringEdit->setText(settings.value("user-agent-string").toString());
+ _ui->sofiaDebugSpin->setValue(settings.value("debug").toInt());
+ _ui->sofiaSipTraceCombo->setCurrentIndex(_ui->sofiaSipTraceCombo->findText(settings.value("sip-trace").toString()));
+ _ui->sofiaContextEdit->setText(settings.value("context").toString());
+ _ui->sofiaRfc2833PtEdit->setText(settings.value("rfc2833-pt").toString());
+ _ui->sofiaSipPortSpin->setValue(settings.value("sip-port").toInt());
+ _ui->sofiaDialplanEdit->setText(settings.value("dialplan").toString());
+ _ui->sofiaDtmfDurationSpin->setValue(settings.value("dtmf-duration").toInt());
+ _ui->sofiaCodecPrefsEdit->setText(settings.value("codec-prefs").toString());
+ _ui->sofiaUseRtpTimerCombo->setCurrentIndex(_ui->sofiaUseRtpTimerCombo->findText(settings.value("use-rtp-timer").toString()));
+ _ui->sofiaRtpTimerNameEdit->setText(settings.value("rtp-timer-name").toString());
+ _ui->sofiaRtpIpEdit->setText(settings.value("rtp-ip").toString());
+ _ui->sofiaSipIpEdit->setText(settings.value("sip-ip").toString());
+ _ui->sofiaHoldMusicEdit->setText(settings.value("hold-music").toString());
+ _ui->sofiaApplyNatAclEdit->setText(settings.value("apply-nat-acl").toString());
+ _ui->sofiaManagePresenceCombo->setCurrentIndex(_ui->sofiaManagePresenceCombo->findText(settings.value("manage-presence").toString()));
+ _ui->sofiaMaxProceedingEdit->setValue(settings.value("max-proceeding").toInt());
+ _ui->sofiaInboundCodecNegotiationCombo->setCurrentIndex(_ui->sofiaInboundCodecNegotiationCombo->findText(settings.value("inbound-codec-negotiation").toString()));
+ _ui->sofiaNonceTtlSpin->setValue(settings.value("nonce-ttl").toInt());
+ _ui->sofiaAuthCallsCombo->setCurrentIndex(_ui->sofiaAuthCallsCombo->findText(settings.value("auth-calls").toString()));
+ _ui->sofiaAuthAllPacketsCombo->setCurrentIndex(_ui->sofiaAuthAllPacketsCombo->findText(settings.value("auth-all-packets").toString()));
+ _ui->sofiaExtRtpIpEdit->setText(settings.value("ext-rtp-ip").toString());
+ _ui->sofiaExtSipIpEdit->setText(settings.value("ext-sip-ip").toString());
+ _ui->sofiaRtpTimeoutSecSpin->setValue(settings.value("rtp-timeout-sec").toInt());
+ _ui->sofiaRtpHoldTimeoutSecSpin->setValue(settings.value("rtp-hold-timeout-sec").toInt());
+ _ui->sofiaDisableRegisterCombo->setCurrentIndex(_ui->sofiaDisableRegisterCombo->findText(settings.value("disable-register").toString()));
+ _ui->sofiaChallengeRealmCombo->setCurrentIndex(_ui->sofiaChallengeRealmCombo->findText(settings.value("challenge-realm").toString()));
+ settings.endGroup();
+
+ settings.endGroup();
+ settings.endGroup();
+ settings.endGroup();
+ settings.endGroup();
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PrefSofia::writeConfig()
</span><span class="cx"> {
</span><del>- _settings->beginGroup("FreeSWITCH/conf");
- _settings->beginGroup("sofia.conf");
</del><ins>+ QSettings settings;
+ settings.beginGroup("FreeSWITCH/conf");
+ settings.beginGroup("sofia.conf");
</ins><span class="cx">
</span><span class="cx"> /* General Settings */
</span><del>- _settings->beginGroup("global_settings/params");
- _settings->setValue("log-level", _ui->sofiaLogLevelSpin->value());
- _settings->setValue("auto-restart", _ui->sofiaAutoRestartCombo->currentText());
- _settings->setValue("debug-presence", _ui->sofiaDebugPresenceSpin->value());
- _settings->setValue("rewrite-multicasted-fs-path", _ui->sofiaRewriteMulticastedFsPathCombo->currentText());
- _settings->endGroup();
</del><ins>+ settings.beginGroup("global_settings/params");
+ settings.setValue("log-level", _ui->sofiaLogLevelSpin->value());
+ settings.setValue("auto-restart", _ui->sofiaAutoRestartCombo->currentText());
+ settings.setValue("debug-presence", _ui->sofiaDebugPresenceSpin->value());
+ settings.setValue("rewrite-multicasted-fs-path", _ui->sofiaRewriteMulticastedFsPathCombo->currentText());
+ settings.endGroup();
</ins><span class="cx">
</span><span class="cx"> /* Profile settings */
</span><del>- _settings->beginGroup("profiles");
- _settings->beginGroup("profile");
</del><ins>+ settings.beginGroup("profiles");
+ settings.beginGroup("profile");
</ins><span class="cx">
</span><del>- _settings->beginGroup("attrs");
- _settings->setValue("name", "softphone");
- _settings->endGroup();
</del><ins>+ settings.beginGroup("attrs");
+ settings.setValue("name", "softphone");
+ settings.endGroup();
</ins><span class="cx">
</span><del>- _settings->beginGroup("settings/params");
- _settings->setValue("user-agent-string", _ui->sofiaUserAgentStringEdit->text());
- _settings->setValue("debug", _ui->sofiaDebugSpin->value());
- _settings->setValue("sip-trace", _ui->sofiaSipTraceCombo->currentText());
- _settings->setValue("context", _ui->sofiaContextEdit->text());
- _settings->setValue("rfc2833-pt", _ui->sofiaRfc2833PtEdit->text());
- _settings->setValue("sip-port", _ui->sofiaSipPortSpin->value());
- _settings->setValue("dialplan", _ui->sofiaDialplanEdit->text());
- _settings->setValue("dtmf-duration", _ui->sofiaDtmfDurationSpin->value());
- _settings->setValue("codec-prefs", _ui->sofiaCodecPrefsEdit->text());
- _settings->setValue("use-rtp-timer", _ui->sofiaUseRtpTimerCombo->currentText());
- _settings->setValue("rtp-timer-name", _ui->sofiaRtpTimerNameEdit->text());
- _settings->setValue("rtp-ip", _ui->sofiaRtpIpEdit->text());
- _settings->setValue("sip-ip", _ui->sofiaSipIpEdit->text());
- _settings->setValue("hold-music", _ui->sofiaHoldMusicEdit->text());
- _settings->setValue("apply-nat-acl", _ui->sofiaApplyNatAclEdit->text());
- _settings->setValue("manage-presence", _ui->sofiaManagePresenceCombo->currentText());
- _settings->setValue("max-proceeding", _ui->sofiaMaxProceedingEdit->text());
- _settings->setValue("inbound-codec-negotiation", _ui->sofiaInboundCodecNegotiationCombo->currentText());
- _settings->setValue("nonce-ttl", _ui->sofiaNonceTtlSpin->value());
- _settings->setValue("auth-calls", _ui->sofiaAuthCallsCombo->currentText());
- _settings->setValue("auth-all-packets", _ui->sofiaAuthAllPacketsCombo->currentText());
- _settings->setValue("ext-rtp-ip", _ui->sofiaExtRtpIpEdit->text());
- _settings->setValue("ext-sip-ip", _ui->sofiaExtSipIpEdit->text());
- _settings->setValue("rtp-timeout-sec", _ui->sofiaRtpTimeoutSecSpin->value());
- _settings->setValue("rtp-hold-timeout-sec", _ui->sofiaRtpHoldTimeoutSecSpin->value());
- _settings->setValue("disable-register", _ui->sofiaDisableRegisterCombo->currentText());
- _settings->setValue("challenge-realm", _ui->sofiaChallengeRealmCombo->currentText());
- _settings->endGroup();
</del><ins>+ settings.beginGroup("settings/params");
+ settings.setValue("user-agent-string", _ui->sofiaUserAgentStringEdit->text());
+ settings.setValue("debug", _ui->sofiaDebugSpin->value());
+ settings.setValue("sip-trace", _ui->sofiaSipTraceCombo->currentText());
+ settings.setValue("context", _ui->sofiaContextEdit->text());
+ settings.setValue("rfc2833-pt", _ui->sofiaRfc2833PtEdit->text());
+ settings.setValue("sip-port", _ui->sofiaSipPortSpin->value());
+ settings.setValue("dialplan", _ui->sofiaDialplanEdit->text());
+ settings.setValue("dtmf-duration", _ui->sofiaDtmfDurationSpin->value());
+ settings.setValue("codec-prefs", _ui->sofiaCodecPrefsEdit->text());
+ settings.setValue("use-rtp-timer", _ui->sofiaUseRtpTimerCombo->currentText());
+ settings.setValue("rtp-timer-name", _ui->sofiaRtpTimerNameEdit->text());
+ settings.setValue("rtp-ip", _ui->sofiaRtpIpEdit->text());
+ settings.setValue("sip-ip", _ui->sofiaSipIpEdit->text());
+ settings.setValue("hold-music", _ui->sofiaHoldMusicEdit->text());
+ settings.setValue("apply-nat-acl", _ui->sofiaApplyNatAclEdit->text());
+ settings.setValue("manage-presence", _ui->sofiaManagePresenceCombo->currentText());
+ settings.setValue("max-proceeding", _ui->sofiaMaxProceedingEdit->text());
+ settings.setValue("inbound-codec-negotiation", _ui->sofiaInboundCodecNegotiationCombo->currentText());
+ settings.setValue("nonce-ttl", _ui->sofiaNonceTtlSpin->value());
+ settings.setValue("auth-calls", _ui->sofiaAuthCallsCombo->currentText());
+ settings.setValue("auth-all-packets", _ui->sofiaAuthAllPacketsCombo->currentText());
+ settings.setValue("ext-rtp-ip", _ui->sofiaExtRtpIpEdit->text());
+ settings.setValue("ext-sip-ip", _ui->sofiaExtSipIpEdit->text());
+ settings.setValue("rtp-timeout-sec", _ui->sofiaRtpTimeoutSecSpin->value());
+ settings.setValue("rtp-hold-timeout-sec", _ui->sofiaRtpHoldTimeoutSecSpin->value());
+ settings.setValue("disable-register", _ui->sofiaDisableRegisterCombo->currentText());
+ settings.setValue("challenge-realm", _ui->sofiaChallengeRealmCombo->currentText());
+ settings.endGroup();
</ins><span class="cx">
</span><del>- _settings->endGroup();
- _settings->endGroup();
- _settings->endGroup();
- _settings->endGroup();
</del><ins>+ settings.endGroup();
+ settings.endGroup();
+ settings.endGroup();
+ settings.endGroup();
</ins><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesprefsofiah"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/prefsofia.h (16595 => 16596)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/prefsofia.h 2010-02-09 19:49:27 UTC (rev 16595)
+++ freeswitch/trunk/fscomm/preferences/prefsofia.h 2010-02-10 03:26:29 UTC (rev 16596)
</span><span class="lines">@@ -4,8 +4,6 @@
</span><span class="cx"> #include <QObject>
</span><span class="cx"> #include "ui_prefdialog.h"
</span><span class="cx">
</span><del>-class QSettings;
-
</del><span class="cx"> class PrefSofia : public QObject
</span><span class="cx"> {
</span><span class="cx"> Q_OBJECT
</span><span class="lines">@@ -15,7 +13,6 @@
</span><span class="cx"> void readConfig();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- QSettings *_settings;
</del><span class="cx"> Ui::PrefDialog *_ui;
</span><span class="cx">
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>