diff options
| author | Sergey Udaltsov <svu@gnome.org> | 2006-03-04 01:29:35 +0000 |
|---|---|---|
| committer | Sergey Udaltsov <svu@gnome.org> | 2006-03-04 01:29:35 +0000 |
| commit | 9139a74836fe34b3a494868943c2add6f28dbbbb (patch) | |
| tree | 67a7e5dc667f0f8e034d37c4833bba3cace04811 | |
| parent | b6a295f810cb2a5b005b7b6a521db7b760b06898 (diff) | |
| download | libxklavier-9139a74836fe34b3a494868943c2add6f28dbbbb.tar.gz | |
rename g_object_class to parent_class
| -rw-r--r-- | libxklavier/xklavier_config.c | 6 | ||||
| -rw-r--r-- | libxklavier/xklavier_props.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libxklavier/xklavier_config.c b/libxklavier/xklavier_config.c index 01cdd21..bd63fab 100644 --- a/libxklavier/xklavier_config.c +++ b/libxklavier/xklavier_config.c @@ -8,7 +8,7 @@ #include "xklavier_private.h" -static GObjectClass *g_object_class = NULL; +static GObjectClass *parent_class = NULL; static XklConfigRegistry *the_config = NULL; @@ -621,7 +621,7 @@ xkl_config_registry_finalize(GObject * obj) g_free(config->priv); - G_OBJECT_CLASS(g_object_class)->finalize(obj); + G_OBJECT_CLASS(parent_class)->finalize(obj); } static void @@ -630,6 +630,6 @@ xkl_config_registry_class_init(XklConfigRegistryClass * klass) GObjectClass *object_class; object_class = (GObjectClass *) klass; - g_object_class = g_type_class_peek_parent(object_class); + parent_class = g_type_class_peek_parent(object_class); object_class->finalize = xkl_config_registry_finalize; } diff --git a/libxklavier/xklavier_props.c b/libxklavier/xklavier_props.c index 8b06f5d..5902f38 100644 --- a/libxklavier/xklavier_props.c +++ b/libxklavier/xklavier_props.c @@ -11,7 +11,7 @@ #include "xklavier_private.h" -static GObjectClass *g_object_class = NULL; +static GObjectClass *parent_class = NULL; static void xkl_config_rec_destroy(XklConfigRec * data); @@ -42,7 +42,7 @@ xkl_config_rec_finalize(GObject * obj) { XklConfigRec *this = (XklConfigRec *) obj; xkl_config_rec_destroy(this); - G_OBJECT_CLASS(g_object_class)->finalize(obj); + G_OBJECT_CLASS(parent_class)->finalize(obj); } static void @@ -51,7 +51,7 @@ xkl_config_rec_class_init(XklConfigRecClass * klass) GObjectClass *object_class; object_class = (GObjectClass *) klass; - g_object_class = g_type_class_peek_parent(object_class); + parent_class = g_type_class_peek_parent(object_class); object_class->finalize = xkl_config_rec_finalize; } |