summaryrefslogtreecommitdiff
path: root/gi/overrides
diff options
context:
space:
mode:
authorSimon Feltman <sfeltman@src.gnome.org>2014-01-08 18:57:58 -0800
committerSimon Feltman <sfeltman@src.gnome.org>2014-01-14 10:19:32 -0800
commitad565e5bbc9d12607c39be9479bc671a8f2de6e3 (patch)
treedc8dfa5c90522f59c16ed2e90badb1d83f60cda8 /gi/overrides
parent2624bd2b4a465a2d234951dd5b855fe8a0d46e1c (diff)
downloadpygobject-ad565e5bbc9d12607c39be9479bc671a8f2de6e3.tar.gz
Merge static PyGLib module into PyGI
Remove gi._glib._glib as a separately compiled module. Move all C files into pygobject/gi. Remove compilation and use of libpyglib-gi-2.0-python.so as a shared dependency since we do not distribute header files for it. Remove unused threading macros. https://bugzilla.gnome.org/show_bug.cgi?id=712197
Diffstat (limited to 'gi/overrides')
-rw-r--r--gi/overrides/GLib.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/gi/overrides/GLib.py b/gi/overrides/GLib.py
index df5654ac..73a2567c 100644
--- a/gi/overrides/GLib.py
+++ b/gi/overrides/GLib.py
@@ -39,7 +39,7 @@ __all__.append('option')
# Types and functions still needed from static bindings
-from gi._glib import _glib
+from gi._gi import _glib
GError = _glib.GError
OptionContext = _glib.OptionContext
OptionGroup = _glib.OptionGroup