[Opensync-commits] r5680 - branches/opensync-ticket1084/wrapper

[<svn...@op...>]

Author: dgollub
Date: Mon Jun 22 01:29:13 2009
New Revision: 5680
URL: http://www.opensync.org/changeset/5680

Log:
fix build of wrapper.
Dropped obsolate interface. Adapted to new osync_capabilities_new()
interface.

Modified:
   branches/opensync-ticket1084/wrapper/opensync-merger.i

Modified: branches/opensync-ticket1084/wrapper/opensync-merger.i
==============================================================================
--- branches/opensync-ticket1084/wrapper/opensync-merger.i	Mon Jun 22 01:24:36 2009	(r5679)
+++ branches/opensync-ticket1084/wrapper/opensync-merger.i	Mon Jun 22 01:29:13 2009	(r5680)
@@ -29,9 +29,9 @@
 
 typedef struct {} Capabilities;
 %extend Capabilities {
-	Capabilities() {
+	Capabilities(const char *capsformat) {
 		Error *err = NULL;
-		Capabilities *caps = osync_capabilities_new(&err);
+		Capabilities *caps = osync_capabilities_new(capsformat, &err);
 		if (raise_exception_on_error(err))
 			return NULL;
 		else
@@ -41,20 +41,6 @@
 	~Capabilities() {
 		osync_capabilities_unref(self);
 	}
-
-	/* returns a python string object */
-	PyObject *assemble() {
-		char *buf;
-		int size;
-		Error *err = NULL;
-		osync_bool ret = osync_capabilities_assemble(self, &buf, &size, &err);
-		if (raise_exception_on_error(err))
-			return NULL;
-
-		PyObject *obj = PyString_FromStringAndSize(buf, size);
-		free(buf);
-		return obj;
-	}
 }
 
 /* FIXME: cstring_input_binary is broken in my version of swig, so I've recreated it here */
@@ -66,18 +52,6 @@
 	}
 }
 
- %inline %{
-	static Capabilities *capabilities_parse(const char *buffer, size_t size) {
-		Error *err = NULL;
-		Capabilities *caps = osync_capabilities_parse(buffer, (unsigned int)size, &err);
-		if (raise_exception_on_error(err))
-			return NULL;
-		else
-			return caps; /* new object, no need to inc ref */
-	}
-%}
-
-
 %{
 /* convert an XMLFieldList to a python list */
 static PyObject *xmlfieldlist_to_pylist(XMLFieldList *list)