[asterisk-scf-commits] asterisk-scf/integration/mediaformatgeneric.git branch "retry_deux" updated.

[Commits to the Asterisk SCF project code repositories]

branch "retry_deux" has been updated
       via  a4e5790fa482b1c3b994d244d3a4bee9d49c1ce2 (commit)
       via  e4bf44a30769d12c6c1304d6218ec112be2a6d1e (commit)
      from  6a2a15612c7a08bd9a4191267155726b46b2ab79 (commit)

Summary of changes:
 config/MediaFormatGenericConfigurator.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit a4e5790fa482b1c3b994d244d3a4bee9d49c1ce2
Merge: 6a2a156 e4bf44a
Author: David M. Lee <dlee at digium.com>
Date:   Thu Apr 12 11:47:01 2012 -0500

    Merge remote-tracking branch 'origin/master' into retry_deux


commit e4bf44a30769d12c6c1304d6218ec112be2a6d1e
Author: David M. Lee <dlee at digium.com>
Date:   Thu Apr 12 11:34:51 2012 -0500

    Ice.loadSlice -> astscfLoadSlice

diff --git a/config/MediaFormatGenericConfigurator.py b/config/MediaFormatGenericConfigurator.py
index 7fb2bc8..5b0dcee 100755
--- a/config/MediaFormatGenericConfigurator.py
+++ b/config/MediaFormatGenericConfigurator.py
@@ -3,7 +3,7 @@
 #
 # Asterisk SCF -- An open-source communications framework.
 #
-# Copyright (C) 2011, Digium, Inc.
+# Copyright (C) 2011-2012, Digium, Inc.
 #
 # See http://www.asterisk.org for more information about
 # the Asterisk SCF project. Please do not directly contact
@@ -22,7 +22,7 @@
 import Ice, Configurator, sys, os
 
 # Load our component specific configuration definitions
-Ice.loadSlice("-I" + os.environ["ASTSCF_HOME"] + " -I" + Ice.getSliceDir() + " --all ../slice/AsteriskSCF/Configuration/MediaFormatGeneric/MediaFormatGenericConfigurationIf.ice")
+Configurator.astscfLoadSlice("mediaformatgeneric", "AsteriskSCF/Configuration/MediaFormatGeneric/MediaFormatGenericConfigurationIf.ice")
 import AsteriskSCF.Configuration.FormatGeneric.V1
 
 # Add our own visitor implementations for the sections we support

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/mediaformatgeneric.git