hugok
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix init() 

Add shutdown()


SVN revision: 16653
This commit is contained in:
sebastid 2005-09-07 09:14:31 +00:00 committed by sebastid
parent 858d9fecdf
commit 0a78f5f752
2 changed files with 45 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/ecore/src/lib/ecore_dbus/Ecore_DBus.h
View File

@ -199,6 +199,8 @@ extern "C" {
/* connection */
EAPI int ecore_dbus_init(void);
EAPI int ecore_dbus_shutdown(void);
EAPI Ecore_DBus_Server* ecore_dbus_server_connect(Ecore_DBus_Type compl_type, char *name, int port, const void *data);
/* message */
EAPI unsigned int ecore_dbus_message_new_method_call(Ecore_DBus_Server *svr,char *service,char *path,char *interface,char *method,char *fmt, ...);

69
legacy/ecore/src/lib/ecore_dbus/ecore_dbus.c
View File

@ -972,8 +972,9 @@ static const Ecore_DBus_Auth auths[] = {
{"SKEY", 0, {NULL, NULL, NULL, NULL, NULL}},
};
static int init_count = 0;
static Ecore_List *servers = NULL;
static int init_count = 0;
static Ecore_List *servers = NULL;
static Ecore_Event_Handler *handler[6];
static int _ecore_dbus_event_client_add(void *data, int ev_type,
void *ev);
@ -993,31 +994,47 @@ void _ecore_dbus_message_free(void *data, void *ev);
int
ecore_dbus_init(void)
{
if (!init_count)
ecore_con_init();
init_count++;
if (!ECORE_DBUS_EVENT_CLIENT_ADD)
{
ECORE_DBUS_EVENT_CLIENT_ADD = ecore_event_type_new();
ECORE_DBUS_EVENT_CLIENT_DEL = ecore_event_type_new();
ECORE_DBUS_EVENT_SERVER_ADD = ecore_event_type_new();
ECORE_DBUS_EVENT_SERVER_DEL = ecore_event_type_new();
ECORE_DBUS_EVENT_CLIENT_DATA = ecore_event_type_new();
ECORE_DBUS_EVENT_SERVER_DATA = ecore_event_type_new();
int i = 0;
if (++init_count != 1) return init_count;
ecore_con_init();
ECORE_DBUS_EVENT_CLIENT_ADD = ecore_event_type_new();
ECORE_DBUS_EVENT_CLIENT_DEL = ecore_event_type_new();
ECORE_DBUS_EVENT_SERVER_ADD = ecore_event_type_new();
ECORE_DBUS_EVENT_SERVER_DEL = ecore_event_type_new();
ECORE_DBUS_EVENT_CLIENT_DATA = ecore_event_type_new();
ECORE_DBUS_EVENT_SERVER_DATA = ecore_event_type_new();
handler[i++] = ecore_event_handler_add(ECORE_CON_EVENT_CLIENT_ADD,
_ecore_dbus_event_client_add, NULL);
handler[i++] = ecore_event_handler_add(ECORE_CON_EVENT_CLIENT_DEL,
_ecore_dbus_event_client_del, NULL);
handler[i++] = ecore_event_handler_add(ECORE_CON_EVENT_SERVER_ADD,
_ecore_dbus_event_server_add, NULL);
handler[i++] = ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DEL,
_ecore_dbus_event_server_del, NULL);
handler[i++] = ecore_event_handler_add(ECORE_CON_EVENT_CLIENT_DATA,
_ecore_dbus_event_client_data, NULL);
handler[i++] = ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DATA,
_ecore_dbus_event_server_data, NULL);
return init_count;
}
int
ecore_dbus_shutdown(void)
{
int i = 0;
if (--init_count != 0) return init_count;
for (i = 0; i < 6; i++)
ecore_event_handler_del(handler[i]);
ecore_con_shutdown();
ecore_event_handler_add(ECORE_CON_EVENT_CLIENT_ADD,
_ecore_dbus_event_client_add, NULL);
ecore_event_handler_add(ECORE_CON_EVENT_CLIENT_DEL,
_ecore_dbus_event_client_del, NULL);
ecore_event_handler_add(ECORE_CON_EVENT_SERVER_ADD,
_ecore_dbus_event_server_add, NULL);
ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DEL,
_ecore_dbus_event_server_del, NULL);
ecore_event_handler_add(ECORE_CON_EVENT_CLIENT_DATA,
_ecore_dbus_event_client_data, NULL);
ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DATA,
_ecore_dbus_event_server_data, NULL);
}
return init_count;
}