<!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][16412] </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=16412">16412</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2010-01-19 23:11:40 -0600 (Tue, 19 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove QObject inheritance from Account and add event for account removal.</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="#freeswitchtrunkfscommfshostcpp">freeswitch/trunk/fscomm/fshost.cpp</a></li>
<li><a href="#freeswitchtrunkfscommfshosth">freeswitch/trunk/fscomm/fshost.h</a></li>
<li><a href="#freeswitchtrunkfscommmainwindowcpp">freeswitch/trunk/fscomm/mainwindow.cpp</a></li>
<li><a href="#freeswitchtrunkfscommmainwindowh">freeswitch/trunk/fscomm/mainwindow.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkfscommaccountcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/account.cpp (16411 => 16412)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/account.cpp 2010-01-19 23:54:32 UTC (rev 16411)
+++ freeswitch/trunk/fscomm/account.cpp 2010-01-20 05:11:40 UTC (rev 16412)
</span><span class="lines">@@ -1,6 +1,18 @@
</span><ins>+#include <QtGui>
</ins><span class="cx"> #include "account.h"
</span><span class="cx">
</span><del>-Account::Account(QObject *parent) :
- QObject(parent)
</del><ins>+Account::Account(QString name) :
+ _name(name)
</ins><span class="cx"> {
</span><ins>+ QSettings settings;
+ settings.beginGroup("FreeSWITCH/conf/sofia.conf/profiles/profile/gateways");
+ foreach(QString g, settings.childGroups())
+ {
+ settings.beginGroup(g);
+ if(settings.value("gateway/attrs/name").toString() == name)
+ {
+ _uuid = g;
+ break;
+ }
+ }
</ins><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunkfscommaccounth"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/account.h (16411 => 16412)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/account.h 2010-01-19 23:54:32 UTC (rev 16411)
+++ freeswitch/trunk/fscomm/account.h 2010-01-20 05:11:40 UTC (rev 16412)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> #ifndef ACCOUNT_H
</span><span class="cx"> #define ACCOUNT_H
</span><span class="cx">
</span><del>-#include <QObject>
</del><ins>+#include <QString>
</ins><span class="cx">
</span><span class="cx"> #define FSCOMM_GW_STATE_TRYING 0
</span><span class="cx"> #define FSCOMM_GW_STATE_REGISTER 1
</span><span class="lines">@@ -26,20 +26,20 @@
</span><span class="cx"> QString("Not applicable")
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class Account : public QObject
-{
-Q_OBJECT
</del><ins>+class Account {
</ins><span class="cx"> public:
</span><del>- explicit Account(QObject *parent = 0);
</del><ins>+ explicit Account(QString name);
</ins><span class="cx"> void setName(QString name) { _name = name; }
</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><span class="cx"> QString getStateName() { return fscomm_gw_state_names[_state]; }
</span><ins>+ QString getUUID() { return _uuid; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> QString _name;
</span><span class="cx"> int _state;
</span><ins>+ QString _uuid;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #endif // ACCOUNT_H
</span></span></pre></div>
<a id="freeswitchtrunkfscommfshostcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/fshost.cpp (16411 => 16412)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/fshost.cpp 2010-01-19 23:54:32 UTC (rev 16411)
+++ freeswitch/trunk/fscomm/fshost.cpp 2010-01-20 05:11:40 UTC (rev 16412)
</span><span class="lines">@@ -326,8 +326,7 @@
</span><span class="cx"> QSharedPointer<Account> acc;
</span><span class="cx"> if (!_accounts.contains(gw))
</span><span class="cx"> {
</span><del>- Account * accPtr = new Account();
- accPtr->setName(gw);
</del><ins>+ Account * accPtr = new Account(gw);
</ins><span class="cx"> acc = QSharedPointer<Account>(accPtr);
</span><span class="cx"> _accounts.insert(gw, acc);
</span><span class="cx"> emit newAccount(acc);
</span><span class="lines">@@ -364,6 +363,11 @@
</span><span class="cx"> emit accountStateChange(acc);
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ else if (strcmp(event->subclass_name, "fscomm::acc_removed") == 0)
+ {
+ QSharedPointer<Account> acc = _accounts.take(switch_event_get_header_nil(event, "acc_name"));
+ emit delAccount(acc);
+ }
</ins><span class="cx"> else
</span><span class="cx"> {
</span><span class="cx"> printEventHeaders(event);
</span><span class="lines">@@ -388,6 +392,16 @@
</span><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+QSharedPointer<Account> FSHost::getAccountByUUID(QString uuid)
+{
+ foreach(QSharedPointer<Account> acc, _accounts.values())
+ {
+ if (acc.data()->getUUID() == uuid)
+ return acc;
+ }
+ return QSharedPointer<Account>();
+}
+
</ins><span class="cx"> QSharedPointer<Call> FSHost::getCurrentActiveCall()
</span><span class="cx"> {
</span><span class="cx"> foreach(QSharedPointer<Call> call, _active_calls.values())
</span></span></pre></div>
<a id="freeswitchtrunkfscommfshosth"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/fshost.h (16411 => 16412)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/fshost.h 2010-01-19 23:54:32 UTC (rev 16411)
+++ freeswitch/trunk/fscomm/fshost.h 2010-01-20 05:11:40 UTC (rev 16412)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> QSharedPointer<Call> getCallByUUID(QString uuid) { return _active_calls.value(uuid); }
</span><span class="cx"> QSharedPointer<Call> getCurrentActiveCall();
</span><span class="cx"> QList<QSharedPointer<Account> > getAccounts() { return _accounts.values(); }
</span><ins>+ QSharedPointer<Account> getAccountByUUID(QString uuid);
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> void run(void);
</span><span class="lines">@@ -60,6 +61,7 @@
</span><span class="cx"> void hungup(QSharedPointer<Call>);
</span><span class="cx"> void accountStateChange(QSharedPointer<Account>);
</span><span class="cx"> void newAccount(QSharedPointer<Account>);
</span><ins>+ void delAccount(QSharedPointer<Account>);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> switch_status_t processBlegEvent(switch_event_t *, QString);
</span></span></pre></div>
<a id="freeswitchtrunkfscommmainwindowcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/mainwindow.cpp (16411 => 16412)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/mainwindow.cpp 2010-01-19 23:54:32 UTC (rev 16411)
+++ freeswitch/trunk/fscomm/mainwindow.cpp 2010-01-20 05:11:40 UTC (rev 16412)
</span><span class="lines">@@ -83,6 +83,7 @@
</span><span class="cx"> connect(&g_FSHost, SIGNAL(callFailed(QSharedPointer<Call>)), this, SLOT(callFailed(QSharedPointer<Call>)));
</span><span class="cx"> connect(&g_FSHost, SIGNAL(accountStateChange(QSharedPointer<Account>)), this, SLOT(accountStateChanged(QSharedPointer<Account>)));
</span><span class="cx"> connect(&g_FSHost, SIGNAL(newAccount(QSharedPointer<Account>)), this, SLOT(accountAdd(QSharedPointer<Account>)));
</span><ins>+ connect(&g_FSHost, SIGNAL(delAccount(QSharedPointer<Account>)), this, SLOT(accountDel(QSharedPointer<Account>)));
</ins><span class="cx"> /*connect(&g_FSHost, SIGNAL(coreLoadingError(QString)), this, SLOT(coreLoadingError(QString)));*/
</span><span class="cx">
</span><span class="cx"> connect(ui->newCallBtn, SIGNAL(clicked()), this, SLOT(makeCall()));
</span><span class="lines">@@ -153,6 +154,22 @@
</span><span class="cx"> ui->tableAccounts->horizontalHeader()->setStretchLastSection(true);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MainWindow::accountDel(QSharedPointer<Account> acc)
+{
+ foreach (QTableWidgetItem *i, ui->tableAccounts->findItems(acc.data()->getName(), Qt::MatchExactly))
+ {
+ if (i->text() == acc.data()->getName())
+ {
+ ui->tableAccounts->removeRow(i->row());
+ ui->tableAccounts->setRowCount(ui->tableAccounts->rowCount()-1);
+ ui->tableAccounts->resizeColumnsToContents();
+ ui->tableAccounts->resizeRowsToContents();
+ ui->tableAccounts->horizontalHeader()->setStretchLastSection(true);
+ return;
+ }
+ }
+}
+
</ins><span class="cx"> void MainWindow::accountStateChanged(QSharedPointer<Account> acc)
</span><span class="cx"> {
</span><span class="cx"> ui->statusBar->showMessage(tr("Account %1 is %2").arg(acc.data()->getName(), acc.data()->getStateName()));
</span></span></pre></div>
<a id="freeswitchtrunkfscommmainwindowh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/mainwindow.h (16411 => 16412)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/mainwindow.h 2010-01-19 23:54:32 UTC (rev 16411)
+++ freeswitch/trunk/fscomm/mainwindow.h 2010-01-20 05:11:40 UTC (rev 16412)
</span><span class="lines">@@ -76,6 +76,7 @@
</span><span class="cx"> void recordCall(bool);
</span><span class="cx"> void setDefaultAccount();
</span><span class="cx"> void accountAdd(QSharedPointer<Account>);
</span><ins>+ void accountDel(QSharedPointer<Account>);
</ins><span class="cx"> void accountStateChanged(QSharedPointer<Account>);
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesprefaccountscpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/prefaccounts.cpp (16411 => 16412)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/prefaccounts.cpp 2010-01-19 23:54:32 UTC (rev 16411)
+++ freeswitch/trunk/fscomm/preferences/prefaccounts.cpp 2010-01-20 05:11:40 UTC (rev 16412)
</span><span class="lines">@@ -13,6 +13,11 @@
</span><span class="cx"> connect(_ui->sofiaGwEditBtn, SIGNAL(clicked()), this, SLOT(editAccountBtnClicked()));
</span><span class="cx">
</span><span class="cx"> _ui->accountsTable->horizontalHeader()->setStretchLastSection(true);
</span><ins>+
+ if (switch_event_reserve_subclass(FSCOMM_EVENT_ACC_REMOVED) != SWITCH_STATUS_SUCCESS) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass!\n");
+ }
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PrefAccounts::addAccountBtnClicked()
</span><span class="lines">@@ -86,6 +91,17 @@
</span><span class="cx"> _settings->beginGroup("FreeSWITCH/conf/sofia.conf/profiles/profile/gateways");
</span><span class="cx"> _settings->remove(item->data(Qt::UserRole).toString());
</span><span class="cx"> _settings->endGroup();
</span><ins>+ /* Fire event to remove account */
+ switch_event_t *event;
+ if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, FSCOMM_EVENT_ACC_REMOVED) == SWITCH_STATUS_SUCCESS) {
+ QSharedPointer<Account> acc = g_FSHost.getAccountByUUID(item->data(Qt::UserRole).toString());
+ if (!acc.isNull())
+ {
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "acc_name", acc.data()->getName().toAscii().data());
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "acc_uuid", acc.data()->getUUID().toAscii().data());
+ switch_event_fire(&event);
+ }
+ }
</ins><span class="cx"> _ui->accountsTable->removeRow(row-offset);
</span><span class="cx"> offset++;
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesprefaccountsh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/prefaccounts.h (16411 => 16412)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/prefaccounts.h 2010-01-19 23:54:32 UTC (rev 16411)
+++ freeswitch/trunk/fscomm/preferences/prefaccounts.h 2010-01-20 05:11:40 UTC (rev 16412)
</span><span class="lines">@@ -4,6 +4,8 @@
</span><span class="cx"> #include <QObject>
</span><span class="cx"> #include "ui_prefdialog.h"
</span><span class="cx">
</span><ins>+#define FSCOMM_EVENT_ACC_REMOVED "fscomm::acc_removed"
+
</ins><span class="cx"> class QSettings;
</span><span class="cx"> class AccountDialog;
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>