[asterisk-commits] tilghman: branch 1.6.1 r174504 - in /branches/1.6.1: ./ apps/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Feb 10 01:07:30 2009
New Revision: 174504

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=174504
Log:
Merged revisions 174503 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r174503 | tilghman | 2009-02-10 01:06:29 -0600 (Tue, 10 Feb 2009) | 2 lines
  
  Fix0ring build
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_stack.c
    branches/1.6.1/apps/app_voicemail.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/app_stack.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/apps/app_stack.c?view=diff&rev=174504&r1=174503&r2=174504
==============================================================================
--- branches/1.6.1/apps/app_stack.c (original)
+++ branches/1.6.1/apps/app_stack.c Tue Feb 10 01:07:30 2009
@@ -464,7 +464,9 @@
 
 		if ((res = pbx_exec(chan, theapp, gosub_args)) == 0) {
 			struct ast_pbx *pbx = chan->pbx;
-			struct ast_pbx_args args = { .no_hangup_chan = 1 };
+			struct ast_pbx_args args;
+			memset(&args, 0, sizeof(args));
+			args.no_hangup_chan = 1;
 			/* Suppress warning about PBX already existing */
 			chan->pbx = NULL;
 			ast_agi_send(agi->fd, chan, "100 result=0 Trying...\n");
@@ -501,8 +503,6 @@
 
 static int unload_module(void)
 {
-	struct ast_context *con;
-
 	if (ast_agi_unregister) {
 		 ast_agi_unregister(ast_module_info->self, &gosub_agi_command);
 	}
@@ -518,8 +518,6 @@
 
 static int load_module(void)
 {
-	struct ast_context *con;
-
 	/* usage of AGI is optional, so check to see if the ast_agi_register()
 	   function is available; if so, use it.
 	*/

Modified: branches/1.6.1/apps/app_voicemail.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/apps/app_voicemail.c?view=diff&rev=174504&r1=174503&r2=174504
==============================================================================
--- branches/1.6.1/apps/app_voicemail.c (original)
+++ branches/1.6.1/apps/app_voicemail.c Tue Feb 10 01:07:30 2009
@@ -1009,8 +1009,8 @@
 			ast_copy_string(retval->imapuser, tmp->value, sizeof(retval->imapuser));
 		} else if (!strcasecmp(tmp->name, "imappassword") || !strcasecmp(tmp->name, "imapsecret")) {
 			ast_copy_string(retval->imappassword, tmp->value, sizeof(retval->imappassword));
-		} else if (!strcasecmp(tmp->name, "imapvmshareid")) {
-			ast_copy_string(retval->imapvmshareid, tmp->value, sizeof(retval->imapvmshareid));
+		} else if (!strcasecmp(var->name, "imapvmshareid")) {
+			ast_copy_string(retval->imapvmshareid, var->value, sizeof(retval->imapvmshareid));
 #endif
 		} else
 			apply_option(retval, tmp->name, tmp->value);