more cleanup

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9953 d0543943-73ff-0310-b7d9-9358b9ac24b2

conf/directory/default/default.xml

@@ -3,9 +3,8 @@
     <variables>
       <!--all variables here will be set on all inbound calls that originate from this user -->
       <!-- set these to take advantage of a dialplan localized to this user -->
-      <variable name="numbering_plan" value="US"/>
-      <variable name="default_gateway" value="asterlink.com"/>
-      <variable name="default_areacode" value="918"/>
+      <variable name="numbering_plan" value="$${default_country}"/>
+      <variable name="default_areacode" value="$${default_areacode}"/>
     </variables>
   </user>
 </include>

conf/vars.xml

@@ -109,6 +109,7 @@
   <X-PRE-PROCESS cmd="set" data="call_debug=false"/>
   <X-PRE-PROCESS cmd="set" data="console_loglevel=info"/>
   <X-PRE-PROCESS cmd="set" data="default_areacode=918"/>
+  <X-PRE-PROCESS cmd="set" data="default_country=US"/>
 
   <X-PRE-PROCESS cmd="set" data="uk-ring=%(400,200,400,450);%(400,2200,400,450)"/>
   <X-PRE-PROCESS cmd="set" data="us-ring=%(2000, 4000, 440.0, 480.0)"/>