? 377382-v2.diff
? 377382.diff
Index: atk/atkobjectfactory.c
===================================================================
RCS file: /cvs/gnome/atk/atk/atkobjectfactory.c,v
retrieving revision 1.9
diff -u -d -r1.9 atkobjectfactory.c
--- atk/atkobjectfactory.c	16 Nov 2005 15:37:08 -0000	1.9
+++ atk/atkobjectfactory.c	20 Nov 2006 13:47:12 -0000
@@ -80,10 +80,12 @@
 
   klass = ATK_OBJECT_FACTORY_GET_CLASS (factory);
 
-  if (klass->create_accessible)
-  {
-      accessible = klass->create_accessible (obj);
-  }
+  if (klass->create_accessible_obj)
+    accessible = klass->create_accessible_obj (factory, obj);
+  /* backwards compatibility */
+  else if (klass->create_accessible)
+    accessible = klass->create_accessible (obj);
+
   return accessible;
 } 
 
@@ -125,7 +127,10 @@
   g_return_val_if_fail (ATK_OBJECT_FACTORY (factory), G_TYPE_INVALID);
 
   klass = ATK_OBJECT_FACTORY_GET_CLASS (factory);
-  if (klass->get_accessible_type)
+  if (klass->get_accessible_obj_type)
+     return (klass->get_accessible_obj_type) (factory);
+  /* backwards compatibility */
+  else if (klass->get_accessible_type)
      return (klass->get_accessible_type) ();
   else
      return G_TYPE_INVALID;
Index: atk/atkobjectfactory.h
===================================================================
RCS file: /cvs/gnome/atk/atk/atkobjectfactory.h,v
retrieving revision 1.4
diff -u -d -r1.4 atkobjectfactory.h
--- atk/atkobjectfactory.h	27 Feb 2002 08:25:02 -0000	1.4
+++ atk/atkobjectfactory.h	20 Nov 2006 13:47:12 -0000
@@ -46,12 +46,12 @@
 {
   GObjectClass parent_class;
 
-  AtkObject* (* create_accessible) (GObject          *obj);
+  AtkObject* (* create_accessible) (GObject          *obj); /* deprecated */
   void       (* invalidate)        (AtkObjectFactory *factory);
-  GType      (* get_accessible_type)    (void);
-
-  AtkFunction pad1;
-  AtkFunction pad2;
+  GType      (* get_accessible_type)    (void); /* deprecated */
+  GType      (* get_accessible_obj_type) (AtkObjectFactory *factory);
+  AtkObject* (* create_accessible_obj) (AtkObjectFactory *factory,
+					GObject          *obj);
 };
 
 GType atk_object_factory_get_type(void);
