diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | gobject/pygobject-private.h | 8 | ||||
| -rw-r--r-- | gobject/pygobject.h | 6 |
3 files changed, 16 insertions, 7 deletions
@@ -1,3 +1,12 @@ +2006-08-15 Murray Cumming <murrayc@murrayc.com> + + * gobject/pygobject-private.h: + * gobject/pygobject.h: + Replace uses of typename with type_name, because that is a + reserved C++ keyword. This was breaking compilation of Glom + due its use in the new type_register_custom function pointer in + pygobject.h. + 2006-08-12 John Finlay <finlay@moeraki.com> * pygobject-2.0.pc.in: Add reference to installed pygobject docs diff --git a/gobject/pygobject-private.h b/gobject/pygobject-private.h index 9553600..ed1cd05 100644 --- a/gobject/pygobject-private.h +++ b/gobject/pygobject-private.h @@ -136,7 +136,7 @@ void pygobject_watch_closure (PyObject *self, GClosure *closure); void pygobject_register_sinkfunc(GType type, void (* sinkfunc)(GObject *object)); int pyg_type_register (PyTypeObject *class, - const gchar *typename); + const gchar *type_name); /* from pygboxed.c */ extern PyTypeObject PyGBoxed_Type; @@ -165,7 +165,7 @@ extern PyTypeObject PyGFlags_Type; #define PyGFlags_Check(x) (g_type_is_a(((PyGFlags*)x)->gtype, G_TYPE_FLAGS)) extern PyObject * pyg_flags_add (PyObject * module, - const char * typename, + const char * type_name, const char * strip_prefix, GType gtype); extern PyObject * pyg_flags_from_gtype (GType gtype, @@ -182,7 +182,7 @@ typedef struct { extern PyTypeObject PyGEnum_Type; extern PyObject * pyg_enum_add (PyObject * module, - const char * typename, + const char * type_name, const char * strip_prefix, GType gtype); extern PyObject * pyg_enum_from_gtype (GType gtype, @@ -254,7 +254,7 @@ PyObject * pyg_option_group_new (GOptionGroup * group); GOptionGroup *pyg_option_group_transfer_group(PyGOptionGroup *self); extern GHashTable *custom_type_registration; -void pyg_type_register_custom_callback(const gchar *typename, +void pyg_type_register_custom_callback(const gchar *type_name, PyGTypeRegistrationFunction callback, gpointer data); PyTypeObject * pyg_type_get_custom(const gchar *name); diff --git a/gobject/pygobject.h b/gobject/pygobject.h index db6e36c..ce4ee00 100644 --- a/gobject/pygobject.h +++ b/gobject/pygobject.h @@ -145,14 +145,14 @@ struct _PyGObject_Functions { const GParamSpec* pspec); PyTypeObject *enum_type; PyObject *(*enum_add)(PyObject *module, - const char *typename_, + const char *type_name_, const char *strip_prefix, GType gtype); PyObject* (*enum_from_gtype)(GType gtype, int value); PyTypeObject *flags_type; PyObject *(*flags_add)(PyObject *module, - const char *typename_, + const char *type_name_, const char *strip_prefix, GType gtype); PyObject* (*flags_from_gtype)(GType gtype, int value); @@ -178,7 +178,7 @@ struct _PyGObject_Functions { void (*add_warning_redirection) (const char *domain, PyObject *warning); void (*disable_warning_redirections) (void); - void (*type_register_custom)(const gchar *typename, + void (*type_register_custom)(const gchar *type_name, PyGTypeRegistrationFunction callback, gpointer data); |