[svn-commits] branch crichter/0.3.0 - r8053 in
/team/crichter/0.3.0: ./ apps/ channels/ con...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Fri Jan 13 05:03:39 CST 2006
Author: crichter
Date: Fri Jan 13 05:03:35 2006
New Revision: 8053
URL: http://svn.digium.com/view/asterisk?rev=8053&view=rev
Log:
Merged revisions 7870-7871,7898-7900,7963,7973-7975,7977-8051 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r7870 | russell | 2006-01-09 05:52:16 +0100 (Mo, 09 Jan 2006) | 2 lines
backport fix for unnecessary unlock (issue #6171)
........
r7871 | russell | 2006-01-09 06:11:44 +0100 (Mo, 09 Jan 2006) | 2 lines
fix seg fault when using greek syntax in VoicemMailMain (issue #6142)
........
r7898 | kpfleming | 2006-01-09 19:08:07 +0100 (Mo, 09 Jan 2006) | 2 lines
fix breakage introduced in revision 7871
........
r7899 | kpfleming | 2006-01-09 19:09:53 +0100 (Mo, 09 Jan 2006) | 2 lines
backport fix from revision 7856 of trunk
........
r7900 | kpfleming | 2006-01-09 19:11:23 +0100 (Mo, 09 Jan 2006) | 2 lines
commit user/group-related changes from trunk
........
r7963 | mogorman | 2006-01-11 05:38:07 +0100 (Mi, 11 Jan 2006) | 2 lines
Minor typo refrenced in 6191
........
........
........
........
........
........
........
........
........
........
........
........
........
r7986 | russell | 2006-01-11 20:08:53 +0100 (Mi, 11 Jan 2006) | 2 lines
move variable to correct scope (issue #6197)
........
........
........
........
........
........
........
........
........
........
........
........
........
r7999 | tilghman | 2006-01-12 07:14:22 +0100 (Do, 12 Jan 2006) | 2 lines
Bug 6211 - Add option deletevoicemail as equivalent to option delete for Realtime
........
........
........
........
........
........
........
........
........
........
........
........
........
........
........
........
........
........
........
........
........
........
........
........
........
........
........
........
........
........
........
........
........
........
........
........
........
........
........
........
........
........
........
........
........
........
........
........
r8047 | russell | 2006-01-13 07:07:39 +0100 (Fr, 13 Jan 2006) | 2 lines
fix spelling errors (issue #6227)
........
........
........
........
........
Modified:
team/crichter/0.3.0/ (props changed)
team/crichter/0.3.0/apps/app_voicemail.c
team/crichter/0.3.0/channel.c
team/crichter/0.3.0/channels/chan_agent.c
team/crichter/0.3.0/configs/voicemail.conf.sample
Propchange: team/crichter/0.3.0/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: team/crichter/0.3.0/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/crichter/0.3.0/apps/app_voicemail.c?rev=8053&r1=8052&r2=8053&view=diff
==============================================================================
--- team/crichter/0.3.0/apps/app_voicemail.c (original)
+++ team/crichter/0.3.0/apps/app_voicemail.c Fri Jan 13 05:03:35 2006
@@ -447,7 +447,7 @@
ast_copy_string(vmu->language, value, sizeof(vmu->language));
} else if (!strcasecmp(var, "tz")) {
ast_copy_string(vmu->zonetag, value, sizeof(vmu->zonetag));
- } else if (!strcasecmp(var, "delete")) {
+ } else if (!strcasecmp(var, "delete") || !strcasecmp(var, "deletevoicemail")) {
ast_set2_flag(vmu, ast_true(value), VM_DELETE);
} else if (!strcasecmp(var, "saycid")){
ast_set2_flag(vmu, ast_true(value), VM_SAYCID);
@@ -2589,8 +2589,8 @@
}
}
if (ast_fileexists(fn, NULL, NULL)) {
+ STORE(dir, vmu->mailbox, vmu->context, msgnum);
notify_new_message(chan, vmu, msgnum, duration, fmt, chan->cid.cid_num, chan->cid.cid_name);
- STORE(dir, vmu->mailbox, vmu->context, msgnum);
DISPOSE(dir, msgnum);
}
pbx_builtin_setvar_helper(chan, "VMSTATUS", "SUCCESS");
Modified: team/crichter/0.3.0/channel.c
URL: http://svn.digium.com/view/asterisk/team/crichter/0.3.0/channel.c?rev=8053&r1=8052&r2=8053&view=diff
==============================================================================
--- team/crichter/0.3.0/channel.c (original)
+++ team/crichter/0.3.0/channel.c Fri Jan 13 05:03:35 2006
@@ -561,7 +561,7 @@
tmp->fds[AST_MAX_FDS-1] = tmp->alertpipe[0];
/* And timing pipe */
tmp->fds[AST_MAX_FDS-2] = tmp->timingfd;
- strcpy(tmp->name, "**Unkown**");
+ strcpy(tmp->name, "**Unknown**");
/* Initial state */
tmp->_state = AST_STATE_DOWN;
tmp->streamid = -1;
Modified: team/crichter/0.3.0/channels/chan_agent.c
URL: http://svn.digium.com/view/asterisk/team/crichter/0.3.0/channels/chan_agent.c?rev=8053&r1=8052&r2=8053&view=diff
==============================================================================
--- team/crichter/0.3.0/channels/chan_agent.c (original)
+++ team/crichter/0.3.0/channels/chan_agent.c Fri Jan 13 05:03:35 2006
@@ -105,7 +105,7 @@
static const char descrip3[] =
" AgentMonitorOutgoing([options]):\n"
"Tries to figure out the id of the agent who is placing outgoing call based on\n"
-"comparision of the callerid of the current interface and the global variable \n"
+"comparison of the callerid of the current interface and the global variable \n"
"placed by the AgentCallbackLogin application. That's why it should be used only\n"
"with the AgentCallbackLogin app. Uses the monitoring functions in chan_agent \n"
"instead of Monitor application. That have to be configured in the agents.conf file.\n"
@@ -147,7 +147,7 @@
/** Persistent Agents astdb family */
static const char pa_family[] = "/Agents";
-/** The maximum lengh of each persistent member agent database entry */
+/** The maximum length of each persistent member agent database entry */
#define PA_MAX_LEN 2048
/** queues.conf [general] option */
static int persistent_agents = 0;
@@ -1043,7 +1043,7 @@
urlprefix[0] = '\0';
savecallsin[0] = '\0';
- /* Read in [general] section for persistance */
+ /* Read in [general] section for persistence */
if ((general_val = ast_variable_retrieve(cfg, "general", "persistentagents")))
persistent_agents = ast_true(general_val);
@@ -1687,6 +1687,7 @@
char agent_goodbye[AST_MAX_FILENAME_LEN];
int update_cdr = updatecdr;
char *filename = "agent-loginok";
+ char tmpchan[AST_MAX_BUF] = "";
LOCAL_USER_ADD(u);
@@ -1782,7 +1783,7 @@
gettimeofday(&p->lastdisc, NULL);
p->lastdisc.tv_sec++;
- /* Set Channel Specific Agent Overides */
+ /* Set Channel Specific Agent Overrides */
if (pbx_builtin_getvar_helper(chan, "AGENTACKCALL") && strlen(pbx_builtin_getvar_helper(chan, "AGENTACKCALL"))) {
if (!strcasecmp(pbx_builtin_getvar_helper(chan, "AGENTACKCALL"), "always"))
p->ackcall = 2;
@@ -1810,14 +1811,13 @@
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Saw variable AGENTWRAPUPTIME=%s, setting wrapuptime to: %d for Agent '%s'.\n",tmpoptions,p->wrapuptime,p->agent);
}
- /* End Channel Specific Agent Overides */
+ /* End Channel Specific Agent Overrides */
if (!p->chan) {
char last_loginchan[80] = "";
long logintime;
snprintf(agent, sizeof(agent), "Agent/%s", p->agent);
if (callbackmode) {
- char tmpchan[AST_MAX_BUF] = "";
int pos = 0;
/* Retrieve login chan */
for (;;) {
@@ -2353,7 +2353,7 @@
}
ast_mutex_unlock(&agentlock);
if (db_tree) {
- ast_log(LOG_NOTICE, "Agents sucessfully reloaded from database.\n");
+ ast_log(LOG_NOTICE, "Agents successfully reloaded from database.\n");
ast_db_freetree(db_tree);
}
}
@@ -2494,7 +2494,7 @@
/**
* Initialize the Agents module.
- * This funcion is being called by Asterisk when loading the module. Among other thing it registers applications, cli commands and reads the cofiguration file.
+ * This function is being called by Asterisk when loading the module. Among other thing it registers applications, cli commands and reads the cofiguration file.
*
* @returns int Always 0.
*/
Modified: team/crichter/0.3.0/configs/voicemail.conf.sample
URL: http://svn.digium.com/view/asterisk/team/crichter/0.3.0/configs/voicemail.conf.sample?rev=8053&r1=8052&r2=8053&view=diff
==============================================================================
--- team/crichter/0.3.0/configs/voicemail.conf.sample (original)
+++ team/crichter/0.3.0/configs/voicemail.conf.sample Fri Jan 13 05:03:35 2006
@@ -172,6 +172,7 @@
; This does NOT affect option 3,3 from the advanced options menu
; delete=yes ; After notification, the voicemail is deleted from the server. [per-mailbox only]
; This is intended for use with users who wish to receive their voicemail ONLY by email.
+ ; Note: deletevoicemail is provided as an equivalent option for Realtime configuration.
; nextaftercmd=yes ; Skips to the next message after hitting 7 or 9 to delete/save current message.
; [global option only at this time]
; forcename=yes ; Forces a new user to record their name. A new user is
More information about the svn-commits
mailing list