Make use of parent_class consistent; define as gpointer and use

* atk/atkgobjectaccessible.c atk/atkhyperlink.c atk/atknoopobject.c
atk/atknoopobjectfactory.c atkobject.c atk/atkobjectfactory.c
atk/atkregistry.c atk/atkrelation.c atk/atkrelationset.c:
Make use of parent_class consistent; define as gpointer and
use g_type_class_peek_parent() to get it

* atk/atktext.c:
Delete unused empty line

* atk/atkregistry.c atk/atkrelation.c:
Make parent_class static

diff --git a/ChangeLog b/ChangeLog
index 65d5b15..0728c8c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2002-02-22  Padraig O'Briain  <padraig.obriain@sun.com>
+
+       * atk/atkgobjectaccessible.c atk/atkhyperlink.c atk/atknoopobject.c
+       atk/atknoopobjectfactory.c atkobject.c atk/atkobjectfactory.c
+       atk/atkregistry.c atk/atkrelation.c atk/atkrelationset.c:
+       Make use of parent_class consistent; define as gpointer and
+       use g_type_class_peek_parent() to get it
+
+       * atk/atktext.c:
+       Delete unused empty line
+
+       * atk/atkregistry.c atk/atkrelation.c:
+       Make parent_class static 
+
 2002-02-20  Padraig O'Briain  <padraig.obriain@sun.com>
 
        * atk/atktext.c:

