<!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][16644] </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=16644">16644</a></dd>
<dt>Author</dt> <dd>brian</dd>
<dt>Date</dt> <dd>2010-02-15 11:40:13 -0600 (Mon, 15 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>fix vm to inherit params from domain/group</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_voicemailmod_voicemailc">freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_xmlc">freeswitch/trunk/src/switch_xml.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodapplicationsmod_voicemailmod_voicemailc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (16643 => 16644)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c 2010-02-15 17:11:14 UTC (rev 16643)
+++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c 2010-02-15 17:40:13 UTC (rev 16644)
</span><span class="lines">@@ -2821,7 +2821,7 @@
</span><span class="cx"> const char *read_id = NULL;
</span><span class="cx"> const char *caller_id_name = NULL;
</span><span class="cx"> const char *caller_id_number = NULL;
</span><del>- switch_xml_t x_domain = NULL, x_domain_root = NULL, x_user = NULL, x_params = NULL, x_param = NULL;
</del><ins>+ switch_xml_t x_user = NULL, x_params = NULL, x_param = NULL;
</ins><span class="cx"> switch_event_t *vars = NULL;
</span><span class="cx"> const char *vm_cc = NULL, *vtmp, *vm_ext = NULL;
</span><span class="cx"> int disk_quota = 0;
</span><span class="lines">@@ -2845,22 +2845,15 @@
</span><span class="cx"> int ok = 1;
</span><span class="cx"> switch_event_t *locate_params = NULL;
</span><span class="cx"> const char *email_addr = NULL;
</span><del>- char *x;
</del><ins>+
</ins><span class="cx">
</span><del>-
</del><span class="cx"> switch_event_create(&locate_params, SWITCH_EVENT_REQUEST_PARAMS);
</span><span class="cx"> switch_assert(locate_params);
</span><span class="cx">
</span><del>- if (switch_xml_locate_user("id", id, domain_name, switch_channel_get_variable(channel, "network_addr"),
- &x_domain_root, &x_domain, &x_user, NULL, locate_params) == SWITCH_STATUS_SUCCESS) {
</del><ins>+ if (switch_xml_locate_user_merged("id", id, domain_name, switch_channel_get_variable(channel, "network_addr"),
+ &x_user, locate_params) == SWITCH_STATUS_SUCCESS) {
</ins><span class="cx"> id = switch_core_session_strdup(session, switch_xml_attr(x_user, "id"));
</span><span class="cx">
</span><del>- x = switch_xml_toxml(x_user, SWITCH_FALSE);
- x_user = switch_xml_parse_str_dynamic(x, SWITCH_FALSE);
- x_domain = NULL;
- switch_xml_free(x_domain_root);
- x_domain_root = NULL;
-
</del><span class="cx"> if ((x_params = switch_xml_child(x_user, "params"))) {
</span><span class="cx"> for (x_param = switch_xml_child(x_params, "param"); x_param; x_param = x_param->next) {
</span><span class="cx"> const char *var = switch_xml_attr_soft(x_param, "name");
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_xmlc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_xml.c (16643 => 16644)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_xml.c 2010-02-15 17:11:14 UTC (rev 16643)
+++ freeswitch/trunk/src/switch_xml.c 2010-02-15 17:40:13 UTC (rev 16644)
</span><span class="lines">@@ -1781,7 +1781,8 @@
</span><span class="cx">
</span><span class="cx"> if (go) {
</span><span class="cx"> iitag = switch_xml_add_child_d(itag, tag_name, 0);
</span><del>- switch_xml_set_attr_d(iitag, var, val);
</del><ins>+ switch_xml_set_attr_d(iitag, "name", var);
+ switch_xml_set_attr_d(iitag, "value", val);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1808,6 +1809,7 @@
</span><span class="cx"> x_user_dup = switch_xml_dup(x_user);
</span><span class="cx"> switch_xml_merge_user(x_user_dup, domain, group);
</span><span class="cx"> *user = x_user_dup;
</span><ins>+ switch_xml_free(xml);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return status;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>