summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSrivardhan Hebbar <sri.hebbar@samsung.com>2016-01-04 12:35:37 -0800
committerCedric BAIL <cedric@osg.samsung.com>2016-01-04 12:35:41 -0800
commitdc560521509b93a58905c8280d7cf9622d4e87c4 (patch)
tree67693c7f5dcc37fd45d8fde24731536b24f967a6
parent8c6adac0a5cd5decd3fd1688d1a45f368150ab83 (diff)
ecore_con: from ecore_con_connector to efl_network_connector.
Summary: Changed ecore_con_connector.eo to efl_network_connector.eo as part of migrating to efl_network. Signed-off-by: Srivardhan Hebbar <sri.hebbar@samsung.com> Reviewers: cedric, jpeg Differential Revision: https://phab.enlightenment.org/D3427 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
-rw-r--r--src/Makefile_Ecore_Con.am2
-rw-r--r--src/lib/ecore_con/Ecore_Con_Eo.h2
-rw-r--r--src/lib/ecore_con/Ecore_Con_Legacy.h2
-rw-r--r--src/lib/ecore_con/ecore_con.c8
-rw-r--r--src/lib/ecore_con/ecore_con_connector.eo8
-rw-r--r--src/lib/ecore_con/efl_network_connector.eo7
6 files changed, 14 insertions, 15 deletions
diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am
index 544e6d949f..8ed6b08f2f 100644
--- a/src/Makefile_Ecore_Con.am
+++ b/src/Makefile_Ecore_Con.am
@@ -5,7 +5,7 @@ ecore_con_eolian_files = \
5 lib/ecore_con/ecore_con_base.eo \ 5 lib/ecore_con/ecore_con_base.eo \
6 lib/ecore_con/ecore_con_client.eo \ 6 lib/ecore_con/ecore_con_client.eo \
7 lib/ecore_con/ecore_con_server.eo \ 7 lib/ecore_con/ecore_con_server.eo \
8 lib/ecore_con/ecore_con_connector.eo \ 8 lib/ecore_con/efl_network_connector.eo \
9 lib/ecore_con/ecore_con_eet_base.eo \ 9 lib/ecore_con/ecore_con_eet_base.eo \
10 lib/ecore_con/ecore_con_eet_server_obj.eo \ 10 lib/ecore_con/ecore_con_eet_server_obj.eo \
11 lib/ecore_con/ecore_con_eet_client_obj.eo \ 11 lib/ecore_con/ecore_con_eet_client_obj.eo \
diff --git a/src/lib/ecore_con/Ecore_Con_Eo.h b/src/lib/ecore_con/Ecore_Con_Eo.h
index 2ccaabe0ff..460e15ed1c 100644
--- a/src/lib/ecore_con/Ecore_Con_Eo.h
+++ b/src/lib/ecore_con/Ecore_Con_Eo.h
@@ -1,5 +1,5 @@
1#include "ecore_con_base.eo.h" 1#include "ecore_con_base.eo.h"
2#include "ecore_con_server.eo.h" 2#include "ecore_con_server.eo.h"
3#include "ecore_con_connector.eo.h" 3#include "efl_network_connector.eo.h"
4#include "ecore_con_client.eo.h" 4#include "ecore_con_client.eo.h"
5#include "efl_network_url.eo.h" 5#include "efl_network_url.eo.h"
diff --git a/src/lib/ecore_con/Ecore_Con_Legacy.h b/src/lib/ecore_con/Ecore_Con_Legacy.h
index 44de302e19..6f9b3f3165 100644
--- a/src/lib/ecore_con/Ecore_Con_Legacy.h
+++ b/src/lib/ecore_con/Ecore_Con_Legacy.h
@@ -5,7 +5,7 @@
5 5
6#include "ecore_con_base.eo.legacy.h" 6#include "ecore_con_base.eo.legacy.h"
7#include "ecore_con_server.eo.legacy.h" 7#include "ecore_con_server.eo.legacy.h"
8#include "ecore_con_connector.eo.legacy.h" 8#include "efl_network_connector.eo.legacy.h"
9#include "ecore_con_client.eo.legacy.h" 9#include "ecore_con_client.eo.legacy.h"
10 10
11 11
diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index 991d8c680c..1205439915 100644
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -306,7 +306,7 @@ _ecore_con_base_lookup(Eo *kls_obj EINA_UNUSED, void *pd EINA_UNUSED, const char
306 if (!name || !done_cb) 306 if (!name || !done_cb)
307 return EINA_FALSE; 307 return EINA_FALSE;
308 308
309 obj = eo_add(ECORE_CON_CONNECTOR_CLASS, NULL, 309 obj = eo_add(EFL_NETWORK_CONNECTOR_CLASS, NULL,
310 ecore_con_server_obj_connection_type_set(ECORE_CON_REMOTE_TCP), 310 ecore_con_server_obj_connection_type_set(ECORE_CON_REMOTE_TCP),
311 ecore_con_server_obj_name_set(name), 311 ecore_con_server_obj_name_set(name),
312 ecore_con_obj_port_set(1025)); 312 ecore_con_obj_port_set(1025));
@@ -462,7 +462,7 @@ ecore_con_server_connect(Ecore_Con_Type compl_type,
462 /* local user socket: FILE: ~/.ecore/[name]/[port] */ 462 /* local user socket: FILE: ~/.ecore/[name]/[port] */
463 /* local system socket: FILE: /tmp/.ecore_service|[name]|[port] */ 463 /* local system socket: FILE: /tmp/.ecore_service|[name]|[port] */
464 /* remote system socket: TCP/IP: [name]:[port] */ 464 /* remote system socket: TCP/IP: [name]:[port] */
465 obj = eo_add(ECORE_CON_CONNECTOR_CLASS, NULL, 465 obj = eo_add(EFL_NETWORK_CONNECTOR_CLASS, NULL,
466 ecore_con_server_obj_connection_type_set(compl_type), 466 ecore_con_server_obj_connection_type_set(compl_type),
467 ecore_con_server_obj_name_set(name), 467 ecore_con_server_obj_name_set(name),
468 ecore_con_obj_port_set(port)); 468 ecore_con_obj_port_set(port));
@@ -473,7 +473,7 @@ ecore_con_server_connect(Ecore_Con_Type compl_type,
473} 473}
474 474
475EOLIAN static Eo * 475EOLIAN static Eo *
476_ecore_con_connector_eo_base_finalize(Ecore_Con_Server *obj, void *pd EINA_UNUSED) 476_efl_network_connector_eo_base_finalize(Ecore_Con_Server *obj, void *pd EINA_UNUSED)
477{ 477{
478 Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); 478 Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS);
479 Ecore_Con_Type compl_type = svr->type; 479 Ecore_Con_Type compl_type = svr->type;
@@ -3004,4 +3004,4 @@ _ecore_con_lookup_done(void *data,
3004#include "ecore_con_base.eo.c" 3004#include "ecore_con_base.eo.c"
3005#include "ecore_con_client.eo.c" 3005#include "ecore_con_client.eo.c"
3006#include "ecore_con_server.eo.c" 3006#include "ecore_con_server.eo.c"
3007#include "ecore_con_connector.eo.c" 3007#include "efl_network_connector.eo.c"
diff --git a/src/lib/ecore_con/ecore_con_connector.eo b/src/lib/ecore_con/ecore_con_connector.eo
deleted file mode 100644
index 9952637c94..0000000000
--- a/src/lib/ecore_con/ecore_con_connector.eo
+++ /dev/null
@@ -1,8 +0,0 @@
1class Ecore.Con.Connector (Ecore.Con.Server) {
2 legacy_prefix: null;
3 eo_prefix: ecore_con_connector_obj;
4 data: null;
5 implements {
6 Eo.Base.finalize;
7 }
8}
diff --git a/src/lib/ecore_con/efl_network_connector.eo b/src/lib/ecore_con/efl_network_connector.eo
new file mode 100644
index 0000000000..ef92d77c2c
--- /dev/null
+++ b/src/lib/ecore_con/efl_network_connector.eo
@@ -0,0 +1,7 @@
1class Efl.Network.Connector (Ecore.Con.Server) {
2 eo_prefix: efl_network_connector_obj;
3 data: null;
4 implements {
5 Eo.Base.finalize;
6 }
7}