From 487f1d5035881c2609c33dc554761a2a644209be Mon Sep 17 00:00:00 2001 From: Johan Dahlin Date: Fri, 25 Jul 2008 11:01:02 +0000 Subject: Remove private structures which moved to pyglib. 2008-07-25 Johan Dahlin * gobject/gobjectmodule.c (init_gobject): * gobject/pygobject-private.h: Remove private structures which moved to pyglib. svn path=/trunk/; revision=853 --- ChangeLog | 6 ++++++ gobject/gobjectmodule.c | 5 ----- gobject/pygobject-private.h | 21 --------------------- 3 files changed, 6 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f3e8de..68b76af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-07-25 Johan Dahlin + + * gobject/gobjectmodule.c (init_gobject): + * gobject/pygobject-private.h: + Remove private structures which moved to pyglib. + 2008-07-24 Johan Dahlin Bug 544600 – pygobject building failed since 839 revision, diff --git a/gobject/gobjectmodule.c b/gobject/gobjectmodule.c index a5bf3aa..a6da00f 100644 --- a/gobject/gobjectmodule.c +++ b/gobject/gobjectmodule.c @@ -2682,7 +2682,6 @@ init_gobject(void) PyObject *m, *d, *o, *tuple, *features; PyObject *descr; PyObject *warning; - PyObject *glib; PyGParamSpec_Type.ob_type = &PyType_Type; if (PyType_Ready(&PyGParamSpec_Type)) @@ -2696,10 +2695,6 @@ init_gobject(void) g_type_init(); pyglib_init(); - glib = PyImport_ImportModule("glib"); - _PyGMainLoop_Type = (PyTypeObject*)PyObject_GetAttrString(glib, "MainLoop"); - _PyGMainContext_Type = (PyTypeObject*)PyObject_GetAttrString(glib, "MainContext"); - pygboxed_type_key = g_quark_from_static_string("PyGBoxed::class"); pygboxed_marshal_key = g_quark_from_static_string("PyGBoxed::marshal"); pygenum_class_key = g_quark_from_static_string("PyGEnum::class"); diff --git a/gobject/pygobject-private.h b/gobject/pygobject-private.h index 1b2255b..19582d9 100644 --- a/gobject/pygobject-private.h +++ b/gobject/pygobject-private.h @@ -217,27 +217,6 @@ extern PyObject * pyg_enum_add (PyObject * module, extern PyObject * pyg_enum_from_gtype (GType gtype, int value); -/* pygmainloop */ - -typedef struct { - PyObject_HEAD - GMainLoop *loop; - GSource *signal_source; -} PyGMainLoop; - -PyTypeObject *_PyGMainLoop_Type; -#define PyGMainLoop_Type (*_PyGMainLoop_Type) - -/* pygmaincontext */ - -typedef struct { - PyObject_HEAD - GMainContext *context; -} PyGMainContext; - -PyTypeObject *_PyGMainContext_Type; -#define PyGMainContext_Type (*_PyGMainContext_Type) - /* pygparamspec */ extern PyTypeObject PyGParamSpec_Type; -- cgit