Revision

14213

Author

jmesquita

Date

2009-07-13 01:21:55 -0500 (Mon, 13 Jul 2009)

Log Message

We got connection and disconnection sorted out.

Modified Paths

• freeswitch/trunk/contrib/jmesquita/fsgui/esl_connection.cpp
• freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.cpp

Diff

--- freeswitch/trunk/contrib/jmesquita/fsgui/esl_connection.cpp	2009-07-13 06:01:22 UTC (rev 14212)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/esl_connection.cpp	2009-07-13 06:21:55 UTC (rev 14213)
@@ -18,7 +18,7 @@
 
 void eslConnectionManager::doDisconnect()
 {
-	connection->disconnect();
+        connection->disconnect();
 }
 
 void eslConnectionManager::run()
@@ -29,6 +29,7 @@
         {
             isConnected = false;
             emit gotDisconnected();
+            break;
         }
         else if (connection->connected() && !isConnected)
         {

--- freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.cpp	2009-07-13 06:01:22 UTC (rev 14212)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.cpp	2009-07-13 06:21:55 UTC (rev 14213)
@@ -32,7 +32,7 @@
 
 void Cfsgui::getDisconnectedSlot()
 {
-    delete eslConnection;
+    eslConnection->doDisconnect();
 }
 
 void Cfsgui::gotConnectedSlot()
@@ -44,8 +44,8 @@
 }
 void Cfsgui::gotDisconnectedSlot()
 {
+    m_ui->statusBar->showMessage("Disconnected");
     appendConsoleText("Disconnected!");
-    m_ui->textConsole->append("Conneted!");
     m_ui->actionConnect->setEnabled(true);
     m_ui->actionDisconnect->setDisabled(true);
 }
@@ -81,7 +81,6 @@
 void Cfsgui::closeEvent(QCloseEvent *e)
 {
     /* TODO: We have to stop threads and do cleanup */
-    delete eslConnection;
     e->accept();
 }