summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorJosé Roberto de Souza <jose.souza@intel.com>2014-12-17 16:44:29 -0200
committerJosé Roberto de Souza <jose.souza@intel.com>2014-12-17 16:58:25 -0200
commit78d5bb17d700f25e84abd5fb3eb4d42590c73474 (patch)
treeea000685d1e10c98bf8a15141a2d2116fa68a9e7 /src/lib
parent110e6c5abb11b33b2e6e3b95eb33d54b9327e67c (diff)
Revert "eldbus hackaround for proxy deletion during pending callback"
This reverts commit 6a08788d59c020aea8e0f24dc072630d5ae61c18. This will be properly fixed on the next patch.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/eldbus/eldbus_pending.c2
-rw-r--r--src/lib/eldbus/eldbus_private_types.h1
2 files changed, 0 insertions, 3 deletions
diff --git a/src/lib/eldbus/eldbus_pending.c b/src/lib/eldbus/eldbus_pending.c
index 53cc47eaed..efa3970701 100644
--- a/src/lib/eldbus/eldbus_pending.c
+++ b/src/lib/eldbus/eldbus_pending.c
@@ -219,8 +219,6 @@ static void
219eldbus_pending_dispatch(Eldbus_Pending *pending, Eldbus_Message *msg) 219eldbus_pending_dispatch(Eldbus_Pending *pending, Eldbus_Message *msg)
220{ 220{
221 DBG("pending=%p msg=%p", pending, msg); 221 DBG("pending=%p msg=%p", pending, msg);
222 if (pending->called) return;
223 pending->called = 1;
224 if (pending->cb) 222 if (pending->cb)
225 pending->cb((void *)pending->cb_data, msg, pending); 223 pending->cb((void *)pending->cb_data, msg, pending);
226 224
diff --git a/src/lib/eldbus/eldbus_private_types.h b/src/lib/eldbus/eldbus_private_types.h
index 14959d03e6..8ebe682544 100644
--- a/src/lib/eldbus/eldbus_private_types.h
+++ b/src/lib/eldbus/eldbus_private_types.h
@@ -114,7 +114,6 @@ struct _Eldbus_Pending
114 Eina_Inlist *data; 114 Eina_Inlist *data;
115 Eina_Inlist *cbs_free; 115 Eina_Inlist *cbs_free;
116 Eldbus_Message *msg_sent; 116 Eldbus_Message *msg_sent;
117 Eina_Bool called : 1;
118}; 117};
119 118
120struct _Eldbus_Message_Iter 119struct _Eldbus_Message_Iter