summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric Bail <cedric.bail@free.fr>2013-03-15 10:47:05 +0100
committerCedric Bail <cedric.bail@free.fr>2013-03-16 15:40:33 +0900
commitebdb49cf0ea52f86f5ff572e2831e3d0b4f6e5bb (patch)
tree5fe25c0c3ac2a4c1ae8bfd32fc6c250789b38cde
parentb4becd5d7acb737ded54a3e2d440709b5fd3adc3 (diff)
downloadefl-ebdb49cf0ea52f86f5ff572e2831e3d0b4f6e5bb.tar.gz
efreet: avoid symbol collision.
-rw-r--r--src/bin/efreet/efreetd_dbus.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/bin/efreet/efreetd_dbus.c b/src/bin/efreet/efreetd_dbus.c
index b9f1c6dfe1..0b305ea6f4 100644
--- a/src/bin/efreet/efreetd_dbus.c
+++ b/src/bin/efreet/efreetd_dbus.c
@@ -22,7 +22,7 @@ enum
static EDBus_Connection *conn;
static EDBus_Service_Interface *iface;
-static Ecore_Timer *shutdown = NULL;
+static Ecore_Timer *_shutdown = NULL;
static int clients = 0;
static Eina_Bool
@@ -50,8 +50,8 @@ client_name_owner_changed_cb(void *data EINA_UNUSED, const char *bus, const char
if (clients <= 0)
{
clients = 0;
- if (shutdown) ecore_timer_del(shutdown);
- shutdown = ecore_timer_add(10.0, do_shutdown, NULL);
+ if (_shutdown) ecore_timer_del(_shutdown);
+ _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);
clients++;
- if (shutdown) ecore_timer_del(shutdown);
- shutdown = NULL;
+ if (_shutdown) ecore_timer_del(_shutdown);
+ _shutdown = NULL;
edbus_name_owner_changed_callback_add(conn,
edbus_message_sender_get(message),