Revision

14266

Author

jmesquita

Date

2009-07-15 22:41:59 -0500 (Wed, 15 Jul 2009)

Log Message

Fixed problem with deleting tabs on unsuccessful connections.

Modified Paths

• freeswitch/trunk/contrib/jmesquita/fsgui/resources/server_manager.ui
• freeswitch/trunk/contrib/jmesquita/fsgui/src/consolepage.cpp
• freeswitch/trunk/contrib/jmesquita/fsgui/src/esl_connection.cpp
• freeswitch/trunk/contrib/jmesquita/fsgui/src/fs_gui.cpp

Diff

--- 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)
@@ -19,7 +19,7 @@
   <property name="windowTitle">
    <string>Server Manager</string>
   </property>
-  <widget class="QWidget" name="">
+  <widget class="QWidget" name="layoutWidget">
    <property name="geometry">
     <rect>
      <x>9</x>
@@ -190,5 +190,21 @@
     </hint>
    </hints>
   </connection>
+  <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>
  </connections>
 </ui>

--- 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)
@@ -52,12 +52,10 @@
     delete m_ui;
     if (eslConnection->isRunning())
     {
-        qDebug() << "Thread is running, lets wait.";
         eslConnection->disconnect();
         eslConnection->wait();
     }
     delete eslConnection;
-    qDebug() << "We quit!!!";
 }
 void consolePage::init(QString host)
 {
@@ -142,13 +140,11 @@
 {
     appendConsoleText(tr("Disconnected!"));
     m_ui->lineCmd->setDisabled(true);
-    delete eslConnection;
 }
 void consolePage::connectionFailedSlot(QString msg)
 {
     appendConsoleText("Connection Failed: "+msg);
     m_ui->lineCmd->setDisabled(true);
-    delete eslConnection;
 }
 void consolePage::gotEventSlot(ESLevent * event)
 {

--- 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)
@@ -79,12 +79,8 @@
     {
         sendRecv("log 7");
         emit gotConnected();
-        start();
     }
-    else
-    {
-        emit connectionFailed(QString(handle.err));
-    }
+    start();
 }
 
 int ESLconnection::connected()
@@ -283,25 +279,26 @@
 
 void ESLconnection::run(void)
 {
-    forever
+
+    while(connected())
     {
-        if (!connected())
+        ESLevent * event = recvEventTimed(10);
+        if (event)
         {
-            emit gotDisconnected();
-            break;
+            ESLevent * e = new ESLevent(event);
+            emit gotEvent(e);
         }
-        else
-        {
-            ESLevent * event = recvEventTimed(10);
-            if (event)
-            {
-                ESLevent * e = new ESLevent(event);
-                emit gotEvent(e);
-            }
-        }
     }
-    qDebug() << "Do we ever get here?";
-
+    if (!QString(handle.err).isEmpty())
+    {
+        emit connectionFailed(handle.err);
+        qDebug() << "Connection failed";
+    }
+    else
+    {
+        emit gotDisconnected();
+        qDebug() << "Connection ended";
+    }
 }
 
 // ESLevent

--- 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)
@@ -106,6 +106,7 @@
         page->init(serverDialog->getHost());
         m_ui->tabWidget->setCurrentWidget(page);
     }
+    this->activateWindow();
 }
 void Cfsgui::closeTab(int index)
 {