<!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][16346] </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=16346">16346</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2010-01-17 17:10:57 -0600 (Sun, 17 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>First created account is set as default outbound account. Will start making GUI stuff to be able to select between accounts.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkfscommconffreeswitchxml">freeswitch/trunk/fscomm/conf/freeswitch.xml</a></li>
<li><a href="#freeswitchtrunkfscommpreferencesaccountdialogcpp">freeswitch/trunk/fscomm/preferences/accountdialog.cpp</a></li>
<li><a href="#freeswitchtrunkfscommpreferencesaccountdialogh">freeswitch/trunk/fscomm/preferences/accountdialog.h</a></li>
<li><a href="#freeswitchtrunkfscommpreferencesprefaccountscpp">freeswitch/trunk/fscomm/preferences/prefaccounts.cpp</a></li>
<li><a href="#freeswitchtrunkfscommpreferencesprefaccountsh">freeswitch/trunk/fscomm/preferences/prefaccounts.h</a></li>
<li><a href="#freeswitchtrunkfscommpreferencesprefdialogcpp">freeswitch/trunk/fscomm/preferences/prefdialog.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkfscommconffreeswitchxml"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/conf/freeswitch.xml (16345 => 16346)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/conf/freeswitch.xml 2010-01-17 22:50:49 UTC (rev 16345)
+++ freeswitch/trunk/fscomm/conf/freeswitch.xml 2010-01-17 23:10:57 UTC (rev 16346)
</span><span class="lines">@@ -7,7 +7,6 @@
</span><span class="cx"> <X-PRE-PROCESS cmd="set" data="external_rtp_ip=stun:stun.freeswitch.org"/>
</span><span class="cx"> <X-PRE-PROCESS cmd="set" data="external_sip_ip=stun:stun.freeswitch.org"/>
</span><span class="cx"> <X-PRE-PROCESS cmd="set" data="console_loglevel=info"/>
</span><del>- <X-PRE-PROCESS cmd="set" data="default_gateway=default"/>
</del><span class="cx"> <X-PRE-PROCESS cmd="set" data="us-ring=%(2000, 4000, 440.0, 480.0)"/>
</span><span class="cx"> <X-PRE-PROCESS cmd="set" data="bong-ring=v=-7;%(100,0,941.0,1477.0);v=-7;>=2;+=.1;%(1400,0,350,440)"/>
</span><span class="cx"> <X-PRE-PROCESS cmd="set" data="sit=%(274,0,913.8);%(274,0,1370.6);%(380,0,1776.7)"/>
</span><span class="lines">@@ -255,6 +254,7 @@
</span><span class="cx"> </extension>
</span><span class="cx"> <extension name="number">
</span><span class="cx"> <condition field="destination_number" expression="^(.*)$">
</span><ins>+ <!-- Default gateway is set by FSComm when default account is selected -->
</ins><span class="cx"> <action application="bridge" data="sofia/gateway/${default_gateway}/$1"/>
</span><span class="cx"> </condition>
</span><span class="cx"> </extension>
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesaccountdialogcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/accountdialog.cpp (16345 => 16346)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/accountdialog.cpp 2010-01-17 22:50:49 UTC (rev 16345)
+++ freeswitch/trunk/fscomm/preferences/accountdialog.cpp 2010-01-17 23:10:57 UTC (rev 16346)
</span><span class="lines">@@ -130,13 +130,7 @@
</span><span class="cx">
</span><span class="cx"> _settings->endGroup();
</span><span class="cx">
</span><del>- QString res;
- if (g_FSHost.sendCmd("sofia", "profile softphone rescan", &res) != SWITCH_STATUS_SUCCESS)
- {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not rescan the softphone profile.\n");
- return;
- }
- emit gwAdded();
</del><ins>+ emit gwAdded(_accId);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AccountDialog::clear()
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesaccountdialogh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/accountdialog.h (16345 => 16346)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/accountdialog.h 2010-01-17 22:50:49 UTC (rev 16345)
+++ freeswitch/trunk/fscomm/preferences/accountdialog.h 2010-01-17 23:10:57 UTC (rev 16346)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> void readConfig();
</span><span class="cx">
</span><span class="cx"> signals:
</span><del>- void gwAdded();
</del><ins>+ void gwAdded(QString);
</ins><span class="cx">
</span><span class="cx"> private slots:
</span><span class="cx"> void writeConfig();
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesprefaccountscpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/prefaccounts.cpp (16345 => 16346)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/prefaccounts.cpp 2010-01-17 22:50:49 UTC (rev 16345)
+++ freeswitch/trunk/fscomm/preferences/prefaccounts.cpp 2010-01-17 23:10:57 UTC (rev 16346)
</span><span class="lines">@@ -24,7 +24,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> _accDlg = new AccountDialog(uuid);
</span><del>- connect(_accDlg, SIGNAL(gwAdded()), this, SLOT(readConfig()));
</del><ins>+ connect(_accDlg, SIGNAL(gwAdded(QString)), this, SLOT(readConfig()));
+ connect(_accDlg, SIGNAL(gwAdded(QString)), this, SLOT(applyNewGw(QString)));
</ins><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> {
</span><span class="lines">@@ -43,6 +44,26 @@
</span><span class="cx"> _accDlg->activateWindow();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PrefAccounts::applyNewGw(QString accId)
+{
+ QString res;
+ if (g_FSHost.sendCmd("sofia", "profile softphone rescan", &res) != SWITCH_STATUS_SUCCESS)
+ {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not rescan the softphone profile.\n");
+ return;
+ }
+
+ if (_ui->accountsTable->rowCount() == 1)
+ {
+ _settings->beginGroup("FreeSWITCH/conf/globals");
+ _settings->setValue("default_gateway",_settings->value("/attrs/name"));
+ _settings->endGroup();
+ _settings->beginGroup(QString("FreeSWITCH/conf/sofia.conf/profiles/profile/gateways/%1/gateway").arg(accId));
+ switch_core_set_variable("default_gateway",_settings->value("/attrs/name").toByteArray().data());
+ _settings->endGroup();
+ }
+}
+
</ins><span class="cx"> void PrefAccounts::editAccountBtnClicked()
</span><span class="cx"> {
</span><span class="cx"> QList<QTableWidgetSelectionRange> selList = _ui->accountsTable->selectedRanges();
</span><span class="lines">@@ -56,7 +77,7 @@
</span><span class="cx"> if (!_accDlg)
</span><span class="cx"> {
</span><span class="cx"> _accDlg = new AccountDialog(uuid);
</span><del>- connect(_accDlg, SIGNAL(gwAdded()), this, SLOT(readConfig()));
</del><ins>+ connect(_accDlg, SIGNAL(gwAdded(QString)), this, SLOT(readConfig()));
</ins><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> {
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesprefaccountsh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/prefaccounts.h (16345 => 16346)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/prefaccounts.h 2010-01-17 22:50:49 UTC (rev 16345)
+++ freeswitch/trunk/fscomm/preferences/prefaccounts.h 2010-01-17 23:10:57 UTC (rev 16346)
</span><span class="lines">@@ -20,6 +20,7 @@
</span><span class="cx"> void addAccountBtnClicked();
</span><span class="cx"> void editAccountBtnClicked();
</span><span class="cx"> void remAccountBtnClicked();
</span><ins>+ void applyNewGw(QString);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Ui::PrefDialog *_ui;
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesprefdialogcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/prefdialog.cpp (16345 => 16346)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/prefdialog.cpp 2010-01-17 22:50:49 UTC (rev 16345)
+++ freeswitch/trunk/fscomm/preferences/prefdialog.cpp 2010-01-17 23:10:57 UTC (rev 16346)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> {
</span><span class="cx"> _mod_portaudio->writeConfig();
</span><span class="cx"> _mod_sofia->writeConfig();
</span><ins>+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PrefDialog::changeEvent(QEvent *e)
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>