pygobject r853 - in trunk: . gobject

[johan svn gnome org]

Author: johan
Date: Fri Jul 25 11:01:02 2008
New Revision: 853
URL: http://svn.gnome.org/viewvc/pygobject?rev=853&view=rev

Log:
2008-07-25  Johan Dahlin  <johan gnome org>

    * gobject/gobjectmodule.c (init_gobject):
    * gobject/pygobject-private.h:
    Remove private structures which moved to pyglib.



Modified:
   trunk/ChangeLog
   trunk/gobject/gobjectmodule.c
   trunk/gobject/pygobject-private.h

Modified: trunk/gobject/gobjectmodule.c
==============================================================================
--- trunk/gobject/gobjectmodule.c	(original)
+++ trunk/gobject/gobjectmodule.c	Fri Jul 25 11:01:02 2008
@@ -2682,7 +2682,6 @@
     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 @@
     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");

Modified: trunk/gobject/pygobject-private.h
==============================================================================
--- trunk/gobject/pygobject-private.h	(original)
+++ trunk/gobject/pygobject-private.h	Fri Jul 25 11:01:02 2008
@@ -217,27 +217,6 @@
 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;