gnue/geas/src/methods methods.c methods_python.c

[Neil Tiffin]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Neil Tiffin <address@hidden>    01/09/15 20:37:46

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

Log message:
        Hopefully make methods work again.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/methods/methods.c.diff?cvsroot=OldCVS&tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/methods/methods_python.c.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: gnue/geas/src/methods/methods.c
diff -u gnue/geas/src/methods/methods.c:1.16 
gnue/geas/src/methods/methods.c:1.17
--- gnue/geas/src/methods/methods.c:1.16        Sat Sep 15 18:29:32 2001
+++ gnue/geas/src/methods/methods.c     Sat Sep 15 20:37:46 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.c,v 1.16 2001/09/15 22:29:32 ntiffin Exp $
+  $Id: methods.c,v 1.17 2001/09/16 00:37:46 ntiffin Exp $
 */
 
 #include "config.h"
@@ -62,13 +62,33 @@
 gboolean
 load_method_handlers (configuration config)
 {
-  return (FALSE);
+  gboolean status = FALSE;
+  
+#if USE_PYTHON_METHODS  
+  status = python_load_method_handlers (config);
+#endif
+
+#if USE_GLIBMODULE_METHODS
+  status = status || glibmodule_load_method_handlers(config);
+#endif
+  
+  return (status);
 }
 
 gboolean
 shutdown_method_handling (void)
 {
-  return (FALSE);
+  gboolean status = FALSE;
+  
+#if USE_PYTHON_METHODS  
+  status = python_shutdown_method_handling ();
+#endif
+
+#if USE_GLIBMODULE_METHODS
+  status = status || glibmodule_shutdown_method_handling();
+#endif
+  
+  return (status);
 }
 
 /* assumes everything has been validated already */
@@ -77,8 +97,23 @@
                 const char *methodname, GEAS_Arguments * args,
                 CORBA_Environment * ev)
 {
+  CORBA_char * result = NULL;
+
+#if USE_PYTHON_METHODS
+  result = python_execute_method (obj, methodname, args, ev);
+#endif
+
+#if USE_GLIBMODULE_METHODS
+  result = glibmodule_execute_method (obj, methodname, args, ev);
+#endif
+
+#if USE_PYTHON_METHODS || USE_GLIBMODULE_METHODS
+  /* good your are using methods */
+#else
   fatal_error ("No method code handling has been compiled.");
-  return (NULL);
+  result = null;
+#endif
+  return (result);
 }
 
 // end of general dispatch routines
Index: gnue/geas/src/methods/methods_python.c
diff -u gnue/geas/src/methods/methods_python.c:1.4 
gnue/geas/src/methods/methods_python.c:1.5
--- gnue/geas/src/methods/methods_python.c:1.4  Sat Sep 15 18:29:32 2001
+++ gnue/geas/src/methods/methods_python.c      Sat Sep 15 20:37:46 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.4 2001/09/15 22:29:32 ntiffin Exp $
+  $Id: methods_python.c,v 1.5 2001/09/16 00:37:46 ntiffin Exp $
 */
 
 /*
@@ -129,7 +129,8 @@
 python_init_method_handling(configuration config)
 {
   char *buf = NULL;
-  PyObject *m, *py_dict;
+  PyObject *m
+  PyObject *py_dict;
 
   g_return_val_if_fail (config, FALSE);
 
@@ -359,9 +360,11 @@
     make_dataobject_reference (obj->classname, obj->objectid, obj->username,
                                obj->sessionid, ev);
   if (ev->_major != CORBA_NO_EXCEPTION)
+    {
     /* didn't work */
     return (NULL);
-
+    }
+    
   serverobj =
     make_connection_reference (obj->username, "server_allocated", ev);
   if (ev->_major != CORBA_NO_EXCEPTION)