<!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][16504] </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=16504">16504</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2010-01-24 14:18:24 -0600 (Sun, 24 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix editing accounts and add more descriptive information of why it fails.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkfscommaccountcpp">freeswitch/trunk/fscomm/account.cpp</a></li>
<li><a href="#freeswitchtrunkfscommaccounth">freeswitch/trunk/fscomm/account.h</a></li>
<li><a href="#freeswitchtrunkfscommcallh">freeswitch/trunk/fscomm/call.h</a></li>
<li><a href="#freeswitchtrunkfscommfshostcpp">freeswitch/trunk/fscomm/fshost.cpp</a></li>
<li><a href="#freeswitchtrunkfscommmainwindowcpp">freeswitch/trunk/fscomm/mainwindow.cpp</a></li>
<li><a href="#freeswitchtrunkfscommmod_qsettingsmod_qsettingscpp">freeswitch/trunk/fscomm/mod_qsettings/mod_qsettings.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkfscommaccountcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/account.cpp (16503 => 16504)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/account.cpp 2010-01-24 20:00:33 UTC (rev 16503)
+++ freeswitch/trunk/fscomm/account.cpp 2010-01-24 20:18:24 UTC (rev 16504)
</span><span class="lines">@@ -4,6 +4,9 @@
</span><span class="cx"> Account::Account(QString name) :
</span><span class="cx"> _name(name)
</span><span class="cx"> {
</span><ins>+ _statusCode = QString();
+ _statusPhrase = QString();
+
</ins><span class="cx"> QSettings settings;
</span><span class="cx"> settings.beginGroup("FreeSWITCH/conf/sofia.conf/profiles/profile/gateways");
</span><span class="cx"> foreach(QString g, settings.childGroups())
</span><span class="lines">@@ -12,7 +15,17 @@
</span><span class="cx"> if(settings.value("gateway/attrs/name").toString() == name)
</span><span class="cx"> {
</span><span class="cx"> _uuid = g;
</span><ins>+ settings.endGroup();
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+ settings.endGroup();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+QString Account::getStateName()
+{
+ if (_statusPhrase.isEmpty())
+ return fscomm_gw_state_names[_state];
+
+ return QString("%1 - %2").arg(fscomm_gw_state_names[_state], _statusPhrase);
+}
</ins></span></pre></div>
<a id="freeswitchtrunkfscommaccounth"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/account.h (16503 => 16504)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/account.h 2010-01-24 20:00:33 UTC (rev 16503)
+++ freeswitch/trunk/fscomm/account.h 2010-01-24 20:18:24 UTC (rev 16504)
</span><span class="lines">@@ -35,13 +35,17 @@
</span><span class="cx"> QString getName() { return _name; }
</span><span class="cx"> void setState(int state) { _state = state; }
</span><span class="cx"> int getState() { return _state; }
</span><del>- QString getStateName() { return fscomm_gw_state_names[_state]; }
</del><ins>+ QString getStateName();
</ins><span class="cx"> QString getUUID() { return _uuid; }
</span><ins>+ void setStausCode(QString code) { _statusCode = code; }
+ void setStatusPhrase(QString phrase) { _statusPhrase = phrase; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> QString _name;
</span><span class="cx"> int _state;
</span><span class="cx"> QString _uuid;
</span><ins>+ QString _statusCode;
+ QString _statusPhrase;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #endif // ACCOUNT_H
</span></span></pre></div>
<a id="freeswitchtrunkfscommcallh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/call.h (16503 => 16504)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/call.h 2010-01-24 20:00:33 UTC (rev 16503)
+++ freeswitch/trunk/fscomm/call.h 2010-01-24 20:18:24 UTC (rev 16504)
</span><span class="lines">@@ -49,7 +49,6 @@
</span><span class="cx"> public:
</span><span class="cx"> Call();
</span><span class="cx"> Call(int call_id, QString cid_name, QString cid_number, fscomm_call_direction_t direction, QString uuid);
</span><del>- /*~Call() { qDebug() << "I am being freed uuid: " << _uuid; }*/
</del><span class="cx"> QString getCidName(void) { return _cid_name; }
</span><span class="cx"> QString getCidNumber(void) { return _cid_number; }
</span><span class="cx"> int getCallID(void) { return _call_id; }
</span></span></pre></div>
<a id="freeswitchtrunkfscommfshostcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/fshost.cpp (16503 => 16504)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/fshost.cpp 2010-01-24 20:00:33 UTC (rev 16503)
+++ freeswitch/trunk/fscomm/fshost.cpp 2010-01-24 20:18:24 UTC (rev 16504)
</span><span class="lines">@@ -346,30 +346,38 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (state == "TRYING") {
</span><ins>+ acc.data()->setStatusPhrase(switch_event_get_header_nil(event, "Phrase"));
</ins><span class="cx"> acc.data()->setState(FSCOMM_GW_STATE_TRYING);
</span><span class="cx"> emit accountStateChange(acc);
</span><span class="cx"> } else if (state == "REGISTER") {
</span><ins>+ acc.data()->setStatusPhrase(switch_event_get_header_nil(event, "Phrase"));
</ins><span class="cx"> acc.data()->setState(FSCOMM_GW_STATE_REGISTER);
</span><span class="cx"> emit accountStateChange(acc);
</span><span class="cx"> } else if (state == "REGED") {
</span><ins>+ acc.data()->setStatusPhrase(switch_event_get_header_nil(event, "Phrase"));
</ins><span class="cx"> acc.data()->setState(FSCOMM_GW_STATE_REGED);
</span><span class="cx"> emit accountStateChange(acc);
</span><span class="cx"> } else if (state == "UNREGED") {
</span><ins>+ acc.data()->setStatusPhrase(switch_event_get_header_nil(event, "Phrase"));
</ins><span class="cx"> acc.data()->setState(FSCOMM_GW_STATE_UNREGED);
</span><span class="cx"> emit accountStateChange(acc);
</span><span class="cx"> } else if (state == "UNREGISTER") {
</span><ins>+ acc.data()->setStatusPhrase(switch_event_get_header_nil(event, "Phrase"));
</ins><span class="cx"> acc.data()->setState(FSCOMM_GW_STATE_UNREGISTER);
</span><span class="cx"> emit accountStateChange(acc);
</span><span class="cx"> } else if (state =="FAILED") {
</span><ins>+ acc.data()->setStatusPhrase(switch_event_get_header_nil(event, "Phrase"));
</ins><span class="cx"> acc.data()->setState(FSCOMM_GW_STATE_FAILED);
</span><span class="cx"> emit accountStateChange(acc);
</span><span class="cx"> } else if (state == "FAIL_WAIT") {
</span><span class="cx"> acc.data()->setState(FSCOMM_GW_STATE_FAIL_WAIT);
</span><span class="cx"> emit accountStateChange(acc);
</span><span class="cx"> } else if (state == "EXPIRED") {
</span><ins>+ acc.data()->setStatusPhrase(switch_event_get_header_nil(event, "Phrase"));
</ins><span class="cx"> acc.data()->setState(FSCOMM_GW_STATE_EXPIRED);
</span><span class="cx"> emit accountStateChange(acc);
</span><span class="cx"> } else if (state == "NOREG") {
</span><ins>+ acc.data()->setStatusPhrase(switch_event_get_header_nil(event, "Phrase"));
</ins><span class="cx"> acc.data()->setState(FSCOMM_GW_STATE_NOREG);
</span><span class="cx"> emit accountStateChange(acc);
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunkfscommmainwindowcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/mainwindow.cpp (16503 => 16504)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/mainwindow.cpp 2010-01-24 20:00:33 UTC (rev 16503)
+++ freeswitch/trunk/fscomm/mainwindow.cpp 2010-01-24 20:18:24 UTC (rev 16504)
</span><span class="lines">@@ -168,6 +168,7 @@
</span><span class="cx">
</span><span class="cx"> void MainWindow::accountAdd(QSharedPointer<Account> acc)
</span><span class="cx"> {
</span><ins>+ qDebug() << "Adding: " << acc.data()->getName();
</ins><span class="cx"> ui->tableAccounts->setRowCount(ui->tableAccounts->rowCount()+1);
</span><span class="cx"> QTableWidgetItem *gwField = new QTableWidgetItem(acc.data()->getName());
</span><span class="cx"> QTableWidgetItem *stField = new QTableWidgetItem(acc.data()->getStateName());
</span><span class="lines">@@ -180,16 +181,17 @@
</span><span class="cx">
</span><span class="cx"> void MainWindow::accountDel(QSharedPointer<Account> acc)
</span><span class="cx"> {
</span><ins>+ qDebug() << "Deleting: " << acc.data()->getName();
</ins><span class="cx"> foreach (QTableWidgetItem *i, ui->tableAccounts->findItems(acc.data()->getName(), Qt::MatchExactly))
</span><span class="cx"> {
</span><span class="cx"> if (i->text() == acc.data()->getName())
</span><span class="cx"> {
</span><span class="cx"> ui->tableAccounts->removeRow(i->row());
</span><del>- ui->tableAccounts->setRowCount(ui->tableAccounts->rowCount()-1);
</del><ins>+ //ui->tableAccounts->setRowCount(ui->tableAccounts->rowCount()-1);
</ins><span class="cx"> ui->tableAccounts->resizeColumnsToContents();
</span><span class="cx"> ui->tableAccounts->resizeRowsToContents();
</span><span class="cx"> ui->tableAccounts->horizontalHeader()->setStretchLastSection(true);
</span><del>- return;
</del><ins>+ break;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunkfscommmod_qsettingsmod_qsettingscpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/mod_qsettings/mod_qsettings.cpp (16503 => 16504)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/mod_qsettings/mod_qsettings.cpp 2010-01-24 20:00:33 UTC (rev 16503)
+++ freeswitch/trunk/fscomm/mod_qsettings/mod_qsettings.cpp 2010-01-24 20:18:24 UTC (rev 16504)
</span><span class="lines">@@ -183,7 +183,6 @@
</span><span class="cx"> settings.beginGroup("FreeSWITCH/conf");
</span><span class="cx"> if (settings.childGroups().isEmpty())
</span><span class="cx"> {
</span><del>- qDebug() << "We are settings default.";
</del><span class="cx"> setQSettingsDefaults();
</span><span class="cx"> }
</span><span class="cx"> settings.endGroup();
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>