enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 6 Projects Releases Wiki Activity

efreet: avoid symbol collision.

This commit is contained in:
Cedric Bail 2013-03-15 10:47:05 +01:00
parent b4becd5d7a
commit ebdb49cf0e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/bin/efreet/efreetd_dbus.c
View File

@ -22,7 +22,7 @@ enum
static EDBus_Connection *conn; static EDBus_Connection *conn;
static EDBus_Service_Interface *iface; static EDBus_Service_Interface *iface;
static Ecore_Timer *shutdown = NULL; static Ecore_Timer *_shutdown = NULL;
static int clients = 0; static int clients = 0;
static Eina_Bool static Eina_Bool
@ -50,8 +50,8 @@ client_name_owner_changed_cb(void *data EINA_UNUSED, const char *bus, const char
if (clients <= 0) if (clients <= 0)
{ {
clients = 0; clients = 0;
if (shutdown) ecore_timer_del(shutdown); if (_shutdown) ecore_timer_del(_shutdown);
shutdown = ecore_timer_add(10.0, do_shutdown, NULL); _shutdown = ecore_timer_add(10.0, do_shutdown, NULL);
} }
} }
@ -69,8 +69,8 @@ do_register(const EDBus_Service_Interface *ifc EINA_UNUSED, const EDBus_Message
setenv("LANG", lang, 1); setenv("LANG", lang, 1);
clients++; clients++;
if (shutdown) ecore_timer_del(shutdown); if (_shutdown) ecore_timer_del(_shutdown);
shutdown = NULL; _shutdown = NULL;
edbus_name_owner_changed_callback_add(conn, edbus_name_owner_changed_callback_add(conn,
edbus_message_sender_get(message), edbus_message_sender_get(message),