summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@samsung.com>2013-12-23 11:24:49 +0900
committerCedric BAIL <cedric.bail@samsung.com>2013-12-23 11:24:49 +0900
commit0a6ce62bb247031aa4139d0b69506ed2ea2cba0d (patch)
tree5f704eabd2b98dc14bfb871186c3b93dc4a209e5 /src
parentb4106c90d9ec4e7a813c74afc6efb3e6a3c5fbbd (diff)
eldbus: don't do a double initialization due to ecore module using eldbus now.
Diffstat (limited to 'src')
-rw-r--r--src/lib/eldbus/eldbus_core.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/eldbus/eldbus_core.c b/src/lib/eldbus/eldbus_core.c
index 58ae28b640..29fd2f3bd1 100644
--- a/src/lib/eldbus/eldbus_core.c
+++ b/src/lib/eldbus/eldbus_core.c
@@ -87,8 +87,8 @@ static void _eldbus_connection_free(Eldbus_Connection *conn);
87EAPI int 87EAPI int
88eldbus_init(void) 88eldbus_init(void)
89{ 89{
90 if (_eldbus_init_count > 0) 90 if (_eldbus_init_count++ > 0)
91 return ++_eldbus_init_count; 91 return _eldbus_init_count;
92 92
93 if (!eina_init()) 93 if (!eina_init())
94 { 94 {
@@ -130,7 +130,7 @@ eldbus_init(void)
130 if (!eldbus_proxy_init()) goto proxy_failed; 130 if (!eldbus_proxy_init()) goto proxy_failed;
131 if (!eldbus_service_init()) goto service_failed; 131 if (!eldbus_service_init()) goto service_failed;
132 132
133 return ++_eldbus_init_count; 133 return _eldbus_init_count;
134 134
135service_failed: 135service_failed:
136 eldbus_proxy_shutdown(); 136 eldbus_proxy_shutdown();