From 63f717caaf92b87e272ac0790125246bba105468 Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Wed, 17 Feb 2016 11:28:21 +0000
Subject: [PATCH] Eldbus: Create eldbus_types.eot and start using it.

---
 src/Makefile_Eldbus.am                   | 6 +++++-
 src/lib/eldbus/eldbus_introspection.h    | 3 +--
 src/lib/eldbus/eldbus_model_arguments.eo | 4 ++--
 src/lib/eldbus/eldbus_model_method.eo    | 2 +-
 src/lib/eldbus/eldbus_model_signal.eo    | 2 +-
 src/lib/eldbus/eldbus_types.eot          | 1 +
 6 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 src/lib/eldbus/eldbus_types.eot

diff --git a/src/Makefile_Eldbus.am b/src/Makefile_Eldbus.am
index 107288eb76..9326fe3fa8 100644
--- a/src/Makefile_Eldbus.am
+++ b/src/Makefile_Eldbus.am
@@ -1,6 +1,9 @@
 
 ### Library
 
+eldbus_eolian_type_files = \
+    lib/eldbus/eldbus_types.eot
+
 eldbus_eolian_files = \
 	lib/eldbus/eldbus_model_connection.eo \
 	lib/eldbus/eldbus_model_object.eo \
@@ -10,7 +13,8 @@ eldbus_eolian_files = \
 	lib/eldbus/eldbus_model_signal.eo
 
 eldbus_eolian_c = $(eldbus_eolian_files:%.eo=%.eo.c)
-eldbus_eolian_h = $(eldbus_eolian_files:%.eo=%.eo.h)
+eldbus_eolian_h = $(eldbus_eolian_files:%.eo=%.eo.h) \
+                  $(eldbus_eolian_type_files:%.eot=%.eot.h)
 
 BUILT_SOURCES += \
 	$(eldbus_eolian_c) \
diff --git a/src/lib/eldbus/eldbus_introspection.h b/src/lib/eldbus/eldbus_introspection.h
index 542a474e32..4fc297830d 100644
--- a/src/lib/eldbus/eldbus_introspection.h
+++ b/src/lib/eldbus/eldbus_introspection.h
@@ -4,8 +4,7 @@
 #include <Eina.h>
 #include <Eo.h>
 
-typedef struct _Eldbus_Proxy          Eldbus_Proxy;
-
+#include "eldbus_types.eot.h"
 #include "eldbus_model_arguments.eo.h"
 
 // DTD conversion form: http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd
diff --git a/src/lib/eldbus/eldbus_model_arguments.eo b/src/lib/eldbus/eldbus_model_arguments.eo
index 5a74690938..f15d1da987 100644
--- a/src/lib/eldbus/eldbus_model_arguments.eo
+++ b/src/lib/eldbus/eldbus_model_arguments.eo
@@ -1,4 +1,4 @@
-struct @extern Eldbus_Proxy; /* FIXME: Move to Eot file. */
+import eldbus_types;
 
 enum Eldbus.Introspection.Argument_Direction
 {
@@ -22,7 +22,7 @@ class Eldbus.Model_Arguments (Eo.Base, Efl.Model.Base) {
 
             @since 1.16]]
             params {
-                @in proxy: Eldbus_Proxy*; [[Eldbus proxy]]
+                @in proxy: Eldbus.Proxy*; [[Eldbus proxy]]
                 @in name: const(char)*; [[Name]]
                 @in arguments: const(list<Eldbus.Introspection.Argument *>)*; [[The introspected arguments]]
             }
diff --git a/src/lib/eldbus/eldbus_model_method.eo b/src/lib/eldbus/eldbus_model_method.eo
index 8b9d71411f..dc5f810c7b 100644
--- a/src/lib/eldbus/eldbus_model_method.eo
+++ b/src/lib/eldbus/eldbus_model_method.eo
@@ -6,7 +6,7 @@ class Eldbus.Model_Method (Eldbus.Model_Arguments) {
 
               @since 1.16]]
             params {
-                @in proxy: Eldbus_Proxy*; [[Eldbus proxy]]
+                @in proxy: Eldbus.Proxy*; [[Eldbus proxy]]
                 @in method: const(Eldbus_Introspection_Method)*; [[The introspected method]]
             }
         }
diff --git a/src/lib/eldbus/eldbus_model_signal.eo b/src/lib/eldbus/eldbus_model_signal.eo
index 237b149dbe..3a090a33a4 100644
--- a/src/lib/eldbus/eldbus_model_signal.eo
+++ b/src/lib/eldbus/eldbus_model_signal.eo
@@ -6,7 +6,7 @@ class Eldbus.Model_Signal (Eldbus.Model_Arguments) {
 
                 @since 1.16]]
             params {
-                @in proxy: Eldbus_Proxy*; [[Eldbus proxy]]
+                @in proxy: Eldbus.Proxy*; [[Eldbus proxy]]
                 @in signal: const(Eldbus_Introspection_Signal)*; [[The introspected method]]
             }
         }
diff --git a/src/lib/eldbus/eldbus_types.eot b/src/lib/eldbus/eldbus_types.eot
new file mode 100644
index 0000000000..dcad2ed96e
--- /dev/null
+++ b/src/lib/eldbus/eldbus_types.eot
@@ -0,0 +1 @@
+struct Eldbus.Proxy;