[asterisk-commits] tzafrir: branch 1.8 r292050 - in /branches/1.8: ./ configs/ res/

[SVN commits to the Asterisk project]

Author: tzafrir
Date: Sat Oct 16 05:47:00 2010
New Revision: 292050

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=292050
Log:
Merged revisions 292049 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r292049 | tzafrir | 2010-10-16 12:03:04 +0200 (ש', 16 אוק 2010) | 15 lines
  
  Base directory for MOH should be ASTDATADIR
  
  If the directive 'directory' is relative, make it relative to the
  datadir, rather than to the varlibdir. In the sample configuration
  it is relative ('moh').
  
  This has no effect unless you have actively set the datadir explicitly
  (at build time or at run time).
  
  (closes issue #16906)
  Patches:
        moh_datadir uploaded by tzafrir (license 46)
  
  Review: https://reviewboard.asterisk.org/r/974/
........

Modified:
    branches/1.8/   (props changed)
    branches/1.8/configs/musiconhold.conf.sample
    branches/1.8/res/res_musiconhold.c

Propchange: branches/1.8/
------------------------------------------------------------------------------
Binary property 'branch-1.6.2-merged' - no diff available.

Modified: branches/1.8/configs/musiconhold.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/configs/musiconhold.conf.sample?view=diff&rev=292050&r1=292049&r2=292050
==============================================================================
--- branches/1.8/configs/musiconhold.conf.sample (original)
+++ branches/1.8/configs/musiconhold.conf.sample Sat Oct 16 05:47:00 2010
@@ -31,7 +31,7 @@
 ;
 ; The path specified can be either an absolute path (starts with '/'),
 ; or a relative path; relative paths are interpreted as being relative
-; to the 'astvarlibdir' in asterisk.conf, which defaults to
+; to the 'astdatalibdir' in asterisk.conf, which defaults to
 ; /var/lib/asterisk.
 ;
 ; NOTE:

Modified: branches/1.8/res/res_musiconhold.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/res/res_musiconhold.c?view=diff&rev=292050&r1=292049&r2=292050
==============================================================================
--- branches/1.8/res/res_musiconhold.c (original)
+++ branches/1.8/res/res_musiconhold.c Sat Oct 16 05:47:00 2010
@@ -1022,7 +1022,7 @@
 	int i;
 
 	if (class->dir[0] != '/') {
-		ast_copy_string(dir_path, ast_config_AST_VAR_DIR, sizeof(dir_path));
+		ast_copy_string(dir_path, ast_config_AST_DATA_DIR, sizeof(dir_path));
 		strncat(dir_path, "/", sizeof(dir_path) - 1);
 		strncat(dir_path, class->dir, sizeof(dir_path) - 1);
 	} else {