<!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][14266] </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=14266">14266</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2009-07-15 22:41:59 -0500 (Wed, 15 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixed problem with deleting tabs on unsuccessful connections.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribjmesquitafsguiresourcesserver_managerui">freeswitch/trunk/contrib/jmesquita/fsgui/resources/server_manager.ui</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcconsolepagecpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/consolepage.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcesl_connectioncpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/esl_connection.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcfs_guicpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/fs_gui.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribjmesquitafsguiresourcesserver_managerui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/resources/server_manager.ui (14265 => 14266)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/resources/server_manager.ui 2009-07-16 02:08:21 UTC (rev 14265)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/resources/server_manager.ui 2009-07-16 03:41:59 UTC (rev 14266)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> <property name="windowTitle">
</span><span class="cx"> <string>Server Manager</string>
</span><span class="cx"> </property>
</span><del>- <widget class="QWidget" name="">
</del><ins>+ <widget class="QWidget" name="layoutWidget">
</ins><span class="cx"> <property name="geometry">
</span><span class="cx"> <rect>
</span><span class="cx"> <x>9</x>
</span><span class="lines">@@ -190,5 +190,21 @@
</span><span class="cx"> </hint>
</span><span class="cx"> </hints>
</span><span class="cx"> </connection>
</span><ins>+ <connection>
+ <sender>serverTreeWidget</sender>
+ <signal>itemDoubleClicked(QTreeWidgetItem*,int)</signal>
+ <receiver>CserverManager</receiver>
+ <slot>accept()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>138</x>
+ <y>106</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>257</x>
+ <y>124</y>
+ </hint>
+ </hints>
+ </connection>
</ins><span class="cx"> </connections>
</span><span class="cx"> </ui>
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcconsolepagecpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/consolepage.cpp (14265 => 14266)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/consolepage.cpp 2009-07-16 02:08:21 UTC (rev 14265)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/consolepage.cpp 2009-07-16 03:41:59 UTC (rev 14266)
</span><span class="lines">@@ -52,12 +52,10 @@
</span><span class="cx"> delete m_ui;
</span><span class="cx"> if (eslConnection->isRunning())
</span><span class="cx"> {
</span><del>- qDebug() << "Thread is running, lets wait.";
</del><span class="cx"> eslConnection->disconnect();
</span><span class="cx"> eslConnection->wait();
</span><span class="cx"> }
</span><span class="cx"> delete eslConnection;
</span><del>- qDebug() << "We quit!!!";
</del><span class="cx"> }
</span><span class="cx"> void consolePage::init(QString host)
</span><span class="cx"> {
</span><span class="lines">@@ -142,13 +140,11 @@
</span><span class="cx"> {
</span><span class="cx"> appendConsoleText(tr("Disconnected!"));
</span><span class="cx"> m_ui->lineCmd->setDisabled(true);
</span><del>- delete eslConnection;
</del><span class="cx"> }
</span><span class="cx"> void consolePage::connectionFailedSlot(QString msg)
</span><span class="cx"> {
</span><span class="cx"> appendConsoleText("Connection Failed: "+msg);
</span><span class="cx"> m_ui->lineCmd->setDisabled(true);
</span><del>- delete eslConnection;
</del><span class="cx"> }
</span><span class="cx"> void consolePage::gotEventSlot(ESLevent * event)
</span><span class="cx"> {
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcesl_connectioncpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/esl_connection.cpp (14265 => 14266)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/esl_connection.cpp 2009-07-16 02:08:21 UTC (rev 14265)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/esl_connection.cpp 2009-07-16 03:41:59 UTC (rev 14266)
</span><span class="lines">@@ -79,12 +79,8 @@
</span><span class="cx"> {
</span><span class="cx"> sendRecv("log 7");
</span><span class="cx"> emit gotConnected();
</span><del>- start();
</del><span class="cx"> }
</span><del>- else
- {
- emit connectionFailed(QString(handle.err));
- }
</del><ins>+ start();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int ESLconnection::connected()
</span><span class="lines">@@ -283,25 +279,26 @@
</span><span class="cx">
</span><span class="cx"> void ESLconnection::run(void)
</span><span class="cx"> {
</span><del>- forever
</del><ins>+
+ while(connected())
</ins><span class="cx"> {
</span><del>- if (!connected())
</del><ins>+ ESLevent * event = recvEventTimed(10);
+ if (event)
</ins><span class="cx"> {
</span><del>- emit gotDisconnected();
- break;
</del><ins>+ ESLevent * e = new ESLevent(event);
+ emit gotEvent(e);
</ins><span class="cx"> }
</span><del>- else
- {
- ESLevent * event = recvEventTimed(10);
- if (event)
- {
- ESLevent * e = new ESLevent(event);
- emit gotEvent(e);
- }
- }
</del><span class="cx"> }
</span><del>- qDebug() << "Do we ever get here?";
-
</del><ins>+ if (!QString(handle.err).isEmpty())
+ {
+ emit connectionFailed(handle.err);
+ qDebug() << "Connection failed";
+ }
+ else
+ {
+ emit gotDisconnected();
+ qDebug() << "Connection ended";
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // ESLevent
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcfs_guicpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/fs_gui.cpp (14265 => 14266)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/fs_gui.cpp 2009-07-16 02:08:21 UTC (rev 14265)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/fs_gui.cpp 2009-07-16 03:41:59 UTC (rev 14266)
</span><span class="lines">@@ -106,6 +106,7 @@
</span><span class="cx"> page->init(serverDialog->getHost());
</span><span class="cx"> m_ui->tabWidget->setCurrentWidget(page);
</span><span class="cx"> }
</span><ins>+ this->activateWindow();
</ins><span class="cx"> }
</span><span class="cx"> void Cfsgui::closeTab(int index)
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>