summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/bin/eldbus/source_client.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/bin/eldbus/source_client.c b/src/bin/eldbus/source_client.c
index 8d5fdd143b..8860f0665b 100644
--- a/src/bin/eldbus/source_client.c
+++ b/src/bin/eldbus/source_client.c
@@ -127,7 +127,7 @@ source_client_complex_method_call_generate(const DBus_Method *method, Eina_Strbu
127 eina_strbuf_append_printf(c_code, " p = eldbus_proxy_send(proxy, msg, %s, cb, -1);\n", method->cb_name); 127 eina_strbuf_append_printf(c_code, " p = eldbus_proxy_send(proxy, msg, %s, cb, -1);\n", method->cb_name);
128 eina_strbuf_append_printf(c_code, " if (data)\n"); 128 eina_strbuf_append_printf(c_code, " if (data)\n");
129 eina_strbuf_append_printf(c_code, " eldbus_pending_data_set(p, \"__user_data\", data);\n"); 129 eina_strbuf_append_printf(c_code, " eldbus_pending_data_set(p, \"__user_data\", data);\n");
130 eina_strbuf_append_printf(c_code, " eldbus_pending_data_set(p, \"__proxy\", proxy);\n"); 130 eina_strbuf_append_printf(c_code, " eldbus_pending_data_set(p, \"__user_proxy\", proxy);\n");
131 eina_strbuf_append_printf(c_code, " return p;\n"); 131 eina_strbuf_append_printf(c_code, " return p;\n");
132 eina_strbuf_append_printf(c_code, "}\n"); 132 eina_strbuf_append_printf(c_code, "}\n");
133 133
@@ -210,7 +210,7 @@ source_client_simple_method_call_generate(const DBus_Method *method, Eina_Strbuf
210 eina_strbuf_append_printf(c_code, " p = eldbus_proxy_send(proxy, msg, %s, cb, -1);\n", method->cb_name); 210 eina_strbuf_append_printf(c_code, " p = eldbus_proxy_send(proxy, msg, %s, cb, -1);\n", method->cb_name);
211 eina_strbuf_append_printf(c_code, " if (data)\n"); 211 eina_strbuf_append_printf(c_code, " if (data)\n");
212 eina_strbuf_append_printf(c_code, " eldbus_pending_data_set(p, \"__user_data\", data);\n"); 212 eina_strbuf_append_printf(c_code, " eldbus_pending_data_set(p, \"__user_data\", data);\n");
213 eina_strbuf_append_printf(c_code, " eldbus_pending_data_set(p, \"__proxy\", proxy);\n"); 213 eina_strbuf_append_printf(c_code, " eldbus_pending_data_set(p, \"__user_proxy\", proxy);\n");
214 eina_strbuf_append_printf(c_code, " return p;\n"); 214 eina_strbuf_append_printf(c_code, " return p;\n");
215 eina_strbuf_append_printf(c_code, "}\n"); 215 eina_strbuf_append_printf(c_code, "}\n");
216 216
@@ -228,7 +228,7 @@ source_client_complex_method_callback_generate(const DBus_Method *method, Eina_S
228 eina_strbuf_append_printf(c_code, " %s cb = data;\n", prefix_append(method->function_cb)); 228 eina_strbuf_append_printf(c_code, " %s cb = data;\n", prefix_append(method->function_cb));
229 eina_strbuf_append_printf(c_code, " const char *error, *error_msg;\n"); 229 eina_strbuf_append_printf(c_code, " const char *error, *error_msg;\n");
230 eina_strbuf_append_printf(c_code, " Eina_Value *value;\n"); 230 eina_strbuf_append_printf(c_code, " Eina_Value *value;\n");
231 eina_strbuf_append_printf(c_code, " Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, \"__proxy\");\n"); 231 eina_strbuf_append_printf(c_code, " Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, \"__user_proxy\");\n");
232 eina_strbuf_append_printf(c_code, " if (eldbus_message_error_get(msg, &error, &error_msg))\n"); 232 eina_strbuf_append_printf(c_code, " if (eldbus_message_error_get(msg, &error, &error_msg))\n");
233 eina_strbuf_append_printf(c_code, " {\n"); 233 eina_strbuf_append_printf(c_code, " {\n");
234 eina_strbuf_append_printf(c_code, " Eldbus_Error_Info error_info = {error, error_msg};\n"); 234 eina_strbuf_append_printf(c_code, " Eldbus_Error_Info error_info = {error, error_msg};\n");
@@ -256,7 +256,7 @@ source_client_simple_method_callback_generate(const DBus_Method *method, Eina_St
256 eina_strbuf_append_printf(c_code, " void *user_data = eldbus_pending_data_del(pending, \"__user_data\");\n"); 256 eina_strbuf_append_printf(c_code, " void *user_data = eldbus_pending_data_del(pending, \"__user_data\");\n");
257 eina_strbuf_append_printf(c_code, " %s cb = data;\n", prefix_append(method->function_cb)); 257 eina_strbuf_append_printf(c_code, " %s cb = data;\n", prefix_append(method->function_cb));
258 eina_strbuf_append_printf(c_code, " const char *error, *error_msg;\n"); 258 eina_strbuf_append_printf(c_code, " const char *error, *error_msg;\n");
259 eina_strbuf_append_printf(c_code, " Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, \"__proxy\");\n"); 259 eina_strbuf_append_printf(c_code, " Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, \"__user_proxy\");\n");
260 260
261 EINA_INLIST_FOREACH(method->args, arg) 261 EINA_INLIST_FOREACH(method->args, arg)
262 { 262 {
@@ -436,7 +436,7 @@ source_client_property_generate_get(const DBus_Property *prop, Eina_Strbuf *c_co
436 eina_strbuf_append_printf(c_code, " void *user_data = eldbus_pending_data_del(pending, \"__user_data\");\n"); 436 eina_strbuf_append_printf(c_code, " void *user_data = eldbus_pending_data_del(pending, \"__user_data\");\n");
437 eina_strbuf_append_printf(c_code, " const char *error, *error_msg;\n"); 437 eina_strbuf_append_printf(c_code, " const char *error, *error_msg;\n");
438 eina_strbuf_append_printf(c_code, " %s cb = data;\n", prop_cb_get(prop)); 438 eina_strbuf_append_printf(c_code, " %s cb = data;\n", prop_cb_get(prop));
439 eina_strbuf_append_printf(c_code, " Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, \"__proxy\");\n"); 439 eina_strbuf_append_printf(c_code, " Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, \"__user_proxy\");\n");
440 eina_strbuf_append_printf(c_code, " Eldbus_Message_Iter *variant;\n"); 440 eina_strbuf_append_printf(c_code, " Eldbus_Message_Iter *variant;\n");
441 if (prop->complex) 441 if (prop->complex)
442 eina_strbuf_append_printf(c_code, " Eina_Value *v, stack_value;\n"); 442 eina_strbuf_append_printf(c_code, " Eina_Value *v, stack_value;\n");
@@ -485,7 +485,7 @@ source_client_property_generate_get(const DBus_Property *prop, Eina_Strbuf *c_co
485 eina_strbuf_append_printf(c_code, " p = eldbus_proxy_property_get(proxy, \"%s\", %s, cb);\n", prop->name, prop->cb_name); 485 eina_strbuf_append_printf(c_code, " p = eldbus_proxy_property_get(proxy, \"%s\", %s, cb);\n", prop->name, prop->cb_name);
486 eina_strbuf_append_printf(c_code, " if (data)\n"); 486 eina_strbuf_append_printf(c_code, " if (data)\n");
487 eina_strbuf_append_printf(c_code, " eldbus_pending_data_set(p, \"__user_data\", data);\n"); 487 eina_strbuf_append_printf(c_code, " eldbus_pending_data_set(p, \"__user_data\", data);\n");
488 eina_strbuf_append_printf(c_code, " eldbus_pending_data_set(p, \"__proxy\", proxy);\n"); 488 eina_strbuf_append_printf(c_code, " eldbus_pending_data_set(p, \"__user_proxy\", proxy);\n");
489 eina_strbuf_append_printf(c_code, " return p;\n"); 489 eina_strbuf_append_printf(c_code, " return p;\n");
490 eina_strbuf_append_printf(c_code, "}\n"); 490 eina_strbuf_append_printf(c_code, "}\n");
491} 491}
@@ -497,7 +497,7 @@ source_client_property_generate_set(const DBus_Property *prop, Eina_Strbuf *c_co
497 eina_strbuf_append_printf(c_code, "\nstatic void\n%s_set(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)\n{\n", prop->cb_name); 497 eina_strbuf_append_printf(c_code, "\nstatic void\n%s_set(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)\n{\n", prop->cb_name);
498 eina_strbuf_append_printf(c_code, " const char *error, *error_msg;\n"); 498 eina_strbuf_append_printf(c_code, " const char *error, *error_msg;\n");
499 eina_strbuf_append_printf(c_code, " void *user_data = eldbus_pending_data_del(pending, \"__user_data\");\n"); 499 eina_strbuf_append_printf(c_code, " void *user_data = eldbus_pending_data_del(pending, \"__user_data\");\n");
500 eina_strbuf_append_printf(c_code, " Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, \"__proxy\");\n"); 500 eina_strbuf_append_printf(c_code, " Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, \"__user_proxy\");\n");
501 eina_strbuf_append_printf(c_code, " Eldbus_Codegen_Property_Set_Cb cb = data;\n"); 501 eina_strbuf_append_printf(c_code, " Eldbus_Codegen_Property_Set_Cb cb = data;\n");
502 eina_strbuf_append_printf(c_code, " if (eldbus_message_error_get(msg, &error, &error_msg))"); 502 eina_strbuf_append_printf(c_code, " if (eldbus_message_error_get(msg, &error, &error_msg))");
503 eina_strbuf_append_printf(c_code, " {\n"); 503 eina_strbuf_append_printf(c_code, " {\n");
@@ -517,7 +517,7 @@ source_client_property_generate_set(const DBus_Property *prop, Eina_Strbuf *c_co
517 eina_strbuf_append_printf(c_code, " EINA_SAFETY_ON_NULL_RETURN_VAL(value, NULL);\n"); 517 eina_strbuf_append_printf(c_code, " EINA_SAFETY_ON_NULL_RETURN_VAL(value, NULL);\n");
518 eina_strbuf_append_printf(c_code, " p = eldbus_proxy_property_set(proxy, \"%s\", \"%s\", value, %s_set, cb);\n", prop->name, prop->type, prop->cb_name); 518 eina_strbuf_append_printf(c_code, " p = eldbus_proxy_property_set(proxy, \"%s\", \"%s\", value, %s_set, cb);\n", prop->name, prop->type, prop->cb_name);
519 eina_strbuf_append_printf(c_code, " eldbus_pending_data_set(p, \"__user_data\", data);\n"); 519 eina_strbuf_append_printf(c_code, " eldbus_pending_data_set(p, \"__user_data\", data);\n");
520 eina_strbuf_append_printf(c_code, " eldbus_pending_data_set(p, \"__proxy\", proxy);\n"); 520 eina_strbuf_append_printf(c_code, " eldbus_pending_data_set(p, \"__user_proxy\", proxy);\n");
521 eina_strbuf_append_printf(c_code, " return p;\n"); 521 eina_strbuf_append_printf(c_code, " return p;\n");
522 eina_strbuf_append_printf(c_code, "}\n"); 522 eina_strbuf_append_printf(c_code, "}\n");
523} 523}