diff options
| author | Paul Pogonyshev <pogonyshev@gmx.net> | 2008-09-08 20:32:42 +0000 |
|---|---|---|
| committer | Paul Pogonyshev <paulp@src.gnome.org> | 2008-09-08 20:32:42 +0000 |
| commit | aec7f99584e3b0b294220fab44f98fc34f42b45f (patch) | |
| tree | 6e2c08f379b8e8e5d79eaca4ae18fa6fdf578132 | |
| parent | f7cef33cba75cff1021572e3e26f155668098b97 (diff) | |
| download | pygtk-aec7f99584e3b0b294220fab44f98fc34f42b45f.tar.gz | |
Bug 550754 – need to import GIO types from PyGObject package
2008-09-08 Paul Pogonyshev <pogonyshev@gmx.net>
Bug 550754 – need to import GIO types from PyGObject package
* configure.ac: Determine if `gio-types.defs' is installed as part
of PyGObject.
* gtk/Makefile.am: Use it to register GIO types if installed.
* gtk/gdk.override: Make gio.AppLaunchContext import conditional.
Add conditional import of gio.Icon.
* gtk/gtk.override: Make gio.MountOperation import conditional.
Add conditional imports of gio.File and gio.Icon.
svn path=/trunk/; revision=3037
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | gtk/Makefile.am | 8 | ||||
| -rw-r--r-- | gtk/gdk.override | 3 | ||||
| -rw-r--r-- | gtk/gtk.override | 4 |
5 files changed, 43 insertions, 3 deletions
@@ -1,3 +1,18 @@ +2008-09-08 Paul Pogonyshev <pogonyshev@gmx.net> + + Bug 550754 – need to import GIO types from PyGObject package + + * configure.ac: Determine if `gio-types.defs' is installed as part + of PyGObject. + + * gtk/Makefile.am: Use it to register GIO types if installed. + + * gtk/gdk.override: Make gio.AppLaunchContext import conditional. + Add conditional import of gio.Icon. + + * gtk/gtk.override: Make gio.MountOperation import conditional. + Add conditional imports of gio.File and gio.Icon. + 2008-09-02 Gian Mario Tagliaretti <gianmt@gnome.org> * gtk/gtk-2.14.defs: comment out for a while gtk_selection_data_get_data diff --git a/configure.ac b/configure.ac index 58735fae..b957ce73 100644 --- a/configure.ac +++ b/configure.ac @@ -143,6 +143,22 @@ AC_SUBST(PYGOBJECT_INCLUDEDIR) PYGOBJECT_DATADIR=`$PKG_CONFIG --variable=datadir pygobject-2.0` AC_SUBST(PYGOBJECT_DATADIR) + +dnl PyGObject defs +AC_SUBST(PYGOBJECT_DEFSDIR) +PYGOBJECT_DEFSDIR=`$PKG_CONFIG --variable defsdir pygobject-2.0` + +AC_MSG_CHECKING([for gio-types.defs]) +if test -n "$PYGOBJECT_DEFSDIR" && test -e "$PYGOBJECT_DEFSDIR/gio-types.defs"; then + AM_CONDITIONAL(HAVE_GIO_TYPES_DEFS, true) + AC_MSG_RESULT($PYGOBJECT_DEFSDIR/gio-types.defs) +else + AM_CONDITIONAL(HAVE_GIO_TYPES_DEFS, false) + AC_MSG_RESULT(no) +fi + + +dnl Documentation PYGOBJECT_FIXXREF="$PYTHON `$PKG_CONFIG --variable=fixxref pygobject-2.0`" AC_SUBST(PYGOBJECT_FIXXREF) diff --git a/gtk/Makefile.am b/gtk/Makefile.am index d51b7588..32c98aad 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -187,11 +187,17 @@ _gtk_la_CFLAGS += -DPLATFORM_WIN32 endif +extra_codegen_args = + +if HAVE_GIO_TYPES_DEFS +extra_codegen_args += --register $(PYGOBJECT_DEFSDIR)/gio-types.defs +endif + .defs.c: ($(PYTHON) $(CODEGENDIR)/codegen.py \ $(PYGTK_CODEGEN_DEFINES) \ -I $(srcdir) \ - --py_ssize_t-clean \ + --py_ssize_t-clean $(extra_codegen_args) \ --register $(top_srcdir)/pango-types.defs \ --register $(top_srcdir)/atk-types.defs \ --register gdk-types.defs \ diff --git a/gtk/gdk.override b/gtk/gdk.override index 2080d708..5589872b 100644 --- a/gtk/gdk.override +++ b/gtk/gdk.override @@ -92,7 +92,8 @@ import pango.Context as PyPangoContext_Type import pango.Font as PyPangoFont_Type import pango.Layout as PyPangoLayout_Type import pango.Renderer as PyPangoRenderer_Type -import gio.AppLaunchContext as PyGAppLaunchContext_Type +import gio.AppLaunchContext as PyGAppLaunchContext_Type for GAppLaunchContext +import gio.Icon as PyGIcon_Type for GIcon %% ignore gdk_window_set_debug_updates diff --git a/gtk/gtk.override b/gtk/gtk.override index bf0a845c..cf66f8b9 100644 --- a/gtk/gtk.override +++ b/gtk/gtk.override @@ -125,7 +125,9 @@ import atk.Object as PyAtkObject_Type import pango.Context as PyPangoContext_Type import pango.Font as PyPangoFont_Type import pango.Layout as PyPangoLayout_Type -import gio.MountOperation as PyGMountOperation_Type +import gio.File as PyGFile_Type for GFile +import gio.Icon as PyGIcon_Type for GIcon +import gio.MountOperation as PyGMountOperation_Type for GMountOperation %% ignore gtk_accel_group_add |