diff --git a/fscomm/FSComm.pro b/fscomm/FSComm.pro
index 14df1e4c1a..1c14a78fa1 100644
--- a/fscomm/FSComm.pro
+++ b/fscomm/FSComm.pro
@@ -39,4 +39,5 @@ FORMS += mainwindow.ui \
RESOURCES += resources.qrc
OTHER_FILES += conf/portaudio.conf.xml \
conf/event_socket.conf.xml \
- conf/freeswitch.xml
+ conf/freeswitch.xml \
+ conf/sofia.conf.xml
diff --git a/fscomm/conf/freeswitch.xml b/fscomm/conf/freeswitch.xml
index b49804dfe5..a1bbbc5681 100644
--- a/fscomm/conf/freeswitch.xml
+++ b/fscomm/conf/freeswitch.xml
@@ -1,268 +1,266 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
- "${caller_id_name}","${caller_id_number}","${destination_number}","${context}","${start_stamp}","${answer_stamp}","${end_stamp}","${duration}","${billsec}","${hangup_cause}","${uuid}","${bleg_uuid}","${accountcode}","${read_codec}","${write_codec}"
-
-
+
+
+
+
+
+
+
+
+ "${caller_id_name}","${caller_id_number}","${destination_number}","${context}","${start_stamp}","${answer_stamp}","${end_stamp}","${duration}","${billsec}","${hangup_cause}","${uuid}","${bleg_uuid}","${accountcode}","${read_codec}","${write_codec}"
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/fscomm/conf/sofia.conf.xml b/fscomm/conf/sofia.conf.xml
new file mode 100644
index 0000000000..ad9a3944f8
--- /dev/null
+++ b/fscomm/conf/sofia.conf.xml
@@ -0,0 +1,129 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/fscomm/prefdialog.ui b/fscomm/prefdialog.ui
index 63d83ea4c2..d4330dc7f4 100644
--- a/fscomm/prefdialog.ui
+++ b/fscomm/prefdialog.ui
@@ -6,14 +6,14 @@
0
0
- 711
- 437
+ 752
+ 496
Preferences
-
+
-
@@ -55,6 +55,15 @@
QListView::IconMode
+
-
+
+ General
+
+
+
+ :/images/pref_general.jpg:/images/pref_general.jpg
+
+
-
Sofia
@@ -73,15 +82,6 @@
:/images/pref_audio.gif:/images/pref_audio.gif
- -
-
- General
-
-
-
- :/images/pref_general.jpg:/images/pref_general.jpg
-
-
-
@@ -89,84 +89,181 @@
1
-
-
+
+
-
-
+
- Global Settings
+ User Information
-
+
-
-
+
- log-level
+ CallerID Name:
-
-
+
-
-
+
- auto-restart
+ CallerID Number:
-
-
-
- -
-
-
- debug-presence
-
-
-
- -
-
+
+
+
+
+
-
-
-
- Softphone Profile
+
+
+ 1
-
-
-
-
-
- user-agent-string
-
-
-
- -
-
-
- -
-
-
- debug
-
-
-
- -
-
-
- -
-
-
- sip-trace
-
-
-
- -
-
-
-
+
+
+ General
+
+
+ -
+
+
+ Global Settings
+
+
+
-
+
+
+ log-level
+
+
+
+ -
+
+
+ -
+
+
+ auto-restart
+
+
+
+ -
+
+
-
+
+ true
+
+
+ -
+
+ false
+
+
+
+
+ -
+
+
+ debug-presence
+
+
+
+ -
+
+
+ -
+
+
+ rewrite-multicasted-fs-path
+
+
+
+ -
+
+
-
+
+ false
+
+
+ -
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+ Profiles
+
+
+ -
+
+
+ Softphone Profile
+
+
+
-
+
+
+ user-agent-string
+
+
+
+ -
+
+
+ -
+
+
+ debug
+
+
+
+ -
+
+
+ -
+
+
+ sip-trace
+
+
+
+ -
+
+
-
+
+ false
+
+
+ -
+
+ true
+
+
+
+
+
+
+
+
+
@@ -327,39 +424,6 @@
-
-
- -
-
-
- User Information
-
-
-
-
-
-
- CallerID Name:
-
-
-
- -
-
-
- -
-
-
- CallerID Number:
-
-
-
- -
-
-
-
-
-
-
-
-