From: Automerge script <automerge@asterisk.org>
Date: Fri, 7 Sep 2012 22:25:26 +0000 (+0000)
Subject: Merged revisions 372621,372625,372629 via svnmerge from
X-Git-Tag: 10.9.0-digiumphones-rc1~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe4486d684b031da1f58a13647f2109304a28119;p=thirdparty%2Fasterisk.git

Merged revisions 372621,372625,372629 via svnmerge from
file:///srv/subversion/repos/asterisk/branches/10

................
  r372621 | rmudgett | 2012-09-07 16:24:39 -0500 (Fri, 07 Sep 2012) | 18 lines

  Fix VoicemailUserEntry event headers ServerEmail and MailCommand reported values.

  The AMI action VoicemailUsersList VoicemailUserEntry event headers
  ServerEmail and MailCommand did not report the global values if they were
  not overridden.  The VoicemailUserEntry event header ServerEmail was not
  populated with the global value if the voicemail user did not override it.
  The VoicemailUserEntry event header MailCommand was never populated with a
  value.

  * Removed unused struct ast_vm_user member mailcmd[].

  (closes issue AST-973)
  Reported by: John Bigelow
  Tested by: rmudgett
  ........

  Merged revisions 372620 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................
  r372625 | rmudgett | 2012-09-07 16:49:16 -0500 (Fri, 07 Sep 2012) | 10 lines

  Fix exception path typo in app_queue.c try_calling().

  (closes issue ASTERISK-20380)
  Reported by: Jeremy Pepper
  Patches:
        fix-local-channel-locking.patch (license #6350) patch uploaded by Jeremy Pepper
  ........

  Merged revisions 372624 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................
  r372629 | rmudgett | 2012-09-07 17:07:59 -0500 (Fri, 07 Sep 2012) | 8 lines

  Remove annoying unconditional debug message from INC/DEC functions.

  (closes issue AST-1001)
  Reported by: Guenther Kelleter
  ........

  Merged revisions 372628 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@372654 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_queue.c b/apps/app_queue.c
index e4849ddf8c..f043ad0d42 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -4635,7 +4635,7 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
 				callattempt_free(tmp);
 				ao2_ref(cur, -1);
 				ao2_iterator_destroy(&memi);
-				ao2_unlock(&qe->parent);
+				ao2_unlock(qe->parent);
 				goto out;
 			}
 			datastore->data = dialed_interfaces;
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 0581176edd..76e05a02c6 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -691,7 +691,6 @@ struct ast_vm_user {
 	char *emailbody;                 /*!< E-mail body */
 	char pager[80];                  /*!< E-mail address to pager (no attachment) */
 	char serveremail[80];            /*!< From: Mail address */
-	char mailcmd[160];               /*!< Configurable mail command */
 	char language[MAX_LANGUAGE];     /*!< Config: Language setting */
 	char zonetag[80];                /*!< Time zone */
 	char locale[20];                 /*!< The locale (for presentation of date/time) */
@@ -11839,7 +11838,6 @@ static struct ast_cli_entry cli_voicemail[] = {
 		USER(ast_vm_user, emailbody, AST_DATA_STRING)			\
 		USER(ast_vm_user, pager, AST_DATA_STRING)			\
 		USER(ast_vm_user, serveremail, AST_DATA_STRING)			\
-		USER(ast_vm_user, mailcmd, AST_DATA_STRING)			\
 		USER(ast_vm_user, language, AST_DATA_STRING)			\
 		USER(ast_vm_user, zonetag, AST_DATA_STRING)			\
 		USER(ast_vm_user, callback, AST_DATA_STRING)			\
@@ -11867,7 +11865,6 @@ static struct ast_cli_entry cli_voicemail[] = {
 		USER(ast_vm_user, emailbody, AST_DATA_STRING)			\
 		USER(ast_vm_user, pager, AST_DATA_STRING)			\
 		USER(ast_vm_user, serveremail, AST_DATA_STRING)			\
-		USER(ast_vm_user, mailcmd, AST_DATA_STRING)			\
 		USER(ast_vm_user, language, AST_DATA_STRING)			\
 		USER(ast_vm_user, zonetag, AST_DATA_STRING)			\
 		USER(ast_vm_user, callback, AST_DATA_STRING)			\
@@ -12243,8 +12240,8 @@ static int manager_list_voicemail_users(struct mansession *s, const struct messa
 			vmu->fullname,
 			vmu->email,
 			vmu->pager,
-			vmu->serveremail,
-			vmu->mailcmd,
+			ast_strlen_zero(vmu->serveremail) ? serveremail : vmu->serveremail,
+			mailcmd,
 			vmu->language,
 			vmu->zonetag,
 			vmu->callback,
diff --git a/funcs/func_math.c b/funcs/func_math.c
index e27057c57e..05321b719c 100644
--- a/funcs/func_math.c
+++ b/funcs/func_math.c
@@ -421,8 +421,6 @@ static int crement_function_read(struct ast_channel *chan, const char *cmd,
 		modify_orig = 1;
 	}
 
-	ast_log(LOG_NOTICE, "The value is now: %d\n", int_value);
-
 	if (snprintf(returnvar, sizeof(returnvar), "%d", int_value) > 0) {
 		pbx_builtin_setvar_helper(chan, data, returnvar);
 		if (modify_orig) {