[asterisk-commits] branch crichter/0.2.1 - r7411 in /team/crichter/0.2.1: ./ apps/ configs/

[asterisk-commits at lists.digium.com]

Author: crichter
Date: Fri Dec  9 04:45:37 2005
New Revision: 7411

URL: http://svn.digium.com/view/asterisk?rev=7411&view=rev
Log:
Merged revisions 7404,7406 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r7404 | tilghman | 2005-12-09 00:32:08 +0100 (Fr, 09 Dez 2005) | 2 lines

Documenting two keywords that were previously missing

........
r7406 | tilghman | 2005-12-09 00:45:36 +0100 (Fr, 09 Dez 2005) | 2 lines

Bug 5960

........

Modified:
    team/crichter/0.2.1/   (props changed)
    team/crichter/0.2.1/apps/app_voicemail.c
    team/crichter/0.2.1/configs/res_odbc.conf.sample

Propchange: team/crichter/0.2.1/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Dec  9 04:45:37 2005
@@ -1,1 +1,1 @@
-/branches/1.2:1-7388
+/branches/1.2:1-7410

Modified: team/crichter/0.2.1/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/crichter/0.2.1/apps/app_voicemail.c?rev=7411&r1=7410&r2=7411&view=diff
==============================================================================
--- team/crichter/0.2.1/apps/app_voicemail.c (original)
+++ team/crichter/0.2.1/apps/app_voicemail.c Fri Dec  9 04:45:37 2005
@@ -536,10 +536,10 @@
 		if (mailbox) 
 			ast_copy_string(retval->mailbox, mailbox, sizeof(retval->mailbox));
 		populate_defaults(retval);
-		if (ast_test_flag((&globalflags), VM_SEARCH))
+		if (!context && ast_test_flag((&globalflags), VM_SEARCH))
 			var = ast_load_realtime("voicemail", "mailbox", mailbox, NULL);
 		else
-			var = ast_load_realtime("voicemail", "mailbox", mailbox, "context", retval->context, NULL);
+			var = ast_load_realtime("voicemail", "mailbox", mailbox, "context", context, NULL);
 		if (var) {
 			tmp = var;
 			while(tmp) {

Modified: team/crichter/0.2.1/configs/res_odbc.conf.sample
URL: http://svn.digium.com/view/asterisk/team/crichter/0.2.1/configs/res_odbc.conf.sample?rev=7411&r1=7410&r2=7411&view=diff
==============================================================================
--- team/crichter/0.2.1/configs/res_odbc.conf.sample (original)
+++ team/crichter/0.2.1/configs/res_odbc.conf.sample Fri Dec  9 04:45:37 2005
@@ -1,17 +1,28 @@
 ;;; odbc setup file 
 
+; ENV is a global set of environmental variables that will get set.
+; Note that all environmental variables can be seen by all connections,
+; so you can't have different values for different connections.
+[ENV]
+INFORMIXSERVER => my_special_database
+INFORMIXDIR => /opt/informix
+
+; All other sections are arbitrary names for database connections.
+
 [asterisk]
+enabled => yes
 dsn => asterisk
 ;username => myuser
 ;password => mypass
 pre-connect => yes
 
 
-;[mysql2]
-;dsn => MySQL-asterisk
-;username => myuser
-;password => mypass
-;pre-connect => yes
+[mysql2]
+enabled => no
+dsn => MySQL-asterisk
+username => myuser
+password => mypass
+pre-connect => yes