1 files changed, 20 insertions, 76 deletions

diff --git a/src/lib/elementary/a11y/elm_atspi_adaptor.eo b/src/lib/elementary/a11y/elm_atspi_adaptor.eo
index 06849bfe4a..f8d0dfda5b 100644
--- a/src/lib/elementary/a11y/elm_atspi_adaptor.eo
+++ b/src/lib/elementary/a11y/elm_atspi_adaptor.eo
@@ -1,107 +1,51 @@
 import eldbus_types;
 
-struct Eldbus.Message;
-struct Eldbus.Message.Iter;
 struct Eldbus.Service.Interface;
-struct Eldbus.Arg.Info;
-
-struct Elm.Atspi.Dbus.Reference
-{
-   bus: string;
-   path: string;
-}
-
-function Elm.Atspi.Method
-{
-   params {
-        @in subject: Efl.Access;
-        @in msg: ptr(Eldbus.Message);
-   }
-   return: ptr(Eldbus.Message);
-};
-
-function Elm.Atspi.Property.Set
-{
-   params {
-        @in subject: Efl.Access;
-        @in property_name: string;
-        @in iter: ptr(Eldbus.Message.Iter);
-        @in request: ptr(Eldbus.Message);
-   }
-   return: ptr(Eldbus.Message);
-};
-
-function Elm.Atspi.Property.Get
-{
-   params {
-        @in subject: Efl.Access;
-        @in property_name: string;
-        @in iter: ptr(Eldbus.Message.Iter);
-        @in request: ptr(Eldbus.Message);
-        @in error: ptr(ptr(Eldbus.Message));
-   }
-   return: bool;
-};
-
-struct Elm.Atspi.Method.Desc
-{
-   name: string;
-   in: const(ptr(Eldbus.Arg.Info));
-   out: const(ptr(Eldbus.Arg.Info));
-   func: Elm.Atspi.Method;
-}
-
-struct Elm.Atspi.Property.Desc
-{
-   name: string;
-   type: string;
-   set: Elm.Atspi.Property.Set;
-   get: Elm.Atspi.Property.Get;
-}
-
-struct Elm.Atspi.Interface.Desc
-{
-   name: string;
-   methods: const(ptr(Elm.Atspi.Method.Desc));
-   properties: const(ptr(Elm.Atspi.Property.Desc));
-}
+struct Eldbus.Message;
+struct Eldbus.Service.Interface.Desc2;
 
 abstract Elm.Atspi.Adaptor (Efl.Object)
 {
    [[Base class for accessibility adaptors]]
    methods {
-        address_from_object @protected {
-             params {
-                  @in obj: Efl.Access;
-             }
-             return: Elm.Atspi.Dbus.Reference;
-        }
-        object_from_address @protected {
+        object_get {
              params {
-                  @in obj: Elm.Atspi.Dbus.Reference;
+                  @in conn: ptr(Eldbus.Connection);
+                  @in path: string;
              }
              return: Efl.Access;
         }
         @property cache {
+             get {
+             }
+             set {
+             }
              values {
                   cache: Efl.Access.Cache;
              }
         }
-        @property interface @protected {
-             get {
+        @property interface @protected @pure_virtual {
+             get @protected {
              }
              values {
-                  desc: const(ptr(Elm.Atspi.Interface.Desc));
+                  desc: const(ptr(Eldbus.Service.Interface.Desc2));
              }
         }
         register {
              params {
-                  @in desc: ptr(Eldbus.Connection);
+                  @in conn: ptr(Eldbus.Connection);
                   @in path_prefix: string;
              }
         }
+        unregister {
+        }
+   }
+   implements {
+        Efl.Object.constructor;
+        Efl.Object.destructor;
    }
    constructors {
         .cache;
+        .interface;
    }
 }