Revision
17270
Author
anthm
Date
2010-04-08 11:51:37 -0500 (Thu, 08 Apr 2010)

Log Message

Merge branch 'master' of git.freeswitch.org:freeswitch

Modified Paths

Diff

Modified: freeswitch/trunk/fscomm/call.cpp ( => )



Modified: freeswitch/trunk/fscomm/call.h
===================================================================

Modified: freeswitch/trunk/fscomm/channel.cpp ( => )



Modified: freeswitch/trunk/fscomm/channel.h
===================================================================

Modified: freeswitch/trunk/fscomm/debugtools/statedebugdialog.cpp ( => )



Modified: freeswitch/trunk/fscomm/fshost.cpp
===================================================================

Modified: freeswitch/trunk/fscomm/mainwindow.cpp (17269 => 17270)


--- freeswitch/trunk/fscomm/mainwindow.cpp	2010-04-08 00:09:16 UTC (rev 17269)
+++ freeswitch/trunk/fscomm/mainwindow.cpp	2010-04-08 16:51:37 UTC (rev 17270)
@@ -179,26 +179,10 @@
 
 }
 
-void MainWindow::applyPreprocessors(QStringList cmds)
-{
-    if (g_FSHost.getCurrentActiveCall().isNull()) return;
-    QString uuid = g_FSHost.getCurrentActiveCall().data()->getUuid();
-    foreach(QString cmd, cmds)
-    {
-        switch_stream_handle_t stream = { 0 };
-        SWITCH_STANDARD_STREAM(stream);
-        switch_api_execute("uuid_preprocess", QString("%1 %2").arg(uuid, cmd).toAscii().data(), NULL, &stream);
-        switch_safe_free(stream.data);
-    }
-}
-
 void MainWindow::prefTriggered()
 {
     if (!preferences)
-    {
         preferences = new PrefDialog();
-        connect(preferences, SIGNAL(preprocessorsApplied(QStringList)), this, SLOT(applyPreprocessors(QStringList)));
-    }
 
     preferences->raise();
     preferences->show();

Modified: freeswitch/trunk/fscomm/mainwindow.h (17269 => 17270)


--- freeswitch/trunk/fscomm/mainwindow.h	2010-04-08 00:09:16 UTC (rev 17269)
+++ freeswitch/trunk/fscomm/mainwindow.h	2010-04-08 16:51:37 UTC (rev 17270)
@@ -85,7 +85,6 @@
     void updateCallTimers();
     void debugConsoleTriggered();
     void debugEventsTriggered();
-    void applyPreprocessors(QStringList);
 
 private:
     Ui::MainWindow *ui;

Modified: freeswitch/trunk/fscomm/mainwindow.ui ( => )



Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c
===================================================================

Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/sangoma_boost_interface.h ( => )



Modified: freeswitch/trunk/libs/openzap/src/zap_threadmutex.c
===================================================================

Modified: freeswitch/trunk/src/include/switch_channel.h ( => )



Modified: freeswitch/trunk/src/switch_channel.c
===================================================================