-- remove BongoArray and replace it with GArray

-- StrictCompile antispam and fix all the accompanying warnings

src/libs/python/libbongo/cal.c

@@ -111,7 +111,7 @@ cal_Collect(PyObject *self, PyObject *args)
 {
     JsonObject *json;
     BongoCalObject *cal;
-    BongoArray *occs;
+    GArray *occs;
     PyObject *dtstart;
     PyObject *dtend;
     const char *tzid;
@@ -140,12 +140,12 @@ cal_Collect(PyObject *self, PyObject *args)
     
     cal = BongoCalObjectNew(json->obj);
     
-    occs = BongoArrayNew(sizeof(BongoCalOccurrence), 16);
+    occs = g_array_sized_new(FALSE, FALSE, sizeof(BongoCalOccurrence), 16);
     if (BongoCalObjectCollect(cal, start, end, NULL, TRUE, occs)) {
         JsonArray *ret;
-        BongoArray *occsJson;
+        GArray *occsJson;
         occsJson = BongoCalOccurrencesToJson(occs, BongoCalObjectGetTimezone(cal, tzid));
-        BongoArrayFree(occs, TRUE);
+        g_array_free(occs, TRUE);
 
         ret = PyObject_New(JsonArray, &JsonArrayType);
         ret->array = occsJson;
@@ -153,7 +153,7 @@ cal_Collect(PyObject *self, PyObject *args)
 
         return (PyObject*)ret;
     } else {
-        BongoArrayFree(occs, TRUE);
+        g_array_free(occs, TRUE);
         Py_INCREF(Py_None);
         return Py_None;
     }

src/libs/python/libbongo/json.c

@@ -161,15 +161,15 @@ JsonPyToNode(PyObject *obj)
         node = BongoJsonNodeNewString(PyString_AsString(utf8));
         Py_DECREF(utf8);
     } else if (PyList_Check(obj)) {
-        BongoArray *array;
+        GArray *array;
         int len = PyList_Size(obj);
         int i;
 
-        array = BongoArrayNew(sizeof(BongoJsonNode*), len);
+        array = g_array_sized_new(FALSE, FALSE, sizeof(BongoJsonNode*), len);
 
         for (i=0; i<len; i++) {
             BongoJsonNode *item = JsonPyToNode(PyList_GetItem(obj, i));
-            BongoArrayAppendValue(array, item);
+            g_array_append_val(array, item);
         }
 
         node = BongoJsonNodeNewArray(array);
@@ -230,7 +230,7 @@ JsonObjectToPyNative(BongoJsonObject *obj)
 }
 
 static PyObject *
-JsonArrayToPyNative(BongoArray *array)
+JsonArrayToPyNative(GArray *array)
 {
     PyObject *ret;
     unsigned int i;
@@ -331,7 +331,7 @@ int
 JsonArray_init(JsonArray *self, PyObject *args, PyObject *kwds)
 {
     self->own = TRUE;
-    self->array = BongoArrayNew(sizeof(BongoJsonNode*), 16);
+    self->array = g_array_sized_new(FALSE, FALSE, sizeof(BongoJsonNode*), 16);
     return 0;
 }
 

src/libs/python/libbongo/json.h

@@ -28,7 +28,7 @@ typedef struct {
 typedef struct {
     PyObject_HEAD
     BOOL own;
-    BongoArray *array;
+    GArray *array;
 } JsonArray;
     
 /* Object protocol */