aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2011-01-07 17:18:11 +0000
committerjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2011-01-07 17:18:11 +0000
commit18c1e89dad819a5e486984a4ac749f7163b535f1 (patch)
treec3e7ca40ced7d56965e7fbb143d1201692d15aca
parent01c1626129ef9b1a6f813f483e17d831335ed04b (diff)
change variable name to the same used in later branches
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@300924 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--apps/app_voicemail.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index aa2f42442..de484e960 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -5337,7 +5337,7 @@ static int notify_new_message(struct ast_channel *chan, struct ast_vm_user *vmu,
return 0;
}
-static int forward_message(struct ast_channel *chan, char *context, struct vm_state *vms, struct ast_vm_user *sender, char *fmt, int noforward, signed char record_gain)
+static int forward_message(struct ast_channel *chan, char *context, struct vm_state *vms, struct ast_vm_user *sender, char *fmt, int is_new_message, signed char record_gain)
{
#ifdef IMAP_STORAGE
int todircount=0;
@@ -5452,8 +5452,8 @@ static int forward_message(struct ast_channel *chan, char *context, struct vm_st
/* start optimistic */
valid_extensions = 1;
while (s) {
- /* Don't forward to ourselves but allow leaving a message for ourselves (noforward == 1). find_user is going to malloc since we have a NULL as first argument */
- if ((noforward == 1 || strcmp(s,sender->mailbox)) && (receiver = find_user(NULL, context, s))) {
+ /* Don't forward to ourselves but allow leaving a message for ourselves (is_new_message == 1). find_user is going to malloc since we have a NULL as first argument */
+ if ((is_new_message == 1 || strcmp(s,sender->mailbox)) && (receiver = find_user(NULL, context, s))) {
int oldmsgs;
int newmsgs;
int capacity;
@@ -5493,7 +5493,7 @@ static int forward_message(struct ast_channel *chan, char *context, struct vm_st
/* check if we're clear to proceed */
if (AST_LIST_EMPTY(&extensions) || !valid_extensions)
return res;
- if (noforward == 1) {
+ if (is_new_message == 1) {
struct leave_vm_options leave_options;
char mailbox[AST_MAX_EXTENSION * 2 + 2];
/* Make sure that context doesn't get set as a literal "(null)" (or else find_user won't find it) */