Changeset 16509

Timestamp:

05/30/08 11:48:49 (4 months ago)

Author:

piotras

Message:

Collector's and QB's type objects moved to their c files and accessible with public function.
It should fix qb's and collector's common symbols problem.

Files:

• trunk/midgard/apis/python/py_midgard.h (modified) (3 diffs)
• trunk/midgard/apis/python/py_midgard_collector.c (modified) (1 diff)
• trunk/midgard/apis/python/py_midgard_query_builder.c (modified) (1 diff)

trunk/midgard/apis/python/py_midgard.h

@@ -17 +17 @@
- */
-
+#ifndef PY_MIDGARD_H
+#define PY_MIDGARD_H
+
+#ifndef PY_MIDGARD_H_INT
+#define PY_MIDGARD_H_INT
+
-#include <Python.h>
-#include <pygobject.h>
-#include <midgard/midgard.h>
+
+#endif 
-
-#ifdef G_LOG_DOMAIN
@@ -60 +68 @@
-extern MidgardConnection *MGDCG;
-
+/* Types' pointers */
+PyTypeObject py_midgard_query_builder_get_type_object(void);
+PyTypeObject py_midgard_collector_get_type_object(void);
+
-extern void _py_midgard_connection_singleton_set(MidgardConnection *mgd);
-extern MidgardConnection *_py_midgard_connection_singleton_get(void);
@@ -91 +103 @@
-                k++;                                    \
-        }
+
+#endif  /* PY_MIDGARD_H */

trunk/midgard/apis/python/py_midgard_collector.c

@@ -565 +565 @@
-
-}
+
+PyTypeObject py_midgard_collector_get_type_object(void)
+{
+        return Pymidgard_collector_Type;
+}
+

trunk/midgard/apis/python/py_midgard_query_builder.c

@@ -358 +358 @@
-        pyg_set_object_has_new_constructor(MIDGARD_TYPE_QUERY_BUILDER);
-}
+
+PyTypeObject py_midgard_query_builder_get_type_object(void)
+{
+        return Pymidgard_qb_Type;       
+}