Move maincontext and mainloop over to glib. Update the threadstate api to

2008-07-20  Johan Dahlin  <johan@gnome.org>

	* glib/Makefile.am:
	* glib/glibmodule.c (pyglib_main_context_default), (init_glib):
	* glib/pyglib.c (pyglib_init), (pyglib_threads_enabled),
	(pyglib_main_context_new):
	* glib/pyglib.h:
	* glib/pygmaincontext.c (_wrap_g_main_context_iteration),
	(pyglib_maincontext_register_types):
	* glib/pygmaincontext.h:
	* glib/pygmainloop.c (pyg_signal_watch_prepare),
	(pyg_signal_watch_check), (pyg_main_loop_new),
	(_wrap_g_main_loop_get_context), (_wrap_g_main_loop_run),
	(pyglib_mainloop_register_types):
	* glib/pygmainloop.h:
	* gobject/Makefile.am:
	* gobject/__init__.py:
	* gobject/gobjectmodule.c (pyg_destroy_notify), (pyobject_free),
	(pyg_object_set_property), (pyg_object_get_property),
	(_pyg_signal_accumulator), (pygobject__g_instance_init),
	(pyg_handler_marshal), (pygobject_gil_state_ensure),
	(pygobject_gil_state_release), (marshal_emission_hook),
	(_log_func), (init_gobject):
	* gobject/pygboxed.c (pyg_boxed_dealloc), (pyg_boxed_new):
	* gobject/pygenum.c (pyg_enum_add):
	* gobject/pygflags.c (pyg_flags_add):
	* gobject/pygiochannel.c (pyg_iowatch_marshal):
	* gobject/pygmaincontext.c:
	* gobject/pygmainloop.c:
	* gobject/pygobject-private.h:
	* gobject/pygobject.c (pygobject_data_free), (pyg_toggle_notify),
	(pygobject_new_with_interfaces), (pygobject_weak_ref_notify):
	* gobject/pygobject.h:
	* gobject/pygoptiongroup.c (destroy_g_group), (arg_func):
	* gobject/pygpointer.c (pyg_pointer_new):
	* gobject/pygsource.c (pyg_source_get_context),
	(pyg_source_prepare), (pyg_source_check), (pyg_source_dispatch),
	(pyg_source_finalize):
	* gobject/pygtype.c (pyg_closure_invalidate),
	(pyg_closure_marshal), (pyg_signal_class_closure_marshal):
	* tests/common.py:

	Move maincontext and mainloop over to glib.
	Update the threadstate api to use the variant in glib.

svn path=/trunk/; revision=843

1 files changed, 12 insertions, 9 deletions

diff --git a/glib/glibmodule.c b/glib/glibmodule.c
index 25ded22..6892d1a 100644
--- a/glib/glibmodule.c
+++ b/glib/glibmodule.c
@@ -29,8 +29,10 @@
 #include <glib.h>
 #include "pyglib.h"
 
-#include "pygspawn.h"
 #include "pyglib-private.h"
+#include "pygmaincontext.h"
+#include "pygmainloop.h"
+#include "pygspawn.h"
 
 #define PYGLIB_MAJOR_VERSION PYGOBJECT_MAJOR_VERSION
 #define PYGLIB_MINOR_VERSION PYGOBJECT_MINOR_VERSION
@@ -343,13 +345,11 @@ pyg_source_remove(PyObject *self, PyObject *args)
     return PyBool_FromLong(g_source_remove(tag));
 }
 
-#ifdef FIXME
 static PyObject *
-pyg_main_context_default(PyObject *unused)
+pyglib_main_context_default(PyObject *unused)
 {
-    return pyg_main_context_new(g_main_context_default());
+    return pyglib_main_context_new(g_main_context_default());
 }
-#endif
 
 struct _PyGChildData {
     PyObject *func;
@@ -565,6 +565,8 @@ pyg_set_prgname(PyObject *self, PyObject *args)
 static PyMethodDef pyglib_functions[] = {
     { "spawn_async",
       (PyCFunction)pyglib_spawn_async, METH_VARARGS|METH_KEYWORDS },
+    { "main_context_default",
+      (PyCFunction)pyglib_main_context_default, METH_NOARGS },
 
     { "idle_add",
       (PyCFunction)pyg_idle_add, METH_VARARGS|METH_KEYWORDS },
@@ -598,10 +600,8 @@ static PyMethodDef pyglib_functions[] = {
       (PyCFunction)pyg_set_prgname, METH_VARARGS },
     { "main_depth",
       (PyCFunction)pyg_main_depth, METH_NOARGS },
-#if 0
-    { "main_context_default",
-      (PyCFunction)pyg_main_context_default, METH_NOARGS },
-#endif
+
+
     { NULL, NULL, 0 }
 };
 
@@ -675,4 +675,7 @@ init_glib(void)
     pyg_register_error(d);
     pyg_register_version_tuples(d);
     pyg_spawn_register_types(d);
+
+    pyglib_mainloop_register_types(d);
+    pyglib_maincontext_register_types(d);
 }