gnue/geas/src geas.conf.sample methods/methods_...

[Neil Tiffin]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Neil Tiffin <address@hidden>    01/09/16 11:07:50

Modified files:
        geas/src       : geas.conf.sample 
        geas/src/methods: methods_python.c 

Log message:
        Fix sample configuration file for ORBit.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/geas.conf.sample.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/methods/methods_python.c.diff?cvsroot=OldCVS&tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: gnue/geas/src/geas.conf.sample
diff -u gnue/geas/src/geas.conf.sample:1.1 gnue/geas/src/geas.conf.sample:1.2
--- gnue/geas/src/geas.conf.sample:1.1  Tue Jun 12 18:22:22 2001
+++ gnue/geas/src/geas.conf.sample      Sun Sep 16 11:07:49 2001
@@ -26,6 +26,10 @@
 # Where to find method code files
 methoddir           ../examples/businessobjects/methods
 
+# Where to find orbit module
+# defaults to /usr/lib/python1.5/site-packages/CORBAmodule.so if not specified
+ORBit-python        /usr/lib/python1.5/site-packages/CORBAmodule.so
+
 # Where is the geas.idl file stored?
 rootIDLfile  ../idl/geas.idl
 
Index: gnue/geas/src/methods/methods_python.c
diff -u gnue/geas/src/methods/methods_python.c:1.6 
gnue/geas/src/methods/methods_python.c:1.7
--- gnue/geas/src/methods/methods_python.c:1.6  Sun Sep 16 10:53:09 2001
+++ gnue/geas/src/methods/methods_python.c      Sun Sep 16 11:07:49 2001
@@ -19,7 +19,7 @@
   along with GEAS; if not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-  $Id: methods_python.c,v 1.6 2001/09/16 14:53:09 ntiffin Exp $
+  $Id: methods_python.c,v 1.7 2001/09/16 15:07:49 ntiffin Exp $
 */
 
 /*
@@ -478,20 +478,20 @@
     }
   option_string = get_global_option_str(config, "ORBit-python", 
ORBIT_PYTHON_SO);
   orbit_python_library = g_module_open (option_string, G_MODULE_BIND_LAZY);
-
   if (!orbit_python_library)
     {
       errormsg ("Could not load ORBit-Python module at: ");
       errormsg (option_string);
       return (ERR_NO_ORBIT_PYTHON);
     }
-
   g_module_symbol (orbit_python_library, "CORBA_Object_to_PyObject", &gsym);
   CORBA_to_Python_func = gsym;
   
 #ifdef __APPLE__
 #ifdef __ppc__
   /* TODO i wonder if this will work for linux stuff */
+  /* for whatever reason without this i get dyld duplicate definition */
+  /* because the module appears to be loaded already */
   g_module_close(orbit_python_library);
 #endif
 #endif
@@ -501,6 +501,5 @@
       errormsg ("Could not locate required functions");
       return (ERR_NO_FUNCTIONS);
     }
-  
   return (ERR_OK);
 }