diff --git a/atk/atkgobjectaccessible.c b/atk/atkgobjectaccessible.c
index 377d436..35517a5 100644 (file)
--- a/atk/atkgobjectaccessible.c
+++ b/atk/atkgobjectaccessible.c
@@ -26,7 +26,7 @@ static void       atk_gobject_accessible_dispose          (gpointer          dat
 
 static GQuark quark_accessible_object = 0;
 static GQuark quark_object = 0;
-static AtkObjectClass *parent_class = NULL;
+static gpointer parent_class = NULL;
 
 GType
 atk_gobject_accessible_get_type (void)
@@ -140,7 +140,7 @@ atk_gobject_accessible_class_init (AtkGObjectAccessibleClass *klass)
 
   class = ATK_OBJECT_CLASS (klass);
 
-  parent_class = g_type_class_ref (ATK_TYPE_OBJECT);
+  parent_class = g_type_class_peek_parent (klass);
 
   class->initialize = atk_real_gobject_accessible_initialize;
 

diff --git a/atk/atkhyperlink.c b/atk/atkhyperlink.c
index fd4883d..65dfe13 100755 (executable)
--- a/atk/atkhyperlink.c
+++ b/atk/atkhyperlink.c
@@ -64,7 +64,7 @@ atk_hyperlink_get_type (void)
 static void
 atk_hyperlink_class_init (AtkHyperlinkClass *klass)
 {
-  parent_class = g_type_class_ref (G_TYPE_OBJECT);
+  parent_class = g_type_class_peek_parent (klass);
 
 }
 

diff --git a/atk/atknoopobject.c b/atk/atknoopobject.c
index f5576dd..fcbf40a 100644 (file)
--- a/atk/atknoopobject.c
+++ b/atk/atknoopobject.c
@@ -128,7 +128,7 @@ atk_no_op_object_get_type (void)
 static void
 atk_no_op_object_class_init (AtkNoOpObjectClass *klass)
 {
-  parent_class = g_type_class_ref (ATK_TYPE_OBJECT);
+  parent_class = g_type_class_peek_parent (klass);
 }
 
 /**

diff --git a/atk/atknoopobjectfactory.c b/atk/atknoopobjectfactory.c
index 2315bfd..3a0c749 100755 (executable)
--- a/atk/atknoopobjectfactory.c
+++ b/atk/atknoopobjectfactory.c
@@ -27,7 +27,7 @@ static void atk_no_op_object_factory_class_init (
 static AtkObject* atk_no_op_object_factory_create_accessible (
                               GObject                          *obj);
 
-static AtkNoOpObjectFactoryClass    *parent_class = NULL;
+static gpointer    parent_class = NULL;
 
 GType
 atk_no_op_object_factory_get_type (void)
@@ -62,7 +62,7 @@ atk_no_op_object_factory_class_init (AtkNoOpObjectFactoryClass *klass)
 {
   AtkObjectFactoryClass *class = ATK_OBJECT_FACTORY_CLASS (klass);
 
-  parent_class = g_type_class_ref (ATK_TYPE_OBJECT_FACTORY);
+  parent_class = g_type_class_peek_parent (klass);
 
   class->create_accessible = atk_no_op_object_factory_create_accessible;
 }

diff --git a/atk/atkobject.c b/atk/atkobject.c
index 00bb08a..1cc092a 100755 (executable)
--- a/atk/atkobject.c
+++ b/atk/atkobject.c
@@ -149,7 +149,7 @@ atk_object_class_init (AtkObjectClass *klass)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
-  parent_class = g_type_class_ref (G_TYPE_OBJECT);
+  parent_class = g_type_class_peek_parent (klass);
 
   gobject_class->set_property = atk_object_real_set_property;
   gobject_class->get_property = atk_object_real_get_property;

diff --git a/atk/atkobjectfactory.c b/atk/atkobjectfactory.c
index 14c7615..c50dddf 100755 (executable)
--- a/atk/atkobjectfactory.c
+++ b/atk/atkobjectfactory.c
@@ -52,7 +52,7 @@ atk_object_factory_get_type (void)
 static void 
 atk_object_factory_class_init (AtkObjectFactoryClass *klass)
 {
-  parent_class = g_type_class_ref (G_TYPE_OBJECT);
+  parent_class = g_type_class_peek_parent (klass);
 
 }
 

diff --git a/atk/atkregistry.c b/atk/atkregistry.c
index a6598de..22252de 100644 (file)
--- a/atk/atkregistry.c
+++ b/atk/atkregistry.c
@@ -28,7 +28,7 @@ static void              atk_registry_finalize       (GObject          *instance
 static void              atk_registry_class_init     (AtkRegistryClass *klass);
 static AtkRegistry*      atk_registry_new            (void);
 
-GObjectClass *parent_class;
+static gpointer parent_class = NULL;
 
 GType
 atk_registry_get_type (void)
@@ -110,7 +110,7 @@ atk_registry_finalize (GObject *object)
   g_hash_table_destroy (registry->factory_type_registry);
   g_hash_table_destroy (registry->factory_singleton_cache);
 
-  parent_class->finalize (object);
+  G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 /**

diff --git a/atk/atkrelation.c b/atk/atkrelation.c
index edb3a6e..be7e4be 100755 (executable)
--- a/atk/atkrelation.c
+++ b/atk/atkrelation.c
@@ -25,7 +25,7 @@
 
 GPtrArray *extra_names = NULL;
 
-GObjectClass *parent_class;
+static gpointer parent_class = NULL;
   
 static void atk_relation_class_init (AtkRelationClass *klass);
 static void atk_relation_finalize   (GObject          *object);
@@ -272,5 +272,5 @@ atk_relation_finalize (GObject *object)
     g_ptr_array_free (relation->target, TRUE);
   } 
 
-  parent_class->finalize (object);
+  G_OBJECT_CLASS (parent_class)->finalize (object);
 }

diff --git a/atk/atkrelationset.c b/atk/atkrelationset.c
index f8a219a..40bf487 100755 (executable)
--- a/atk/atkrelationset.c
+++ b/atk/atkrelationset.c
@@ -21,7 +21,7 @@
 
 #include "atk.h"
 
-static GObjectClass *parent_class;
+static gpointer parent_class = NULL;
 
 static void atk_relation_set_class_init (AtkRelationSetClass  *klass);
 static void atk_relation_set_finalize   (GObject              *object);
@@ -262,5 +262,5 @@ atk_relation_set_finalize (GObject *object)
     g_ptr_array_free (array, TRUE);
   }
 
-  parent_class->finalize (object);
+  G_OBJECT_CLASS (parent_class)->finalize (object);
 }

diff --git a/atk/atktext.c b/atk/atktext.c
index 4d8378c..0fb9530 100755 (executable)
--- a/atk/atktext.c
+++ b/atk/atktext.c
@@ -51,7 +51,6 @@ static const gchar *stretch[] = {"ultra_condensed",
 static const gchar *justification[] = {"left",
                                        "right",
                                        "center",
-
                                        "fill"};
 static const gchar *direction[] = {"none",
                                    "ltr",