<!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][16145] </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=16145">16145</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2010-01-04 16:07:20 -0600 (Mon, 04 Jan 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Two stage renaming: Stage 2 completed.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkfscommcallcpp">freeswitch/trunk/fscomm/call.cpp</a></li>
<li><a href="#freeswitchtrunkfscommcallh">freeswitch/trunk/fscomm/call.h</a></li>
<li><a href="#freeswitchtrunkfscommconffreeswitchxml">freeswitch/trunk/fscomm/conf/freeswitch.xml</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="#freeswitchtrunkfscommmaincpp">freeswitch/trunk/fscomm/main.cpp</a></li>
<li><a href="#freeswitchtrunkfscommmainwindowcpp">freeswitch/trunk/fscomm/mainwindow.cpp</a></li>
<li><a href="#freeswitchtrunkfscommmainwindowui">freeswitch/trunk/fscomm/mainwindow.ui</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkfscommcallcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/call.cpp (16144 => 16145)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/call.cpp        2010-01-04 21:32:10 UTC (rev 16144)
+++ freeswitch/trunk/fscomm/call.cpp        2010-01-04 22:07:20 UTC (rev 16145)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-Call::Call(int call_id, QString cid_name, QString cid_number, fsphone_call_direction_t direction, QString uuid) :
</del><ins>+Call::Call(int call_id, QString cid_name, QString cid_number, fscomm_call_direction_t direction, QString uuid) :
</ins><span class="cx">         _call_id(call_id),
</span><span class="cx">         _cid_name(cid_name),
</span><span class="cx">         _cid_number(cid_number),
</span></span></pre></div>
<a id="freeswitchtrunkfscommcallh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/call.h (16144 => 16145)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/call.h        2010-01-04 21:32:10 UTC (rev 16144)
+++ freeswitch/trunk/fscomm/call.h        2010-01-04 22:07:20 UTC (rev 16145)
</span><span class="lines">@@ -34,38 +34,38 @@
</span><span class="cx"> #include &lt;fshost.h&gt;
</span><span class="cx"> 
</span><span class="cx"> typedef enum {
</span><del>-    FSPHONE_CALL_STATE_RINGING = 0,
-    FSPHONE_CALL_STATE_TRYING  = 1,
-    FSPHONE_CALL_STATE_ANSWERED = 2
-} fsphone_call_state_t;
</del><ins>+    FSCOMM_CALL_STATE_RINGING = 0,
+    FSCOMM_CALL_STATE_TRYING  = 1,
+    FSCOMM_CALL_STATE_ANSWERED = 2
+} fscomm_call_state_t;
</ins><span class="cx"> 
</span><span class="cx"> typedef enum {
</span><del>-        FSPHONE_CALL_DIRECTION_INBOUND = 0,
-        FSPHONE_CALL_DIRECTION_OUTBOUND = 1
-} fsphone_call_direction_t;
</del><ins>+        FSCOMM_CALL_DIRECTION_INBOUND = 0,
+        FSCOMM_CALL_DIRECTION_OUTBOUND = 1
+} fscomm_call_direction_t;
</ins><span class="cx"> 
</span><span class="cx"> class Call
</span><span class="cx"> {
</span><span class="cx"> public:
</span><span class="cx">     Call(void);
</span><del>-    Call(int call_id, QString cid_name, QString cid_number, fsphone_call_direction_t direction, QString uuid);
</del><ins>+    Call(int call_id, QString cid_name, QString cid_number, fscomm_call_direction_t direction, QString uuid);
</ins><span class="cx">     QString getCidName(void) { return _cid_name; }
</span><span class="cx">     QString getCidNumber(void) { return _cid_number; }
</span><span class="cx">     int getCallID(void) { return _call_id; }
</span><span class="cx">     QString getUUID(void) { return _uuid; }
</span><span class="cx">     void setbUUID(QString uuid) { _buuid = uuid; }
</span><del>-    fsphone_call_direction_t getDirection() { return _direction; }
-    fsphone_call_state_t getState() { return _state; }
-    void setState(fsphone_call_state_t state) { _state = state; }
</del><ins>+    fscomm_call_direction_t getDirection() { return _direction; }
+    fscomm_call_state_t getState() { return _state; }
+    void setState(fscomm_call_state_t state) { _state = state; }
</ins><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     int _call_id;
</span><span class="cx">     QString _cid_name;
</span><span class="cx">     QString _cid_number;
</span><del>-    fsphone_call_direction_t _direction;
</del><ins>+    fscomm_call_direction_t _direction;
</ins><span class="cx">     QString _uuid;
</span><span class="cx">     QString _buuid;
</span><del>-    fsphone_call_state_t _state;
</del><ins>+    fscomm_call_state_t _state;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> Q_DECLARE_METATYPE(Call)
</span></span></pre></div>
<a id="freeswitchtrunkfscommconffreeswitchxml"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/conf/freeswitch.xml (16144 => 16145)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/conf/freeswitch.xml        2010-01-04 21:32:10 UTC (rev 16144)
+++ freeswitch/trunk/fscomm/conf/freeswitch.xml        2010-01-04 22:07:20 UTC (rev 16145)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx">           &lt;/gateways&gt;
</span><span class="cx">           &lt;settings&gt;
</span><span class="cx">             &lt;!--&lt;param name=&quot;media-option&quot; value=&quot;bypass-media-after-att-xfer&quot;/&gt;--&gt;
</span><del>-            &lt;param name=&quot;user-agent-string&quot; value=&quot;FreeSWITCH/FSPhone&quot;/&gt;
</del><ins>+            &lt;param name=&quot;user-agent-string&quot; value=&quot;FreeSWITCH/FSComm&quot;/&gt;
</ins><span class="cx">             &lt;!-- &lt;param name=&quot;user-agent-string&quot; value=&quot;FreeSWITCH Rocks!&quot;/&gt; --&gt;
</span><span class="cx">             &lt;param name=&quot;debug&quot; value=&quot;0&quot;/&gt;
</span><span class="cx">             &lt;param name=&quot;sip-trace&quot; value=&quot;no&quot;/&gt;
</span></span></pre></div>
<a id="freeswitchtrunkfscommfshostcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/fshost.cpp (16144 => 16145)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/fshost.cpp        2010-01-04 21:32:10 UTC (rev 16144)
+++ freeswitch/trunk/fscomm/fshost.cpp        2010-01-04 22:07:20 UTC (rev 16145)
</span><span class="lines">@@ -56,21 +56,21 @@
</span><span class="cx"> 
</span><span class="cx">     /* Create directory structure for softphone with default configs */
</span><span class="cx">     QDir conf_dir = QDir(QDir::home());
</span><del>-    if (!conf_dir.exists(&quot;.fsphone&quot;))
</del><ins>+    if (!conf_dir.exists(&quot;.fscomm&quot;))
</ins><span class="cx">     {
</span><del>-        conf_dir.mkpath(&quot;.fsphone/conf/accounts&quot;);
-        conf_dir.mkpath(&quot;.fsphone/templates&quot;);
</del><ins>+        conf_dir.mkpath(&quot;.fscomm/conf/accounts&quot;);
+        conf_dir.mkpath(&quot;.fscomm/templates&quot;);
</ins><span class="cx">         QFile rootXML(&quot;:/confs/freeswitch.xml&quot;);
</span><del>-        QString dest = QString(&quot;%1/.fsphone/conf/freeswitch.xml&quot;).arg(conf_dir.absolutePath());
</del><ins>+        QString dest = QString(&quot;%1/.fscomm/conf/freeswitch.xml&quot;).arg(conf_dir.absolutePath());
</ins><span class="cx">         rootXML.copy(dest);
</span><span class="cx"> 
</span><span class="cx">         QFile defaultAccount(&quot;:/confs/example.xml&quot;);
</span><del>-        dest = QString(&quot;%1/.fsphone/conf/accounts/example.xml&quot;).arg(conf_dir.absolutePath());
</del><ins>+        dest = QString(&quot;%1/.fscomm/conf/accounts/example.xml&quot;).arg(conf_dir.absolutePath());
</ins><span class="cx">         defaultAccount.copy(dest);
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     /* Set all directories to the home user directory */
</span><del>-    if (conf_dir.cd(&quot;.fsphone&quot;))
</del><ins>+    if (conf_dir.cd(&quot;.fscomm&quot;))
</ins><span class="cx">     {
</span><span class="cx">         SWITCH_GLOBAL_dirs.conf_dir = (char *) malloc(strlen(QString(&quot;%1/conf&quot;).arg(conf_dir.absolutePath()).toAscii().constData()) + 1);
</span><span class="cx">         if (!SWITCH_GLOBAL_dirs.conf_dir) {
</span><span class="lines">@@ -152,14 +152,14 @@
</span><span class="cx">     switch_status_t status = SWITCH_STATUS_SUCCESS;
</span><span class="cx">     Call * call = _active_calls.value(uuid);
</span><span class="cx">     /* Inbound call */
</span><del>-    if (call-&gt;getDirection() == FSPHONE_CALL_DIRECTION_INBOUND)
</del><ins>+    if (call-&gt;getDirection() == FSCOMM_CALL_DIRECTION_INBOUND)
</ins><span class="cx">     {
</span><span class="cx">         switch(event-&gt;event_id) {
</span><span class="cx">         case SWITCH_EVENT_CHANNEL_ANSWER:
</span><span class="cx">             {
</span><span class="cx">                 call-&gt;setbUUID(switch_event_get_header_nil(event, &quot;Other-Leg-Unique-ID&quot;));
</span><span class="cx">                 _bleg_uuids.insert(switch_event_get_header_nil(event, &quot;Other-Leg-Unique-ID&quot;), uuid);
</span><del>-                call-&gt;setState(FSPHONE_CALL_STATE_ANSWERED);
</del><ins>+                call-&gt;setState(FSCOMM_CALL_STATE_ANSWERED);
</ins><span class="cx">                 emit answered(uuid);
</span><span class="cx">                 break;
</span><span class="cx">             }
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx">             }
</span><span class="cx">         case SWITCH_EVENT_CHANNEL_HANGUP_COMPLETE:
</span><span class="cx">             {
</span><del>-                if (call-&gt;getState() == FSPHONE_CALL_STATE_TRYING)
</del><ins>+                if (call-&gt;getState() == FSCOMM_CALL_STATE_TRYING)
</ins><span class="cx">                 {
</span><span class="cx">                     emit callFailed(uuid);
</span><span class="cx">                     _active_calls.take(uuid);
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx">     switch_status_t status = SWITCH_STATUS_SUCCESS;
</span><span class="cx">     Call * call = _active_calls.value(uuid);
</span><span class="cx">     /* Inbound call */
</span><del>-    if (call-&gt;getDirection() == FSPHONE_CALL_DIRECTION_INBOUND)
</del><ins>+    if (call-&gt;getDirection() == FSCOMM_CALL_DIRECTION_INBOUND)
</ins><span class="cx">     {
</span><span class="cx">         qDebug() &lt;&lt; &quot; Inbound call&quot;;
</span><span class="cx">     }
</span><span class="lines">@@ -237,7 +237,7 @@
</span><span class="cx">             {
</span><span class="cx">                 if (QString(switch_event_get_header_nil(event, &quot;Answer-State&quot;)) == &quot;early&quot;)
</span><span class="cx">                 {
</span><del>-                    call-&gt;setState(FSPHONE_CALL_STATE_RINGING);
</del><ins>+                    call-&gt;setState(FSCOMM_CALL_STATE_RINGING);
</ins><span class="cx">                     emit ringing(uuid);
</span><span class="cx">                 }
</span><span class="cx">                 //printEventHeaders(event);
</span><span class="lines">@@ -280,20 +280,20 @@
</span><span class="cx">                 Call *call = new Call(atoi(switch_event_get_header_nil(event, &quot;call_id&quot;)),
</span><span class="cx">                                       switch_event_get_header_nil(event, &quot;Caller-Caller-ID-Name&quot;),
</span><span class="cx">                                       switch_event_get_header_nil(event, &quot;Caller-Caller-ID-Number&quot;),
</span><del>-                                      FSPHONE_CALL_DIRECTION_INBOUND,
</del><ins>+                                      FSCOMM_CALL_DIRECTION_INBOUND,
</ins><span class="cx">                                       uuid);
</span><span class="cx">                 _active_calls.insert(uuid, call);
</span><del>-                call-&gt;setState(FSPHONE_CALL_STATE_RINGING);
</del><ins>+                call-&gt;setState(FSCOMM_CALL_STATE_RINGING);
</ins><span class="cx">                 emit ringing(uuid);
</span><span class="cx">             }
</span><span class="cx">             else if (strcmp(event-&gt;subclass_name, &quot;portaudio::makecall&quot;) == 0)
</span><span class="cx">             {
</span><span class="cx">                 Call *call = new Call(atoi(switch_event_get_header_nil(event, &quot;call_id&quot;)),NULL,
</span><span class="cx">                                       switch_event_get_header_nil(event, &quot;Caller-Destination-Number&quot;),
</span><del>-                                      FSPHONE_CALL_DIRECTION_OUTBOUND,
</del><ins>+                                      FSCOMM_CALL_DIRECTION_OUTBOUND,
</ins><span class="cx">                                       uuid);
</span><span class="cx">                 _active_calls.insert(uuid, call);
</span><del>-                call-&gt;setState(FSPHONE_CALL_STATE_TRYING);
</del><ins>+                call-&gt;setState(FSCOMM_CALL_STATE_TRYING);
</ins><span class="cx">                 emit newOutgoingCall(uuid);
</span><span class="cx">             }
</span><span class="cx">             else if (strcmp(event-&gt;subclass_name, &quot;sofia::gateway_state&quot;) == 0)
</span><span class="lines">@@ -301,23 +301,23 @@
</span><span class="cx">                 QString state = switch_event_get_header_nil(event, &quot;State&quot;);
</span><span class="cx">                 QString gw = switch_event_get_header_nil(event, &quot;Gateway&quot;);
</span><span class="cx">                 if (state == &quot;TRYING&quot;)
</span><del>-                    emit gwStateChange(gw, FSPHONE_GW_STATE_TRYING);
</del><ins>+                    emit gwStateChange(gw, FSCOMM_GW_STATE_TRYING);
</ins><span class="cx">                 else if (state == &quot;REGISTER&quot;)
</span><del>-                    emit gwStateChange(gw, FSPHONE_GW_STATE_REGISTER);
</del><ins>+                    emit gwStateChange(gw, FSCOMM_GW_STATE_REGISTER);
</ins><span class="cx">                 else if (state == &quot;REGED&quot;)
</span><del>-                    emit gwStateChange(gw, FSPHONE_GW_STATE_REGED);
</del><ins>+                    emit gwStateChange(gw, FSCOMM_GW_STATE_REGED);
</ins><span class="cx">                 else if (state == &quot;UNREGED&quot;)
</span><del>-                    emit gwStateChange(gw, FSPHONE_GW_STATE_UNREGED);
</del><ins>+                    emit gwStateChange(gw, FSCOMM_GW_STATE_UNREGED);
</ins><span class="cx">                 else if (state == &quot;UNREGISTER&quot;)
</span><del>-                    emit gwStateChange(gw, FSPHONE_GW_STATE_UNREGISTER);
</del><ins>+                    emit gwStateChange(gw, FSCOMM_GW_STATE_UNREGISTER);
</ins><span class="cx">                 else if (state ==&quot;FAILED&quot;)
</span><del>-                    emit gwStateChange(gw, FSPHONE_GW_STATE_FAILED);
</del><ins>+                    emit gwStateChange(gw, FSCOMM_GW_STATE_FAILED);
</ins><span class="cx">                 else if (state == &quot;FAIL_WAIT&quot;)
</span><del>-                    emit gwStateChange(gw, FSPHONE_GW_STATE_FAIL_WAIT);
</del><ins>+                    emit gwStateChange(gw, FSCOMM_GW_STATE_FAIL_WAIT);
</ins><span class="cx">                 else if (state == &quot;EXPIRED&quot;)
</span><del>-                    emit gwStateChange(gw, FSPHONE_GW_STATE_EXPIRED);
</del><ins>+                    emit gwStateChange(gw, FSCOMM_GW_STATE_EXPIRED);
</ins><span class="cx">                 else if (state == &quot;NOREG&quot;)
</span><del>-                    emit gwStateChange(gw, FSPHONE_GW_STATE_NOREG);
</del><ins>+                    emit gwStateChange(gw, FSCOMM_GW_STATE_NOREG);
</ins><span class="cx">             }
</span><span class="cx">             else
</span><span class="cx">             {
</span></span></pre></div>
<a id="freeswitchtrunkfscommfshosth"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/fshost.h (16144 => 16145)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/fshost.h        2010-01-04 21:32:10 UTC (rev 16144)
+++ freeswitch/trunk/fscomm/fshost.h        2010-01-04 22:07:20 UTC (rev 16145)
</span><span class="lines">@@ -35,17 +35,17 @@
</span><span class="cx"> 
</span><span class="cx"> class Call;
</span><span class="cx"> 
</span><del>-#define FSPHONE_GW_STATE_TRYING 0
-#define FSPHONE_GW_STATE_REGISTER 1
-#define FSPHONE_GW_STATE_REGED 2
-#define FSPHONE_GW_STATE_UNREGED 3
-#define FSPHONE_GW_STATE_UNREGISTER 4
-#define FSPHONE_GW_STATE_FAILED 5
-#define FSPHONE_GW_STATE_FAIL_WAIT 6
-#define FSPHONE_GW_STATE_EXPIRED 7
-#define FSPHONE_GW_STATE_NOREG 8
</del><ins>+#define FSCOMM_GW_STATE_TRYING 0
+#define FSCOMM_GW_STATE_REGISTER 1
+#define FSCOMM_GW_STATE_REGED 2
+#define FSCOMM_GW_STATE_UNREGED 3
+#define FSCOMM_GW_STATE_UNREGISTER 4
+#define FSCOMM_GW_STATE_FAILED 5
+#define FSCOMM_GW_STATE_FAIL_WAIT 6
+#define FSCOMM_GW_STATE_EXPIRED 7
+#define FSCOMM_GW_STATE_NOREG 8
</ins><span class="cx"> 
</span><del>-static const char *fsphone_gw_state_names[] = {
</del><ins>+static const char *fscomm_gw_state_names[] = {
</ins><span class="cx">     &quot;TRYING&quot;,
</span><span class="cx">     &quot;REGISTER&quot;,
</span><span class="cx">     &quot;REGED&quot;,
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx">     switch_status_t sendCmd(const char *cmd, const char *args, QString *res);
</span><span class="cx">     void generalEventHandler(switch_event_t *event);
</span><span class="cx">     Call * getCallByUUID(QString uuid) { return _active_calls.value(uuid, NULL); }
</span><del>-    QString getGwStateName(int id) { return fsphone_gw_state_names[id]; }
</del><ins>+    QString getGwStateName(int id) { return fscomm_gw_state_names[id]; }
</ins><span class="cx"> 
</span><span class="cx"> protected:
</span><span class="cx">     void run(void);
</span></span></pre></div>
<a id="freeswitchtrunkfscommmaincpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/main.cpp (16144 => 16145)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/main.cpp        2010-01-04 21:32:10 UTC (rev 16144)
+++ freeswitch/trunk/fscomm/main.cpp        2010-01-04 22:07:20 UTC (rev 16145)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">     QApplication a(argc, argv);
</span><span class="cx">     QCoreApplication::setOrganizationName(&quot;FreeSWITCH&quot;);
</span><span class="cx">     QCoreApplication::setOrganizationDomain(&quot;freeswitch.org&quot;);
</span><del>-    QCoreApplication::setApplicationName(&quot;FSPhone&quot;);
</del><ins>+    QCoreApplication::setApplicationName(&quot;FSComm&quot;);
</ins><span class="cx"> 
</span><span class="cx">     QPixmap image(&quot;:/images/splash.png&quot;);
</span><span class="cx">     QSplashScreen *splash = new QSplashScreen(image);
</span></span></pre></div>
<a id="freeswitchtrunkfscommmainwindowcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/mainwindow.cpp (16144 => 16145)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/mainwindow.cpp        2010-01-04 21:32:10 UTC (rev 16144)
+++ freeswitch/trunk/fscomm/mainwindow.cpp        2010-01-04 22:07:20 UTC (rev 16145)
</span><span class="lines">@@ -257,7 +257,7 @@
</span><span class="cx">         QListWidgetItem *item = ui-&gt;listCalls-&gt;item(i);
</span><span class="cx">         if (item-&gt;data(Qt::UserRole).toString() == uuid)
</span><span class="cx">         {
</span><del>-            if (call-&gt;getDirection() == FSPHONE_CALL_DIRECTION_INBOUND)
</del><ins>+            if (call-&gt;getDirection() == FSCOMM_CALL_DIRECTION_INBOUND)
</ins><span class="cx">             {
</span><span class="cx">                 item-&gt;setText(tr(&quot;%1 (%2) - Active&quot;).arg(call-&gt;getCidName(), call-&gt;getCidNumber()));
</span><span class="cx">                 break;
</span></span></pre></div>
<a id="freeswitchtrunkfscommmainwindowui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/mainwindow.ui (16144 => 16145)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/mainwindow.ui        2010-01-04 21:32:10 UTC (rev 16144)
+++ freeswitch/trunk/fscomm/mainwindow.ui        2010-01-04 22:07:20 UTC (rev 16145)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx">    &lt;/rect&gt;
</span><span class="cx">   &lt;/property&gt;
</span><span class="cx">   &lt;property name=&quot;windowTitle&quot;&gt;
</span><del>-   &lt;string&gt;FSPhone - A FreeSWITCH softphone&lt;/string&gt;
</del><ins>+   &lt;string&gt;FSComm - A FreeSWITCH Communicator&lt;/string&gt;
</ins><span class="cx">   &lt;/property&gt;
</span><span class="cx">   &lt;widget class=&quot;QWidget&quot; name=&quot;centralWidget&quot;&gt;
</span><span class="cx">    &lt;layout class=&quot;QHBoxLayout&quot; name=&quot;horizontalLayout_4&quot;&gt;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>

</body>
</html>