Integrate a patch by Paul RASCLE for V3.2.0b1.

diff --git a/src/PyInterp/PyInterp_base.cxx b/src/PyInterp/PyInterp_base.cxx
index 0e0a5622c3677b48b93d52572ad1c332f59bad29..1afac6ac28dfc35c0f55d8fb5364cc0f2c000f2a 100644 (file)
--- a/src/PyInterp/PyInterp_base.cxx
+++ b/src/PyInterp/PyInterp_base.cxx
@@ -224,7 +224,7 @@ int PyInterp_base::run(const char *command)
       _atFirst = false;
       return ret;
     }
-    ret = simpleRun("salome.salome_init()");
+    ret = simpleRun("salome.salome_init(0,1)");
     if (ret) { 
       _atFirst = false;
       return ret;

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx b/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
index 62b41909fe62ebc52e403e0d6d91ca0f1aef94dc..604c599bf43cbb7d60848b48b88d8c34ba54fb69 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
@@ -994,7 +994,8 @@ void SALOME_PYQT_Module::initInterp( int theStudyId )
     return;
   }
   // ... then call a method
-  PyObjWrapper aRes( PyObject_CallMethod( aMod, "salome_init", "" ) );
+  int embedded = 1;
+  PyObjWrapper aRes( PyObject_CallMethod( aMod, "salome_init", "ii", theStudyId, embedded ) );
   if( !aRes ) {
     // Error!
     PyErr_Print();