diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | gobject/gobjectmodule.c | 5 | ||||
-rw-r--r-- | gobject/pygobject.h | 4 |
4 files changed, 17 insertions, 4 deletions
@@ -1,3 +1,11 @@ +2007-11-05 Johan Dahlin <johan@gnome.org> + + * gobject/pygobject.h: + * gobject/gobjectmodule.c: + Add pyg_option_group_new to the public API + + * configure.ac: Branch, bump version to 2.15.0. + 2007-10-16 Damien Carbery <damien.carbery@sun.com> reviewed by: Johan Dahlin. diff --git a/configure.ac b/configure.ac index 1386151..250f474 100644 --- a/configure.ac +++ b/configure.ac @@ -3,8 +3,8 @@ AC_PREREQ(2.52) dnl the pygobject version number m4_define(pygobject_major_version, 2) -m4_define(pygobject_minor_version, 14) -m4_define(pygobject_micro_version, 1) +m4_define(pygobject_minor_version, 15) +m4_define(pygobject_micro_version, 0) m4_define(pygobject_version, pygobject_major_version.pygobject_minor_version.pygobject_micro_version) dnl versions of packages we require ... diff --git a/gobject/gobjectmodule.c b/gobject/gobjectmodule.c index 4881120..07eb8aa 100644 --- a/gobject/gobjectmodule.c +++ b/gobject/gobjectmodule.c @@ -3501,7 +3501,10 @@ struct _PyGObject_Functions pygobject_api_functions = { disable_warning_redirections, pyg_type_register_custom_callback, - pyg_gerror_exception_check + pyg_gerror_exception_check, + + pyg_option_group_new + }; #define REGISTER_TYPE(d, type, name) \ diff --git a/gobject/pygobject.h b/gobject/pygobject.h index ef19f67..76ab437 100644 --- a/gobject/pygobject.h +++ b/gobject/pygobject.h @@ -198,9 +198,10 @@ struct _PyGObject_Functions { PyGTypeRegistrationFunction callback, gpointer data); gboolean (*gerror_exception_check) (GError **error); - + PyObject* (*option_group_new) (GOptionGroup *group); }; + #ifndef _INSIDE_PYGOBJECT_ #if defined(NO_IMPORT) || defined(NO_IMPORT_PYGOBJECT) @@ -262,6 +263,7 @@ struct _PyGObject_Functions *_PyGObject_API; #define pyg_disable_warning_redirections (_PyGObject_API->disable_warning_redirections) #define pyg_type_register_custom_callback (_PyGObject_API->type_register_custom) #define pyg_gerror_exception_check (_PyGObject_API->gerror_exception_check) +#define pyg_option_group_new (_PyGObject_API->option_group_new) #define pyg_block_threads() G_STMT_START { \ |