enlightenment/clouseau
enlightenment
/
clouseau
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clouseau: Pass appname to client_connect, not init. 

SVN revision: 83689
This commit is contained in:
Tom Hacohen 2013-02-06 15:55:41 +00:00
parent 20df08e176
commit cc28cbfbbc
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/Clouseau.h
View File

@ -50,7 +50,7 @@ struct _Clouseau_Tree_Item
Eina_Bool is_visible;
};
EAPI Eina_Bool clouseau_app_connect(void);
EAPI Eina_Bool clouseau_app_connect(const char *appname);
EAPI void clouseau_app_data_req_cb_set(Eina_List *(*cb)(void));
EAPI void clouseau_app_canvas_bmp_cb_set(void *(*cb)(Ecore_Evas *ee, Evas_Coord *w_out, Evas_Coord *h_out));
EAPI Clouseau_Object *clouseau_object_information_get(Clouseau_Tree_Item *treeit);
@ -59,7 +59,7 @@ EAPI Eina_Bool clouseau_daemon_connect(void);
EAPI Eina_Bool clouseau_client_connect(void);
EAPI Eina_Bool clouseau_disconnect(void);
EAPI int clouseau_init(const char *appname);
EAPI int clouseau_init(void);
EAPI int clouseau_shutdown(void);
/* FIXME: Remove. */

8
src/lib/clouseau.c
View File

@ -265,12 +265,14 @@ clouseau_app_canvas_bmp_cb_set(void *(*cb)(Ecore_Evas *ee, Evas_Coord *w_out, Ev
}
EAPI Eina_Bool
clouseau_app_connect(void)
clouseau_app_connect(const char *appname)
{
Ecore_Con_Server *server;
const char *address = LOCALHOST;
Ecore_Con_Eet *eet_svr = NULL;
eina_stringshare_replace(&_my_appname, appname);
server = ecore_con_server_connect(ECORE_CON_REMOTE_TCP,
LOCALHOST, PORT, NULL);
@ -322,12 +324,10 @@ clouseau_disconnect(void)
}
EAPI int
clouseau_init(const char *appname)
clouseau_init(void)
{
if (++_clouseau_init_count == 1)
{
_my_appname = eina_stringshare_add(appname);
eina_init();
ecore_init();
ecore_con_init();

4
src/lib/clouseau_preload.c
View File

@ -173,11 +173,11 @@ ecore_main_loop_begin(void)
_my_app_name = "clouseau";
}
clouseau_init(_my_app_name);
clouseau_init();
clouseau_app_data_req_cb_set(_load_list);
clouseau_app_canvas_bmp_cb_set(_canvas_bmp_get);
if(!clouseau_app_connect())
if(!clouseau_app_connect(_my_app_name))
{
printf("Failed to connect to server.\n");
return;