summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorLucas De Marchi <lucas.demarchi@profusion.mobi>2013-04-23 11:40:05 -0300
committerLucas De Marchi <lucas.demarchi@profusion.mobi>2013-04-23 12:36:29 -0300
commit4e3804041f8e865e007b2a6a0d45a05f39500c3b (patch)
treea493b9c8f8a610d2667651f3ba81819ed16fbe8c /src/bin
parent4cf68bf728b5a858ce1c0efac25ded1a49ba8d9d (diff)
Rename edbus->eldbus
git grep -l edbus2 | while read f; do sed -i 's/edbus2/eldbus/g' "$f"; done find . -name '*edbus2*' -exec rename edbus2 eldbus {} \; git grep -l "EDBUS" | while read f; do sed -i 's/EDBUS/ELDBUS/g' "$f"; done git grep -l "EDBus" | while read f; do sed -i 's/EDBus/Eldbus/g' "$f"; done git grep -l "edbus (v2)" | while read f; do sed -i 's/edbus (v2)/eldbus/g' "$f"; done git grep -l "Edbus" | while read f; do sed -i 's/Edbus/Eldbus/g' "$f"; done git grep -l "edbus" | while read f; do sed -i 's/edbus/eldbus/g' "$f"; done find . -name '*edbus*' -exec rename edbus eldbus {} \; find . -name '*EDBus*' -exec rename EDBus Eldbus {} \;
Diffstat (limited to '')
-rw-r--r--src/bin/efreet/efreetd_dbus.c120
-rw-r--r--src/bin/eldbus/client.c (renamed from src/bin/edbus/client.c)2
-rw-r--r--src/bin/eldbus/codegen.h (renamed from src/bin/edbus/codegen.h)0
-rw-r--r--src/bin/eldbus/dbus.c (renamed from src/bin/edbus/dbus.c)0
-rw-r--r--src/bin/eldbus/parser.c (renamed from src/bin/edbus/parser.c)0
-rw-r--r--src/bin/eldbus/source_client.c (renamed from src/bin/edbus/source_client.c)224
-rw-r--r--src/bin/eldbus/utils.c (renamed from src/bin/edbus/utils.c)34
-rw-r--r--src/bin/ethumb_client/ethumbd.c288
8 files changed, 334 insertions, 334 deletions
diff --git a/src/bin/efreet/efreetd_dbus.c b/src/bin/efreet/efreetd_dbus.c
index 0b305ea6f4..82a66c179f 100644
--- a/src/bin/efreet/efreetd_dbus.c
+++ b/src/bin/efreet/efreetd_dbus.c
@@ -3,7 +3,7 @@
3#endif 3#endif
4 4
5#include <Ecore.h> 5#include <Ecore.h>
6#include <EDBus.h> 6#include <Eldbus.h>
7 7
8#include "efreetd.h" 8#include "efreetd.h"
9#include "efreetd_cache.h" 9#include "efreetd_cache.h"
@@ -19,8 +19,8 @@ enum
19 EFREET_SIGNAL_DESKTOP_CACHE_UPDATE 19 EFREET_SIGNAL_DESKTOP_CACHE_UPDATE
20}; 20};
21 21
22static EDBus_Connection *conn; 22static Eldbus_Connection *conn;
23static EDBus_Service_Interface *iface; 23static Eldbus_Service_Interface *iface;
24 24
25static Ecore_Timer *_shutdown = NULL; 25static Ecore_Timer *_shutdown = NULL;
26static int clients = 0; 26static int clients = 0;
@@ -33,7 +33,7 @@ do_shutdown(void *data EINA_UNUSED)
33} 33}
34 34
35static void 35static void
36disconnected(void *context EINA_UNUSED, EDBus_Connection *connection EINA_UNUSED, void *event_info EINA_UNUSED) 36disconnected(void *context EINA_UNUSED, Eldbus_Connection *connection EINA_UNUSED, void *event_info EINA_UNUSED)
37{ 37{
38 INF("disconnected"); 38 INF("disconnected");
39 quit(); 39 quit();
@@ -44,7 +44,7 @@ client_name_owner_changed_cb(void *data EINA_UNUSED, const char *bus, const char
44{ 44{
45 if (new_id[0]) 45 if (new_id[0])
46 return; 46 return;
47 edbus_name_owner_changed_callback_del(conn, bus, 47 eldbus_name_owner_changed_callback_del(conn, bus,
48 client_name_owner_changed_cb, NULL); 48 client_name_owner_changed_cb, NULL);
49 clients--; 49 clients--;
50 if (clients <= 0) 50 if (clients <= 0)
@@ -55,13 +55,13 @@ client_name_owner_changed_cb(void *data EINA_UNUSED, const char *bus, const char
55 } 55 }
56} 56}
57 57
58static EDBus_Message * 58static Eldbus_Message *
59do_register(const EDBus_Service_Interface *ifc EINA_UNUSED, const EDBus_Message *message) 59do_register(const Eldbus_Service_Interface *ifc EINA_UNUSED, const Eldbus_Message *message)
60{ 60{
61 EDBus_Message *reply; 61 Eldbus_Message *reply;
62 const char *lang; 62 const char *lang;
63 63
64 if (!edbus_message_arguments_get(message, "s", &lang)) 64 if (!eldbus_message_arguments_get(message, "s", &lang))
65 { 65 {
66 ERR("Error getting arguments."); 66 ERR("Error getting arguments.");
67 return NULL; 67 return NULL;
@@ -72,28 +72,28 @@ do_register(const EDBus_Service_Interface *ifc EINA_UNUSED, const EDBus_Message
72 if (_shutdown) ecore_timer_del(_shutdown); 72 if (_shutdown) ecore_timer_del(_shutdown);
73 _shutdown = NULL; 73 _shutdown = NULL;
74 74
75 edbus_name_owner_changed_callback_add(conn, 75 eldbus_name_owner_changed_callback_add(conn,
76 edbus_message_sender_get(message), 76 eldbus_message_sender_get(message),
77 client_name_owner_changed_cb, NULL, 77 client_name_owner_changed_cb, NULL,
78 EINA_FALSE); 78 EINA_FALSE);
79 reply = edbus_message_method_return_new(message); 79 reply = eldbus_message_method_return_new(message);
80 edbus_message_arguments_append(reply, "b", cache_desktop_exists()); 80 eldbus_message_arguments_append(reply, "b", cache_desktop_exists());
81 return reply; 81 return reply;
82} 82}
83 83
84static EDBus_Message * 84static Eldbus_Message *
85add_desktop_dirs(const EDBus_Service_Interface *ifc EINA_UNUSED, const EDBus_Message *message) 85add_desktop_dirs(const Eldbus_Service_Interface *ifc EINA_UNUSED, const Eldbus_Message *message)
86{ 86{
87 EDBus_Message_Iter *array = NULL; 87 Eldbus_Message_Iter *array = NULL;
88 const char *dir; 88 const char *dir;
89 89
90 if (!edbus_message_arguments_get(message, "as", &array)) 90 if (!eldbus_message_arguments_get(message, "as", &array))
91 { 91 {
92 ERR("Error getting arguments."); 92 ERR("Error getting arguments.");
93 return NULL; 93 return NULL;
94 } 94 }
95 95
96 while (edbus_message_iter_get_and_next(array, 's', &dir)) 96 while (eldbus_message_iter_get_and_next(array, 's', &dir))
97 { 97 {
98 cache_desktop_dir_add(dir); 98 cache_desktop_dir_add(dir);
99 } 99 }
@@ -101,19 +101,19 @@ add_desktop_dirs(const EDBus_Service_Interface *ifc EINA_UNUSED, const EDBus_Mes
101 return NULL; 101 return NULL;
102} 102}
103 103
104static EDBus_Message * 104static Eldbus_Message *
105add_icon_dirs(const EDBus_Service_Interface *ifc EINA_UNUSED, const EDBus_Message *message) 105add_icon_dirs(const Eldbus_Service_Interface *ifc EINA_UNUSED, const Eldbus_Message *message)
106{ 106{
107 EDBus_Message_Iter *array = NULL; 107 Eldbus_Message_Iter *array = NULL;
108 const char *dir; 108 const char *dir;
109 109
110 if (!edbus_message_arguments_get(message, "as", &array)) 110 if (!eldbus_message_arguments_get(message, "as", &array))
111 { 111 {
112 ERR("Error getting arguments."); 112 ERR("Error getting arguments.");
113 return NULL; 113 return NULL;
114 } 114 }
115 115
116 while (edbus_message_iter_get_and_next(array, 's', &dir)) 116 while (eldbus_message_iter_get_and_next(array, 's', &dir))
117 { 117 {
118 cache_icon_dir_add(dir); 118 cache_icon_dir_add(dir);
119 } 119 }
@@ -121,12 +121,12 @@ add_icon_dirs(const EDBus_Service_Interface *ifc EINA_UNUSED, const EDBus_Messag
121 return NULL; 121 return NULL;
122} 122}
123 123
124static EDBus_Message * 124static Eldbus_Message *
125build_desktop_cache(const EDBus_Service_Interface *ifc EINA_UNUSED, const EDBus_Message *message EINA_UNUSED) 125build_desktop_cache(const Eldbus_Service_Interface *ifc EINA_UNUSED, const Eldbus_Message *message EINA_UNUSED)
126{ 126{
127 const char *lang; 127 const char *lang;
128 128
129 if (!edbus_message_arguments_get(message, "s", &lang)) 129 if (!eldbus_message_arguments_get(message, "s", &lang))
130 { 130 {
131 ERR("Error getting arguments."); 131 ERR("Error getting arguments.");
132 return NULL; 132 return NULL;
@@ -137,19 +137,19 @@ build_desktop_cache(const EDBus_Service_Interface *ifc EINA_UNUSED, const EDBus_
137 return NULL; 137 return NULL;
138} 138}
139 139
140static EDBus_Message * 140static Eldbus_Message *
141add_icon_exts(const EDBus_Service_Interface *ifc EINA_UNUSED, const EDBus_Message *message) 141add_icon_exts(const Eldbus_Service_Interface *ifc EINA_UNUSED, const Eldbus_Message *message)
142{ 142{
143 EDBus_Message_Iter *array = NULL; 143 Eldbus_Message_Iter *array = NULL;
144 const char *ext; 144 const char *ext;
145 145
146 if (!edbus_message_arguments_get(message, "as", &array)) 146 if (!eldbus_message_arguments_get(message, "as", &array))
147 { 147 {
148 ERR("Error getting arguments."); 148 ERR("Error getting arguments.");
149 return NULL; 149 return NULL;
150 } 150 }
151 151
152 while (edbus_message_iter_get_and_next(array, 's', &ext)) 152 while (eldbus_message_iter_get_and_next(array, 's', &ext))
153 { 153 {
154 cache_icon_ext_add(ext); 154 cache_icon_ext_add(ext);
155 } 155 }
@@ -157,60 +157,60 @@ add_icon_exts(const EDBus_Service_Interface *ifc EINA_UNUSED, const EDBus_Messag
157 return NULL; 157 return NULL;
158} 158}
159 159
160static const EDBus_Signal signals[] = { 160static const Eldbus_Signal signals[] = {
161 [EFREET_SIGNAL_ICON_CACHE_UPDATE] = {"IconCacheUpdate", EDBUS_ARGS({ "b", "update" }), 0}, 161 [EFREET_SIGNAL_ICON_CACHE_UPDATE] = {"IconCacheUpdate", ELDBUS_ARGS({ "b", "update" }), 0},
162 [EFREET_SIGNAL_DESKTOP_CACHE_UPDATE] = {"DesktopCacheUpdate", EDBUS_ARGS({ "b", "update" }), 0}, 162 [EFREET_SIGNAL_DESKTOP_CACHE_UPDATE] = {"DesktopCacheUpdate", ELDBUS_ARGS({ "b", "update" }), 0},
163 { NULL, NULL, 0 } 163 { NULL, NULL, 0 }
164}; 164};
165 165
166static const EDBus_Method methods[] = { 166static const Eldbus_Method methods[] = {
167 { 167 {
168 "Register", EDBUS_ARGS({"s", "lang info"}), EDBUS_ARGS({"b", "cache exists"}), 168 "Register", ELDBUS_ARGS({"s", "lang info"}), ELDBUS_ARGS({"b", "cache exists"}),
169 do_register, 0 169 do_register, 0
170 }, 170 },
171 { 171 {
172 "AddDesktopDirs", EDBUS_ARGS({"as", "dirs"}), NULL, 172 "AddDesktopDirs", ELDBUS_ARGS({"as", "dirs"}), NULL,
173 add_desktop_dirs, EDBUS_METHOD_FLAG_NOREPLY 173 add_desktop_dirs, ELDBUS_METHOD_FLAG_NOREPLY
174 }, 174 },
175 { 175 {
176 "BuildDesktopCache", EDBUS_ARGS({"s", "lang info"}), NULL, 176 "BuildDesktopCache", ELDBUS_ARGS({"s", "lang info"}), NULL,
177 build_desktop_cache, EDBUS_METHOD_FLAG_NOREPLY 177 build_desktop_cache, ELDBUS_METHOD_FLAG_NOREPLY
178 }, 178 },
179 { 179 {
180 "AddIconDirs", EDBUS_ARGS({"as", "dirs"}), NULL, 180 "AddIconDirs", ELDBUS_ARGS({"as", "dirs"}), NULL,
181 add_icon_dirs, EDBUS_METHOD_FLAG_NOREPLY 181 add_icon_dirs, ELDBUS_METHOD_FLAG_NOREPLY
182 }, 182 },
183 { 183 {
184 "AddIconExts", EDBUS_ARGS({"as", "exts"}), NULL, 184 "AddIconExts", ELDBUS_ARGS({"as", "exts"}), NULL,
185 add_icon_exts, EDBUS_METHOD_FLAG_NOREPLY 185 add_icon_exts, ELDBUS_METHOD_FLAG_NOREPLY
186 }, 186 },
187 { NULL, NULL, NULL, NULL, 0 } 187 { NULL, NULL, NULL, NULL, 0 }
188}; 188};
189 189
190static const EDBus_Service_Interface_Desc desc = { 190static const Eldbus_Service_Interface_Desc desc = {
191 INTERFACE, methods, signals, NULL, NULL, NULL 191 INTERFACE, methods, signals, NULL, NULL, NULL
192}; 192};
193 193
194static void 194static void
195on_name_request(void *data EINA_UNUSED, const EDBus_Message *msg, EDBus_Pending *pending EINA_UNUSED) 195on_name_request(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
196{ 196{
197 unsigned int reply; 197 unsigned int reply;
198 198
199 if (edbus_message_error_get(msg, NULL, NULL)) 199 if (eldbus_message_error_get(msg, NULL, NULL))
200 { 200 {
201 ERR("error on on_name_request"); 201 ERR("error on on_name_request");
202 quit(); 202 quit();
203 return; 203 return;
204 } 204 }
205 205
206 if (!edbus_message_arguments_get(msg, "u", &reply)) 206 if (!eldbus_message_arguments_get(msg, "u", &reply))
207 { 207 {
208 ERR("error getting arguments on on_name_request"); 208 ERR("error getting arguments on on_name_request");
209 quit(); 209 quit();
210 return; 210 return;
211 } 211 }
212 212
213 if (reply != EDBUS_NAME_REQUEST_REPLY_PRIMARY_OWNER) 213 if (reply != ELDBUS_NAME_REQUEST_REPLY_PRIMARY_OWNER)
214 { 214 {
215 ERR("error name already in use"); 215 ERR("error name already in use");
216 quit(); 216 quit();
@@ -223,40 +223,40 @@ on_name_request(void *data EINA_UNUSED, const EDBus_Message *msg, EDBus_Pending
223void 223void
224send_signal_icon_cache_update(Eina_Bool update) 224send_signal_icon_cache_update(Eina_Bool update)
225{ 225{
226 edbus_service_signal_emit(iface, EFREET_SIGNAL_ICON_CACHE_UPDATE, update); 226 eldbus_service_signal_emit(iface, EFREET_SIGNAL_ICON_CACHE_UPDATE, update);
227} 227}
228 228
229void 229void
230send_signal_desktop_cache_update(Eina_Bool update) 230send_signal_desktop_cache_update(Eina_Bool update)
231{ 231{
232 edbus_service_signal_emit(iface, EFREET_SIGNAL_DESKTOP_CACHE_UPDATE, update); 232 eldbus_service_signal_emit(iface, EFREET_SIGNAL_DESKTOP_CACHE_UPDATE, update);
233} 233}
234 234
235Eina_Bool 235Eina_Bool
236dbus_init(void) 236dbus_init(void)
237{ 237{
238 if (!edbus_init()) return EINA_FALSE; 238 if (!eldbus_init()) return EINA_FALSE;
239 239
240 conn = edbus_connection_get(EDBUS_CONNECTION_TYPE_SESSION); 240 conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
241 if (!conn) goto conn_error; 241 if (!conn) goto conn_error;
242 242
243 edbus_connection_event_callback_add(conn, 243 eldbus_connection_event_callback_add(conn,
244 EDBUS_CONNECTION_EVENT_DISCONNECTED, disconnected, NULL); 244 ELDBUS_CONNECTION_EVENT_DISCONNECTED, disconnected, NULL);
245 iface = edbus_service_interface_register(conn, PATH, &desc); 245 iface = eldbus_service_interface_register(conn, PATH, &desc);
246 edbus_name_request(conn, BUS, EDBUS_NAME_REQUEST_FLAG_DO_NOT_QUEUE, 246 eldbus_name_request(conn, BUS, ELDBUS_NAME_REQUEST_FLAG_DO_NOT_QUEUE,
247 on_name_request, NULL); 247 on_name_request, NULL);
248 248
249 return EINA_TRUE; 249 return EINA_TRUE;
250conn_error: 250conn_error:
251 edbus_shutdown(); 251 eldbus_shutdown();
252 return EINA_FALSE; 252 return EINA_FALSE;
253} 253}
254 254
255Eina_Bool 255Eina_Bool
256dbus_shutdown(void) 256dbus_shutdown(void)
257{ 257{
258 edbus_connection_unref(conn); 258 eldbus_connection_unref(conn);
259 edbus_shutdown(); 259 eldbus_shutdown();
260 return EINA_TRUE; 260 return EINA_TRUE;
261 261
262} 262}
diff --git a/src/bin/edbus/client.c b/src/bin/eldbus/client.c
index 742a294e27..feca0841de 100644
--- a/src/bin/edbus/client.c
+++ b/src/bin/eldbus/client.c
@@ -1,7 +1,7 @@
1#include "codegen.h" 1#include "codegen.h"
2 2
3static const Ecore_Getopt optdesc = { 3static const Ecore_Getopt optdesc = {
4 "edbus_codegen", 4 "eldbus_codegen",
5 "%prog [options] <file.xml>", 5 "%prog [options] <file.xml>",
6 "1.0", 6 "1.0",
7 "(C) 2012 - The Enlightenment Project", 7 "(C) 2012 - The Enlightenment Project",
diff --git a/src/bin/edbus/codegen.h b/src/bin/eldbus/codegen.h
index ffcaf993ef..ffcaf993ef 100644
--- a/src/bin/edbus/codegen.h
+++ b/src/bin/eldbus/codegen.h
diff --git a/src/bin/edbus/dbus.c b/src/bin/eldbus/dbus.c
index ac9e828f57..ac9e828f57 100644
--- a/src/bin/edbus/dbus.c
+++ b/src/bin/eldbus/dbus.c
diff --git a/src/bin/edbus/parser.c b/src/bin/eldbus/parser.c
index 96a8f9e354..96a8f9e354 100644
--- a/src/bin/edbus/parser.c
+++ b/src/bin/eldbus/parser.c
diff --git a/src/bin/edbus/source_client.c b/src/bin/eldbus/source_client.c
index 6d3a34d57e..3d0bf437f4 100644
--- a/src/bin/edbus/source_client.c
+++ b/src/bin/eldbus/source_client.c
@@ -51,7 +51,7 @@ dbus_type2c_type2(const char *dbus_type, Eina_Bool with_const)
51 case 'v'://variant 51 case 'v'://variant
52 case '{'://dict 52 case '{'://dict
53 case '('://struct 53 case '('://struct
54 return "EDBus_Message_Iter *"; 54 return "Eldbus_Message_Iter *";
55 default: 55 default:
56 { 56 {
57 printf("Error type not handled: %c\n", dbus_type[0]); 57 printf("Error type not handled: %c\n", dbus_type[0]);
@@ -81,39 +81,39 @@ source_client_complex_method_call_generate(const DBus_Method *method, Eina_Strbu
81 81
82 if (method->no_reply) 82 if (method->no_reply)
83 { 83 {
84 eina_strbuf_append_printf(h, "void %s_call(EDBus_Proxy *proxy, Eina_Value *args);\n", prefix_append(method->c_name)); 84 eina_strbuf_append_printf(h, "void %s_call(Eldbus_Proxy *proxy, Eina_Value *args);\n", prefix_append(method->c_name));
85 85
86 eina_strbuf_append_printf(c_code, "\nvoid \n%s_call(EDBus_Proxy *proxy, Eina_Value *args)\n{\n", prefix_append(method->c_name)); 86 eina_strbuf_append_printf(c_code, "\nvoid \n%s_call(Eldbus_Proxy *proxy, Eina_Value *args)\n{\n", prefix_append(method->c_name));
87 eina_strbuf_append_printf(c_code, " EINA_SAFETY_ON_NULL_RETURN(proxy);\n"); 87 eina_strbuf_append_printf(c_code, " EINA_SAFETY_ON_NULL_RETURN(proxy);\n");
88 eina_strbuf_append_printf(c_code, " EDBus_Message *msg = edbus_proxy_method_call_new(proxy, \"%s\");\n", method->name); 88 eina_strbuf_append_printf(c_code, " Eldbus_Message *msg = eldbus_proxy_method_call_new(proxy, \"%s\");\n", method->name);
89 eina_strbuf_append_printf(c_code, " if (!edbus_message_from_eina_value(\"%s\", msg, args))\n", eina_strbuf_string_get(full_signature)); 89 eina_strbuf_append_printf(c_code, " if (!eldbus_message_from_eina_value(\"%s\", msg, args))\n", eina_strbuf_string_get(full_signature));
90 eina_strbuf_append_printf(c_code, " {\n"); 90 eina_strbuf_append_printf(c_code, " {\n");
91 eina_strbuf_append_printf(c_code, " ERR(\"Error: Filling message from eina value.\");\n"); 91 eina_strbuf_append_printf(c_code, " ERR(\"Error: Filling message from eina value.\");\n");
92 eina_strbuf_append_printf(c_code, " return;\n"); 92 eina_strbuf_append_printf(c_code, " return;\n");
93 eina_strbuf_append_printf(c_code, " }\n"); 93 eina_strbuf_append_printf(c_code, " }\n");
94 eina_strbuf_append_printf(c_code, " edbus_proxy_send(proxy, msg, %s, NULL, NULL, -1);\n", method->cb_name); 94 eina_strbuf_append_printf(c_code, " eldbus_proxy_send(proxy, msg, %s, NULL, NULL, -1);\n", method->cb_name);
95 eina_strbuf_append_printf(c_code, "}\n"); 95 eina_strbuf_append_printf(c_code, "}\n");
96 goto end; 96 goto end;
97 } 97 }
98 98
99 eina_strbuf_append_printf(h, "EDBus_Pending *%s_call", prefix_append(method->c_name)); 99 eina_strbuf_append_printf(h, "Eldbus_Pending *%s_call", prefix_append(method->c_name));
100 eina_strbuf_append_printf(h, "(EDBus_Proxy *proxy, %s cb, const void *data, Eina_Value *args);\n", prefix_append(method->function_cb)); 100 eina_strbuf_append_printf(h, "(Eldbus_Proxy *proxy, %s cb, const void *data, Eina_Value *args);\n", prefix_append(method->function_cb));
101 101
102 eina_strbuf_append_printf(c_code, "\nEDBus_Pending *\n%s_call(", prefix_append(method->c_name)); 102 eina_strbuf_append_printf(c_code, "\nEldbus_Pending *\n%s_call(", prefix_append(method->c_name));
103 eina_strbuf_append_printf(c_code, "EDBus_Proxy *proxy, %s cb, const void *data, Eina_Value *args)\n{\n", prefix_append(method->function_cb)); 103 eina_strbuf_append_printf(c_code, "Eldbus_Proxy *proxy, %s cb, const void *data, Eina_Value *args)\n{\n", prefix_append(method->function_cb));
104 eina_strbuf_append_printf(c_code, " EDBus_Message *msg;\n"); 104 eina_strbuf_append_printf(c_code, " Eldbus_Message *msg;\n");
105 eina_strbuf_append_printf(c_code, " EDBus_Pending *p;\n"); 105 eina_strbuf_append_printf(c_code, " Eldbus_Pending *p;\n");
106 eina_strbuf_append_printf(c_code, " EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL);\n"); 106 eina_strbuf_append_printf(c_code, " EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL);\n");
107 eina_strbuf_append_printf(c_code, " msg = edbus_proxy_method_call_new(proxy, \"%s\");\n", method->name); 107 eina_strbuf_append_printf(c_code, " msg = eldbus_proxy_method_call_new(proxy, \"%s\");\n", method->name);
108 eina_strbuf_append_printf(c_code, " if (!edbus_message_from_eina_value(\"%s\", msg, args))\n", eina_strbuf_string_get(full_signature)); 108 eina_strbuf_append_printf(c_code, " if (!eldbus_message_from_eina_value(\"%s\", msg, args))\n", eina_strbuf_string_get(full_signature));
109 eina_strbuf_append_printf(c_code, " {\n"); 109 eina_strbuf_append_printf(c_code, " {\n");
110 eina_strbuf_append_printf(c_code, " ERR(\"Error: Filling message from eina value.\");\n"); 110 eina_strbuf_append_printf(c_code, " ERR(\"Error: Filling message from eina value.\");\n");
111 eina_strbuf_append_printf(c_code, " return NULL;\n"); 111 eina_strbuf_append_printf(c_code, " return NULL;\n");
112 eina_strbuf_append_printf(c_code, " }\n"); 112 eina_strbuf_append_printf(c_code, " }\n");
113 eina_strbuf_append_printf(c_code, " p = edbus_proxy_send(proxy, msg, %s, cb, -1);\n", method->cb_name); 113 eina_strbuf_append_printf(c_code, " p = eldbus_proxy_send(proxy, msg, %s, cb, -1);\n", method->cb_name);
114 eina_strbuf_append_printf(c_code, " if (data)\n"); 114 eina_strbuf_append_printf(c_code, " if (data)\n");
115 eina_strbuf_append_printf(c_code, " edbus_pending_data_set(p, \"__user_data\", data);\n"); 115 eina_strbuf_append_printf(c_code, " eldbus_pending_data_set(p, \"__user_data\", data);\n");
116 eina_strbuf_append_printf(c_code, " edbus_pending_data_set(p, \"__proxy\", proxy);\n"); 116 eina_strbuf_append_printf(c_code, " eldbus_pending_data_set(p, \"__proxy\", proxy);\n");
117 eina_strbuf_append_printf(c_code, " return p;\n"); 117 eina_strbuf_append_printf(c_code, " return p;\n");
118 eina_strbuf_append_printf(c_code, "}\n"); 118 eina_strbuf_append_printf(c_code, "}\n");
119 119
@@ -128,8 +128,8 @@ source_client_simple_method_call_no_reply_generate(const DBus_Method *method, Ei
128 Eina_Strbuf *full_signature = eina_strbuf_new(); 128 Eina_Strbuf *full_signature = eina_strbuf_new();
129 Eina_Strbuf *args_call = eina_strbuf_new(); 129 Eina_Strbuf *args_call = eina_strbuf_new();
130 130
131 eina_strbuf_append_printf(h, "void %s_call(EDBus_Proxy *proxy", prefix_append(method->c_name)); 131 eina_strbuf_append_printf(h, "void %s_call(Eldbus_Proxy *proxy", prefix_append(method->c_name));
132 eina_strbuf_append_printf(c_code, "\nvoid\n%s_call(EDBus_Proxy *proxy", prefix_append(method->c_name)); 132 eina_strbuf_append_printf(c_code, "\nvoid\n%s_call(Eldbus_Proxy *proxy", prefix_append(method->c_name));
133 133
134 EINA_INLIST_FOREACH(method->args, arg) 134 EINA_INLIST_FOREACH(method->args, arg)
135 { 135 {
@@ -143,15 +143,15 @@ source_client_simple_method_call_no_reply_generate(const DBus_Method *method, Ei
143 eina_strbuf_append_printf(h, ");\n"); 143 eina_strbuf_append_printf(h, ");\n");
144 eina_strbuf_append_printf(c_code, ")\n{\n"); 144 eina_strbuf_append_printf(c_code, ")\n{\n");
145 145
146 eina_strbuf_append_printf(c_code, " EDBus_Message *msg;\n"); 146 eina_strbuf_append_printf(c_code, " Eldbus_Message *msg;\n");
147 eina_strbuf_append_printf(c_code, " EINA_SAFETY_ON_NULL_RETURN(proxy);\n"); 147 eina_strbuf_append_printf(c_code, " EINA_SAFETY_ON_NULL_RETURN(proxy);\n");
148 eina_strbuf_append_printf(c_code, " msg = edbus_proxy_method_call_new(proxy, \"%s\");\n", method->name); 148 eina_strbuf_append_printf(c_code, " msg = eldbus_proxy_method_call_new(proxy, \"%s\");\n", method->name);
149 eina_strbuf_append_printf(c_code, " if (!edbus_message_arguments_append(msg, \"%s\"%s))\n", eina_strbuf_string_get(full_signature), eina_strbuf_string_get(args_call)); 149 eina_strbuf_append_printf(c_code, " if (!eldbus_message_arguments_append(msg, \"%s\"%s))\n", eina_strbuf_string_get(full_signature), eina_strbuf_string_get(args_call));
150 eina_strbuf_append_printf(c_code, " {\n"); 150 eina_strbuf_append_printf(c_code, " {\n");
151 eina_strbuf_append_printf(c_code, " ERR(\"Error: Filling message.\");\n"); 151 eina_strbuf_append_printf(c_code, " ERR(\"Error: Filling message.\");\n");
152 eina_strbuf_append_printf(c_code, " return;\n"); 152 eina_strbuf_append_printf(c_code, " return;\n");
153 eina_strbuf_append_printf(c_code, " }\n"); 153 eina_strbuf_append_printf(c_code, " }\n");
154 eina_strbuf_append_printf(c_code, " edbus_proxy_send(proxy, msg, NULL, NULL, -1);\n"); 154 eina_strbuf_append_printf(c_code, " eldbus_proxy_send(proxy, msg, NULL, NULL, -1);\n");
155 eina_strbuf_append_printf(c_code, "}\n"); 155 eina_strbuf_append_printf(c_code, "}\n");
156 156
157 eina_strbuf_free(full_signature); 157 eina_strbuf_free(full_signature);
@@ -165,10 +165,10 @@ source_client_simple_method_call_generate(const DBus_Method *method, Eina_Strbuf
165 Eina_Strbuf *full_signature = eina_strbuf_new(); 165 Eina_Strbuf *full_signature = eina_strbuf_new();
166 Eina_Strbuf *args_call = eina_strbuf_new(); 166 Eina_Strbuf *args_call = eina_strbuf_new();
167 167
168 eina_strbuf_append_printf(h, "EDBus_Pending *%s_call", prefix_append(method->c_name)); 168 eina_strbuf_append_printf(h, "Eldbus_Pending *%s_call", prefix_append(method->c_name));
169 eina_strbuf_append_printf(h, "(EDBus_Proxy *proxy, %s cb, const void *data", prefix_append(method->function_cb)); 169 eina_strbuf_append_printf(h, "(Eldbus_Proxy *proxy, %s cb, const void *data", prefix_append(method->function_cb));
170 eina_strbuf_append_printf(c_code, "\nEDBus_Pending *\n%s_call", prefix_append(method->c_name)); 170 eina_strbuf_append_printf(c_code, "\nEldbus_Pending *\n%s_call", prefix_append(method->c_name));
171 eina_strbuf_append_printf(c_code, "(EDBus_Proxy *proxy, %s cb, const void *data", prefix_append(method->function_cb)); 171 eina_strbuf_append_printf(c_code, "(Eldbus_Proxy *proxy, %s cb, const void *data", prefix_append(method->function_cb));
172 172
173 EINA_INLIST_FOREACH(method->args, arg) 173 EINA_INLIST_FOREACH(method->args, arg)
174 { 174 {
@@ -182,19 +182,19 @@ source_client_simple_method_call_generate(const DBus_Method *method, Eina_Strbuf
182 eina_strbuf_append_printf(h, ");\n"); 182 eina_strbuf_append_printf(h, ");\n");
183 eina_strbuf_append_printf(c_code,")\n{\n"); 183 eina_strbuf_append_printf(c_code,")\n{\n");
184 184
185 eina_strbuf_append_printf(c_code, " EDBus_Message *msg;\n"); 185 eina_strbuf_append_printf(c_code, " Eldbus_Message *msg;\n");
186 eina_strbuf_append_printf(c_code, " EDBus_Pending *p;\n"); 186 eina_strbuf_append_printf(c_code, " Eldbus_Pending *p;\n");
187 eina_strbuf_append_printf(c_code, " EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL);\n"); 187 eina_strbuf_append_printf(c_code, " EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL);\n");
188 eina_strbuf_append_printf(c_code, " msg = edbus_proxy_method_call_new(proxy, \"%s\");\n", method->name); 188 eina_strbuf_append_printf(c_code, " msg = eldbus_proxy_method_call_new(proxy, \"%s\");\n", method->name);
189 eina_strbuf_append_printf(c_code, " if (!edbus_message_arguments_append(msg, \"%s\"%s))\n", eina_strbuf_string_get(full_signature), eina_strbuf_string_get(args_call)); 189 eina_strbuf_append_printf(c_code, " if (!eldbus_message_arguments_append(msg, \"%s\"%s))\n", eina_strbuf_string_get(full_signature), eina_strbuf_string_get(args_call));
190 eina_strbuf_append_printf(c_code, " {\n"); 190 eina_strbuf_append_printf(c_code, " {\n");
191 eina_strbuf_append_printf(c_code, " ERR(\"Error: Filling message.\");\n"); 191 eina_strbuf_append_printf(c_code, " ERR(\"Error: Filling message.\");\n");
192 eina_strbuf_append_printf(c_code, " return NULL;\n"); 192 eina_strbuf_append_printf(c_code, " return NULL;\n");
193 eina_strbuf_append_printf(c_code, " }\n"); 193 eina_strbuf_append_printf(c_code, " }\n");
194 eina_strbuf_append_printf(c_code, " p = edbus_proxy_send(proxy, msg, %s, cb, -1);\n", method->cb_name); 194 eina_strbuf_append_printf(c_code, " p = eldbus_proxy_send(proxy, msg, %s, cb, -1);\n", method->cb_name);
195 eina_strbuf_append_printf(c_code, " if (data)\n"); 195 eina_strbuf_append_printf(c_code, " if (data)\n");
196 eina_strbuf_append_printf(c_code, " edbus_pending_data_set(p, \"__user_data\", data);\n"); 196 eina_strbuf_append_printf(c_code, " eldbus_pending_data_set(p, \"__user_data\", data);\n");
197 eina_strbuf_append_printf(c_code, " edbus_pending_data_set(p, \"__proxy\", proxy);\n"); 197 eina_strbuf_append_printf(c_code, " eldbus_pending_data_set(p, \"__proxy\", proxy);\n");
198 eina_strbuf_append_printf(c_code, " return p;\n"); 198 eina_strbuf_append_printf(c_code, " return p;\n");
199 eina_strbuf_append_printf(c_code, "}\n"); 199 eina_strbuf_append_printf(c_code, "}\n");
200 200
@@ -205,21 +205,21 @@ source_client_simple_method_call_generate(const DBus_Method *method, Eina_Strbuf
205static void 205static void
206source_client_complex_method_callback_generate(const DBus_Method *method, Eina_Strbuf *c_code, Eina_Strbuf *h) 206source_client_complex_method_callback_generate(const DBus_Method *method, Eina_Strbuf *c_code, Eina_Strbuf *h)
207{ 207{
208 eina_strbuf_append_printf(h, "typedef void (*%s)(EDBus_Proxy *proxy, void *data, EDBus_Pending *pending, EDBus_Error_Info *error, Eina_Value *args);\n", prefix_append(method->function_cb)); 208 eina_strbuf_append_printf(h, "typedef void (*%s)(Eldbus_Proxy *proxy, void *data, Eldbus_Pending *pending, Eldbus_Error_Info *error, Eina_Value *args);\n", prefix_append(method->function_cb));
209 209
210 eina_strbuf_append_printf(c_code, "\nstatic void\n%s(void *data, const EDBus_Message *msg, EDBus_Pending *pending)\n{\n", method->cb_name); 210 eina_strbuf_append_printf(c_code, "\nstatic void\n%s(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)\n{\n", method->cb_name);
211 eina_strbuf_append_printf(c_code, " void *user_data = edbus_pending_data_del(pending, \"__user_data\");\n"); 211 eina_strbuf_append_printf(c_code, " void *user_data = eldbus_pending_data_del(pending, \"__user_data\");\n");
212 eina_strbuf_append_printf(c_code, " %s cb = data;\n", prefix_append(method->function_cb)); 212 eina_strbuf_append_printf(c_code, " %s cb = data;\n", prefix_append(method->function_cb));
213 eina_strbuf_append_printf(c_code, " const char *error, *error_msg;\n"); 213 eina_strbuf_append_printf(c_code, " const char *error, *error_msg;\n");
214 eina_strbuf_append_printf(c_code, " Eina_Value *value;\n"); 214 eina_strbuf_append_printf(c_code, " Eina_Value *value;\n");
215 eina_strbuf_append_printf(c_code, " EDBus_Proxy *proxy = edbus_pending_data_del(pending, \"__proxy\");\n"); 215 eina_strbuf_append_printf(c_code, " Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, \"__proxy\");\n");
216 eina_strbuf_append_printf(c_code, " if (edbus_message_error_get(msg, &error, &error_msg))\n"); 216 eina_strbuf_append_printf(c_code, " if (eldbus_message_error_get(msg, &error, &error_msg))\n");
217 eina_strbuf_append_printf(c_code, " {\n"); 217 eina_strbuf_append_printf(c_code, " {\n");
218 eina_strbuf_append_printf(c_code, " EDBus_Error_Info error_info = {error, error_msg};\n"); 218 eina_strbuf_append_printf(c_code, " Eldbus_Error_Info error_info = {error, error_msg};\n");
219 eina_strbuf_append_printf(c_code, " cb(proxy, user_data, pending, &error_info, NULL);\n"); 219 eina_strbuf_append_printf(c_code, " cb(proxy, user_data, pending, &error_info, NULL);\n");
220 eina_strbuf_append_printf(c_code, " return;\n"); 220 eina_strbuf_append_printf(c_code, " return;\n");
221 eina_strbuf_append_printf(c_code, " }\n"); 221 eina_strbuf_append_printf(c_code, " }\n");
222 eina_strbuf_append_printf(c_code, " value = edbus_message_to_eina_value(msg);\n"); 222 eina_strbuf_append_printf(c_code, " value = eldbus_message_to_eina_value(msg);\n");
223 eina_strbuf_append_printf(c_code, " cb(proxy, user_data, pending, NULL, value);\n"); 223 eina_strbuf_append_printf(c_code, " cb(proxy, user_data, pending, NULL, value);\n");
224 eina_strbuf_append_printf(c_code, " eina_value_free(value);\n"); 224 eina_strbuf_append_printf(c_code, " eina_value_free(value);\n");
225 eina_strbuf_append_printf(c_code, " return;\n"); 225 eina_strbuf_append_printf(c_code, " return;\n");
@@ -234,13 +234,13 @@ source_client_simple_method_callback_generate(const DBus_Method *method, Eina_St
234 Eina_Strbuf *end_cb = eina_strbuf_new(); 234 Eina_Strbuf *end_cb = eina_strbuf_new();
235 Eina_Strbuf *arguments_get = eina_strbuf_new(); 235 Eina_Strbuf *arguments_get = eina_strbuf_new();
236 236
237 eina_strbuf_append_printf(h, "typedef void (*%s)(EDBus_Proxy *proxy, void *data, EDBus_Pending *pending, EDBus_Error_Info *error", prefix_append(method->function_cb)); 237 eina_strbuf_append_printf(h, "typedef void (*%s)(Eldbus_Proxy *proxy, void *data, Eldbus_Pending *pending, Eldbus_Error_Info *error", prefix_append(method->function_cb));
238 238
239 eina_strbuf_append_printf(c_code, "\nstatic void\n%s(void *data, const EDBus_Message *msg, EDBus_Pending *pending)\n{\n", method->cb_name); 239 eina_strbuf_append_printf(c_code, "\nstatic void\n%s(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)\n{\n", method->cb_name);
240 eina_strbuf_append_printf(c_code, " void *user_data = edbus_pending_data_del(pending, \"__user_data\");\n"); 240 eina_strbuf_append_printf(c_code, " void *user_data = eldbus_pending_data_del(pending, \"__user_data\");\n");
241 eina_strbuf_append_printf(c_code, " %s cb = data;\n", prefix_append(method->function_cb)); 241 eina_strbuf_append_printf(c_code, " %s cb = data;\n", prefix_append(method->function_cb));
242 eina_strbuf_append_printf(c_code, " const char *error, *error_msg;\n"); 242 eina_strbuf_append_printf(c_code, " const char *error, *error_msg;\n");
243 eina_strbuf_append_printf(c_code, " EDBus_Proxy *proxy = edbus_pending_data_del(pending, \"__proxy\");\n"); 243 eina_strbuf_append_printf(c_code, " Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, \"__proxy\");\n");
244 244
245 EINA_INLIST_FOREACH(method->args, arg) 245 EINA_INLIST_FOREACH(method->args, arg)
246 { 246 {
@@ -254,16 +254,16 @@ source_client_simple_method_callback_generate(const DBus_Method *method, Eina_St
254 } 254 }
255 eina_strbuf_append_printf(h, ");\n"); 255 eina_strbuf_append_printf(h, ");\n");
256 256
257 eina_strbuf_append_printf(c_code, " if (edbus_message_error_get(msg, &error, &error_msg))\n"); 257 eina_strbuf_append_printf(c_code, " if (eldbus_message_error_get(msg, &error, &error_msg))\n");
258 eina_strbuf_append_printf(c_code, " {\n"); 258 eina_strbuf_append_printf(c_code, " {\n");
259 eina_strbuf_append_printf(c_code, " EDBus_Error_Info error_info = {error, error_msg};\n"); 259 eina_strbuf_append_printf(c_code, " Eldbus_Error_Info error_info = {error, error_msg};\n");
260 eina_strbuf_append_printf(c_code, " cb(proxy, user_data, pending, &error_info%s);\n", eina_strbuf_string_get(end_cb)); 260 eina_strbuf_append_printf(c_code, " cb(proxy, user_data, pending, &error_info%s);\n", eina_strbuf_string_get(end_cb));
261 eina_strbuf_append_printf(c_code, " return;\n"); 261 eina_strbuf_append_printf(c_code, " return;\n");
262 eina_strbuf_append_printf(c_code, " }\n"); 262 eina_strbuf_append_printf(c_code, " }\n");
263 263
264 eina_strbuf_append_printf(c_code, " if (!edbus_message_arguments_get(msg, \"%s\"%s))\n", eina_strbuf_string_get(full_signature), eina_strbuf_string_get(arguments_get)); 264 eina_strbuf_append_printf(c_code, " if (!eldbus_message_arguments_get(msg, \"%s\"%s))\n", eina_strbuf_string_get(full_signature), eina_strbuf_string_get(arguments_get));
265 eina_strbuf_append_printf(c_code, " {\n"); 265 eina_strbuf_append_printf(c_code, " {\n");
266 eina_strbuf_append_printf(c_code, " EDBus_Error_Info error_info = {\"\", \"\"};\n"); 266 eina_strbuf_append_printf(c_code, " Eldbus_Error_Info error_info = {\"\", \"\"};\n");
267 eina_strbuf_append_printf(c_code, " ERR(\"Error: Getting arguments from message.\");\n"); 267 eina_strbuf_append_printf(c_code, " ERR(\"Error: Getting arguments from message.\");\n");
268 eina_strbuf_append_printf(c_code, " cb(proxy, user_data, pending, &error_info%s);\n", eina_strbuf_string_get(end_cb)); 268 eina_strbuf_append_printf(c_code, " cb(proxy, user_data, pending, &error_info%s);\n", eina_strbuf_string_get(end_cb));
269 eina_strbuf_append_printf(c_code, " return;\n"); 269 eina_strbuf_append_printf(c_code, " return;\n");
@@ -308,7 +308,7 @@ source_client_signal_generate(const DBus_Signal *sig, Eina_Strbuf *c_code, Eina_
308 Eina_Strbuf *string_copy = eina_strbuf_new(); 308 Eina_Strbuf *string_copy = eina_strbuf_new();
309 Eina_Strbuf *string_free = eina_strbuf_new(); 309 Eina_Strbuf *string_free = eina_strbuf_new();
310 310
311 eina_strbuf_append_printf(c_init_function, " edbus_proxy_signal_handler_add(proxy, \"%s\", %s, proxy);\n", sig->name, sig->cb_name); 311 eina_strbuf_append_printf(c_init_function, " eldbus_proxy_signal_handler_add(proxy, \"%s\", %s, proxy);\n", sig->name, sig->cb_name);
312 eina_strbuf_append_printf(c_header, "int %s;\n", sig->signal_event); 312 eina_strbuf_append_printf(c_header, "int %s;\n", sig->signal_event);
313 eina_strbuf_append_printf(h, "extern int %s;\n", sig->signal_event); 313 eina_strbuf_append_printf(h, "extern int %s;\n", sig->signal_event);
314 eina_strbuf_append_printf(c_init_function, " if (!%s)\n", sig->signal_event); 314 eina_strbuf_append_printf(c_init_function, " if (!%s)\n", sig->signal_event);
@@ -316,7 +316,7 @@ source_client_signal_generate(const DBus_Signal *sig, Eina_Strbuf *c_code, Eina_
316 316
317 eina_strbuf_append_printf(h, "typedef struct _%s\n", sig->struct_name); 317 eina_strbuf_append_printf(h, "typedef struct _%s\n", sig->struct_name);
318 eina_strbuf_append_printf(h, "{\n"); 318 eina_strbuf_append_printf(h, "{\n");
319 eina_strbuf_append_printf(h, " EDBus_Proxy *proxy;\n"); 319 eina_strbuf_append_printf(h, " Eldbus_Proxy *proxy;\n");
320 320
321 if (sig->complex) 321 if (sig->complex)
322 { 322 {
@@ -351,16 +351,16 @@ jump_simple_stuff:
351 eina_strbuf_append_printf(c_code, "}\n"); 351 eina_strbuf_append_printf(c_code, "}\n");
352 352
353 //cb function 353 //cb function
354 eina_strbuf_append_printf(c_code, "\nstatic void\n%s(void *data, const EDBus_Message *msg)\n{\n", sig->cb_name); 354 eina_strbuf_append_printf(c_code, "\nstatic void\n%s(void *data, const Eldbus_Message *msg)\n{\n", sig->cb_name);
355 eina_strbuf_append_printf(c_code, " EDBus_Proxy *proxy = data;\n"); 355 eina_strbuf_append_printf(c_code, " Eldbus_Proxy *proxy = data;\n");
356 eina_strbuf_append_printf(c_code, " %s *s_data = calloc(1, sizeof(%s));\n", sig->struct_name, sig->struct_name); 356 eina_strbuf_append_printf(c_code, " %s *s_data = calloc(1, sizeof(%s));\n", sig->struct_name, sig->struct_name);
357 eina_strbuf_append_printf(c_code, " s_data->proxy = proxy;\n"); 357 eina_strbuf_append_printf(c_code, " s_data->proxy = proxy;\n");
358 if (sig->complex) 358 if (sig->complex)
359 { 359 {
360 eina_strbuf_append_printf(c_code, " s_data->value = edbus_message_to_eina_value(msg);\n"); 360 eina_strbuf_append_printf(c_code, " s_data->value = eldbus_message_to_eina_value(msg);\n");
361 goto end_signal; 361 goto end_signal;
362 } 362 }
363 eina_strbuf_append_printf(c_code, " if (!edbus_message_arguments_get(msg, \"%s\"%s))\n", eina_strbuf_string_get(full_signature), eina_strbuf_string_get(parameters)); 363 eina_strbuf_append_printf(c_code, " if (!eldbus_message_arguments_get(msg, \"%s\"%s))\n", eina_strbuf_string_get(full_signature), eina_strbuf_string_get(parameters));
364 eina_strbuf_append_printf(c_code, " {\n"); 364 eina_strbuf_append_printf(c_code, " {\n");
365 eina_strbuf_append_printf(c_code, " ERR(\"Error: Getting arguments from message.\");\n"); 365 eina_strbuf_append_printf(c_code, " ERR(\"Error: Getting arguments from message.\");\n");
366 eina_strbuf_append_printf(c_code, " return;\n"); 366 eina_strbuf_append_printf(c_code, " return;\n");
@@ -381,31 +381,31 @@ static const char *
381prop_cb_get(const DBus_Property *prop) 381prop_cb_get(const DBus_Property *prop)
382{ 382{
383 if (prop->complex) 383 if (prop->complex)
384 return "EDBus_Codegen_Property_Complex_Get_Cb"; 384 return "Eldbus_Codegen_Property_Complex_Get_Cb";
385 switch (prop->type[0]) 385 switch (prop->type[0])
386 { 386 {
387 case 's': 387 case 's':
388 case 'o': 388 case 'o':
389 return "EDBus_Codegen_Property_String_Get_Cb"; 389 return "Eldbus_Codegen_Property_String_Get_Cb";
390 case 'i': 390 case 'i':
391 case 'h': 391 case 'h':
392 return "EDBus_Codegen_Property_Int32_Get_Cb"; 392 return "Eldbus_Codegen_Property_Int32_Get_Cb";
393 case 'y': 393 case 'y':
394 return "EDBus_Codegen_Property_Byte_Get_Cb"; 394 return "Eldbus_Codegen_Property_Byte_Get_Cb";
395 case 'b': 395 case 'b':
396 return "EDBus_Codegen_Property_Bool_Get_Cb"; 396 return "Eldbus_Codegen_Property_Bool_Get_Cb";
397 case 'n': 397 case 'n':
398 return "EDBus_Codegen_Property_Int16_Get_Cb"; 398 return "Eldbus_Codegen_Property_Int16_Get_Cb";
399 case 'q': 399 case 'q':
400 return "EDBus_Codegen_Property_Uint16_Get_Cb"; 400 return "Eldbus_Codegen_Property_Uint16_Get_Cb";
401 case 'u': 401 case 'u':
402 return "EDBus_Codegen_Property_Uint32_Get_Cb"; 402 return "Eldbus_Codegen_Property_Uint32_Get_Cb";
403 case 'd': 403 case 'd':
404 return "EDBus_Codegen_Property_Double_Get_Cb"; 404 return "Eldbus_Codegen_Property_Double_Get_Cb";
405 case 'x': 405 case 'x':
406 return "EDBus_Codegen_Property_Int64_Get_Cb"; 406 return "Eldbus_Codegen_Property_Int64_Get_Cb";
407 case 't': 407 case 't':
408 return "EDBus_Codegen_Property_Uint64_Get_Cb"; 408 return "Eldbus_Codegen_Property_Uint64_Get_Cb";
409 default: 409 default:
410 return "Unexpected_type"; 410 return "Unexpected_type";
411 } 411 }
@@ -423,33 +423,33 @@ static void
423source_client_property_generate_get(const DBus_Property *prop, Eina_Strbuf *c_code, Eina_Strbuf *h) 423source_client_property_generate_get(const DBus_Property *prop, Eina_Strbuf *c_code, Eina_Strbuf *h)
424{ 424{
425 //callback 425 //callback
426 eina_strbuf_append_printf(c_code, "\nstatic void\n%s(void *data, const EDBus_Message *msg, EDBus_Pending *pending)\n{\n", prop->cb_name); 426 eina_strbuf_append_printf(c_code, "\nstatic void\n%s(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)\n{\n", prop->cb_name);
427 eina_strbuf_append_printf(c_code, " void *user_data = edbus_pending_data_del(pending, \"__user_data\");\n"); 427 eina_strbuf_append_printf(c_code, " void *user_data = eldbus_pending_data_del(pending, \"__user_data\");\n");
428 eina_strbuf_append_printf(c_code, " const char *error, *error_msg;\n"); 428 eina_strbuf_append_printf(c_code, " const char *error, *error_msg;\n");
429 eina_strbuf_append_printf(c_code, " %s cb = data;\n", prop_cb_get(prop)); 429 eina_strbuf_append_printf(c_code, " %s cb = data;\n", prop_cb_get(prop));
430 eina_strbuf_append_printf(c_code, " EDBus_Proxy *proxy = edbus_pending_data_del(pending, \"__proxy\");\n"); 430 eina_strbuf_append_printf(c_code, " Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, \"__proxy\");\n");
431 eina_strbuf_append_printf(c_code, " EDBus_Message_Iter *variant;\n"); 431 eina_strbuf_append_printf(c_code, " Eldbus_Message_Iter *variant;\n");
432 if (prop->complex) 432 if (prop->complex)
433 eina_strbuf_append_printf(c_code, " Eina_Value *v, stack_value;\n"); 433 eina_strbuf_append_printf(c_code, " Eina_Value *v, stack_value;\n");
434 else 434 else
435 eina_strbuf_append_printf(c_code, " %sv;\n", dbus_type2c_type(prop->type)); 435 eina_strbuf_append_printf(c_code, " %sv;\n", dbus_type2c_type(prop->type));
436 eina_strbuf_append_printf(c_code, " if (edbus_message_error_get(msg, &error, &error_msg))\n"); 436 eina_strbuf_append_printf(c_code, " if (eldbus_message_error_get(msg, &error, &error_msg))\n");
437 eina_strbuf_append_printf(c_code, " {\n"); 437 eina_strbuf_append_printf(c_code, " {\n");
438 eina_strbuf_append_printf(c_code, " EDBus_Error_Info error_info = {error, error_msg};\n"); 438 eina_strbuf_append_printf(c_code, " Eldbus_Error_Info error_info = {error, error_msg};\n");
439 eina_strbuf_append_printf(c_code, " cb(user_data, pending, \"%s\", proxy, &error_info, %s);\n", prop->name, null_or_zero(prop->type)); 439 eina_strbuf_append_printf(c_code, " cb(user_data, pending, \"%s\", proxy, &error_info, %s);\n", prop->name, null_or_zero(prop->type));
440 eina_strbuf_append_printf(c_code, " return;\n"); 440 eina_strbuf_append_printf(c_code, " return;\n");
441 eina_strbuf_append_printf(c_code, " }\n"); 441 eina_strbuf_append_printf(c_code, " }\n");
442 442
443 eina_strbuf_append_printf(c_code, " if (!edbus_message_arguments_get(msg, \"v\", &variant))\n"); 443 eina_strbuf_append_printf(c_code, " if (!eldbus_message_arguments_get(msg, \"v\", &variant))\n");
444 eina_strbuf_append_printf(c_code, " {\n"); 444 eina_strbuf_append_printf(c_code, " {\n");
445 eina_strbuf_append_printf(c_code, " EDBus_Error_Info error_info = {\"\", \"\"};\n"); 445 eina_strbuf_append_printf(c_code, " Eldbus_Error_Info error_info = {\"\", \"\"};\n");
446 eina_strbuf_append_printf(c_code, " cb(user_data, pending, \"%s\", proxy, &error_info, %s);\n", prop->name, null_or_zero(prop->type)); 446 eina_strbuf_append_printf(c_code, " cb(user_data, pending, \"%s\", proxy, &error_info, %s);\n", prop->name, null_or_zero(prop->type));
447 eina_strbuf_append_printf(c_code, " return;\n"); 447 eina_strbuf_append_printf(c_code, " return;\n");
448 eina_strbuf_append_printf(c_code, " }\n"); 448 eina_strbuf_append_printf(c_code, " }\n");
449 449
450 if (prop->complex) 450 if (prop->complex)
451 { 451 {
452 eina_strbuf_append_printf(c_code, " v = edbus_message_iter_struct_like_to_eina_value(variant);\n"); 452 eina_strbuf_append_printf(c_code, " v = eldbus_message_iter_struct_like_to_eina_value(variant);\n");
453 eina_strbuf_append_printf(c_code, " eina_value_struct_value_get(v, \"arg0\", &stack_value);\n"); 453 eina_strbuf_append_printf(c_code, " eina_value_struct_value_get(v, \"arg0\", &stack_value);\n");
454 eina_strbuf_append_printf(c_code, " cb(user_data, pending, \"%s\", proxy, NULL, &stack_value);\n", prop->name); 454 eina_strbuf_append_printf(c_code, " cb(user_data, pending, \"%s\", proxy, NULL, &stack_value);\n", prop->name);
455 eina_strbuf_append_printf(c_code, " eina_value_flush(&stack_value);\n"); 455 eina_strbuf_append_printf(c_code, " eina_value_flush(&stack_value);\n");
@@ -457,9 +457,9 @@ source_client_property_generate_get(const DBus_Property *prop, Eina_Strbuf *c_co
457 } 457 }
458 else 458 else
459 { 459 {
460 eina_strbuf_append_printf(c_code, " if (!edbus_message_iter_arguments_get(variant, \"%s\", &v))\n", prop->type); 460 eina_strbuf_append_printf(c_code, " if (!eldbus_message_iter_arguments_get(variant, \"%s\", &v))\n", prop->type);
461 eina_strbuf_append_printf(c_code, " {\n"); 461 eina_strbuf_append_printf(c_code, " {\n");
462 eina_strbuf_append_printf(c_code, " EDBus_Error_Info error_info = {\"\", \"\"};\n"); 462 eina_strbuf_append_printf(c_code, " Eldbus_Error_Info error_info = {\"\", \"\"};\n");
463 eina_strbuf_append_printf(c_code, " cb(user_data, pending, \"%s\", proxy, &error_info, %s);\n", prop->name, null_or_zero(prop->type)); 463 eina_strbuf_append_printf(c_code, " cb(user_data, pending, \"%s\", proxy, &error_info, %s);\n", prop->name, null_or_zero(prop->type));
464 eina_strbuf_append_printf(c_code, " return;\n"); 464 eina_strbuf_append_printf(c_code, " return;\n");
465 eina_strbuf_append_printf(c_code, " }\n"); 465 eina_strbuf_append_printf(c_code, " }\n");
@@ -468,15 +468,15 @@ source_client_property_generate_get(const DBus_Property *prop, Eina_Strbuf *c_co
468 eina_strbuf_append_printf(c_code, "}\n"); 468 eina_strbuf_append_printf(c_code, "}\n");
469 469
470 //call 470 //call
471 eina_strbuf_append_printf(h, "EDBus_Pending *%s_propget(EDBus_Proxy *proxy, %s cb, const void *data);\n", prefix_append(prop->c_name), prop_cb_get(prop)); 471 eina_strbuf_append_printf(h, "Eldbus_Pending *%s_propget(Eldbus_Proxy *proxy, %s cb, const void *data);\n", prefix_append(prop->c_name), prop_cb_get(prop));
472 472
473 eina_strbuf_append_printf(c_code, "\nEDBus_Pending *\n%s_propget(EDBus_Proxy *proxy, %s cb, const void *data)\n{\n", prefix_append(prop->c_name), prop_cb_get(prop)); 473 eina_strbuf_append_printf(c_code, "\nEldbus_Pending *\n%s_propget(Eldbus_Proxy *proxy, %s cb, const void *data)\n{\n", prefix_append(prop->c_name), prop_cb_get(prop));
474 eina_strbuf_append_printf(c_code, " EDBus_Pending *p;\n"); 474 eina_strbuf_append_printf(c_code, " Eldbus_Pending *p;\n");
475 eina_strbuf_append_printf(c_code, " EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL);\n"); 475 eina_strbuf_append_printf(c_code, " EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL);\n");
476 eina_strbuf_append_printf(c_code, " p = edbus_proxy_property_get(proxy, \"%s\", %s, cb);\n", prop->name, prop->cb_name); 476 eina_strbuf_append_printf(c_code, " p = eldbus_proxy_property_get(proxy, \"%s\", %s, cb);\n", prop->name, prop->cb_name);
477 eina_strbuf_append_printf(c_code, " if (data)\n"); 477 eina_strbuf_append_printf(c_code, " if (data)\n");
478 eina_strbuf_append_printf(c_code, " edbus_pending_data_set(p, \"__user_data\", data);\n"); 478 eina_strbuf_append_printf(c_code, " eldbus_pending_data_set(p, \"__user_data\", data);\n");
479 eina_strbuf_append_printf(c_code, " edbus_pending_data_set(p, \"__proxy\", proxy);\n"); 479 eina_strbuf_append_printf(c_code, " eldbus_pending_data_set(p, \"__proxy\", proxy);\n");
480 eina_strbuf_append_printf(c_code, " return p;\n"); 480 eina_strbuf_append_printf(c_code, " return p;\n");
481 eina_strbuf_append_printf(c_code, "}\n"); 481 eina_strbuf_append_printf(c_code, "}\n");
482} 482}
@@ -485,14 +485,14 @@ static void
485source_client_property_generate_set(const DBus_Property *prop, Eina_Strbuf *c_code, Eina_Strbuf *h) 485source_client_property_generate_set(const DBus_Property *prop, Eina_Strbuf *c_code, Eina_Strbuf *h)
486{ 486{
487 //callback 487 //callback
488 eina_strbuf_append_printf(c_code, "\nstatic void\n%s_set(void *data, const EDBus_Message *msg, EDBus_Pending *pending)\n{\n", prop->cb_name); 488 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);
489 eina_strbuf_append_printf(c_code, " const char *error, *error_msg;\n"); 489 eina_strbuf_append_printf(c_code, " const char *error, *error_msg;\n");
490 eina_strbuf_append_printf(c_code, " void *user_data = edbus_pending_data_del(pending, \"__user_data\");\n"); 490 eina_strbuf_append_printf(c_code, " void *user_data = eldbus_pending_data_del(pending, \"__user_data\");\n");
491 eina_strbuf_append_printf(c_code, " EDBus_Proxy *proxy = edbus_pending_data_del(pending, \"__proxy\");\n"); 491 eina_strbuf_append_printf(c_code, " Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, \"__proxy\");\n");
492 eina_strbuf_append_printf(c_code, " EDBus_Codegen_Property_Set_Cb cb = data;\n"); 492 eina_strbuf_append_printf(c_code, " Eldbus_Codegen_Property_Set_Cb cb = data;\n");
493 eina_strbuf_append_printf(c_code, " if (edbus_message_error_get(msg, &error, &error_msg))"); 493 eina_strbuf_append_printf(c_code, " if (eldbus_message_error_get(msg, &error, &error_msg))");
494 eina_strbuf_append_printf(c_code, " {\n"); 494 eina_strbuf_append_printf(c_code, " {\n");
495 eina_strbuf_append_printf(c_code, " EDBus_Error_Info error_info = {error, error_msg};\n\n"); 495 eina_strbuf_append_printf(c_code, " Eldbus_Error_Info error_info = {error, error_msg};\n\n");
496 eina_strbuf_append_printf(c_code, " cb(user_data, \"%s\", proxy, pending, &error_info);\n", prop->name); 496 eina_strbuf_append_printf(c_code, " cb(user_data, \"%s\", proxy, pending, &error_info);\n", prop->name);
497 eina_strbuf_append_printf(c_code, " return;\n"); 497 eina_strbuf_append_printf(c_code, " return;\n");
498 eina_strbuf_append_printf(c_code, " }\n"); 498 eina_strbuf_append_printf(c_code, " }\n");
@@ -500,15 +500,15 @@ source_client_property_generate_set(const DBus_Property *prop, Eina_Strbuf *c_co
500 eina_strbuf_append_printf(c_code, "}\n"); 500 eina_strbuf_append_printf(c_code, "}\n");
501 501
502 //call 502 //call
503 eina_strbuf_append_printf(h, "EDBus_Pending *%s_propset(EDBus_Proxy *proxy, EDBus_Codegen_Property_Set_Cb cb, const void *data, const void *value);\n", prefix_append(prop->c_name)); 503 eina_strbuf_append_printf(h, "Eldbus_Pending *%s_propset(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Set_Cb cb, const void *data, const void *value);\n", prefix_append(prop->c_name));
504 504
505 eina_strbuf_append_printf(c_code, "\nEDBus_Pending *\n%s_propset(EDBus_Proxy *proxy, EDBus_Codegen_Property_Set_Cb cb, const void *data, const void *value)\n{\n", prop->c_name); 505 eina_strbuf_append_printf(c_code, "\nEldbus_Pending *\n%s_propset(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Set_Cb cb, const void *data, const void *value)\n{\n", prop->c_name);
506 eina_strbuf_append_printf(c_code, " EDBus_Pending *p;\n"); 506 eina_strbuf_append_printf(c_code, " Eldbus_Pending *p;\n");
507 eina_strbuf_append_printf(c_code, " EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL);\n"); 507 eina_strbuf_append_printf(c_code, " EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL);\n");
508 eina_strbuf_append_printf(c_code, " EINA_SAFETY_ON_NULL_RETURN_VAL(value, NULL);\n"); 508 eina_strbuf_append_printf(c_code, " EINA_SAFETY_ON_NULL_RETURN_VAL(value, NULL);\n");
509 eina_strbuf_append_printf(c_code, " p = edbus_proxy_property_set(proxy, \"%s\", \"%s\", value, %s_set, data);\n", prop->name, prop->type, prop->cb_name); 509 eina_strbuf_append_printf(c_code, " p = eldbus_proxy_property_set(proxy, \"%s\", \"%s\", value, %s_set, data);\n", prop->name, prop->type, prop->cb_name);
510 eina_strbuf_append_printf(c_code, " edbus_pending_data_set(p, \"__user_data\", data);\n"); 510 eina_strbuf_append_printf(c_code, " eldbus_pending_data_set(p, \"__user_data\", data);\n");
511 eina_strbuf_append_printf(c_code, " edbus_pending_data_set(p, \"__proxy\", proxy);\n"); 511 eina_strbuf_append_printf(c_code, " eldbus_pending_data_set(p, \"__proxy\", proxy);\n");
512 eina_strbuf_append_printf(c_code, " return p;\n"); 512 eina_strbuf_append_printf(c_code, " return p;\n");
513 eina_strbuf_append_printf(c_code, "}\n"); 513 eina_strbuf_append_printf(c_code, "}\n");
514} 514}
@@ -545,7 +545,7 @@ source_client_generate(DBus_Object *path, const char *prefix, const char *interf
545 c_header = eina_strbuf_new(); 545 c_header = eina_strbuf_new();
546 c_code = eina_strbuf_new(); 546 c_code = eina_strbuf_new();
547 547
548 aux = string_build("EDBUS_%s_H", iface->c_name); 548 aux = string_build("ELDBUS_%s_H", iface->c_name);
549 for (i = 0; aux[i]; i++) 549 for (i = 0; aux[i]; i++)
550 aux[i] = toupper(aux[i]); 550 aux[i] = toupper(aux[i]);
551 eina_strbuf_append_printf(h, "#ifndef %s\n", aux); 551 eina_strbuf_append_printf(h, "#ifndef %s\n", aux);
@@ -554,16 +554,16 @@ source_client_generate(DBus_Object *path, const char *prefix, const char *interf
554 554
555 eina_strbuf_append_printf(h, "#include <Eina.h>\n"); 555 eina_strbuf_append_printf(h, "#include <Eina.h>\n");
556 eina_strbuf_append_printf(h, "#include <Ecore.h>\n"); 556 eina_strbuf_append_printf(h, "#include <Ecore.h>\n");
557 eina_strbuf_append_printf(h, "#include <EDBus.h>\n"); 557 eina_strbuf_append_printf(h, "#include <Eldbus.h>\n");
558 eina_strbuf_append_printf(h, "#include \"edbus_utils.h\"\n\n"); 558 eina_strbuf_append_printf(h, "#include \"eldbus_utils.h\"\n\n");
559 eina_strbuf_append_printf(h, "EDBus_Proxy *%s_proxy_get(EDBus_Connection *conn, const char *bus, const char *path);\n", prefix_append(iface->c_name)); 559 eina_strbuf_append_printf(h, "Eldbus_Proxy *%s_proxy_get(Eldbus_Connection *conn, const char *bus, const char *path);\n", prefix_append(iface->c_name));
560 eina_strbuf_append_printf(h, "void %s_proxy_unref(EDBus_Proxy *proxy);\n", prefix_append(iface->c_name)); 560 eina_strbuf_append_printf(h, "void %s_proxy_unref(Eldbus_Proxy *proxy);\n", prefix_append(iface->c_name));
561 eina_strbuf_append_printf(h, "void %s_log_domain_set(int id);\n", prefix_append(iface->c_name)); 561 eina_strbuf_append_printf(h, "void %s_log_domain_set(int id);\n", prefix_append(iface->c_name));
562 562
563 if (interface_name && output_name) 563 if (interface_name && output_name)
564 eina_strbuf_append_printf(c_header, "#include \"%s.h\"\n\n", output_name); 564 eina_strbuf_append_printf(c_header, "#include \"%s.h\"\n\n", output_name);
565 else 565 else
566 eina_strbuf_append_printf(c_header, "#include \"edbus_%s.h\"\n\n", iface->c_name); 566 eina_strbuf_append_printf(c_header, "#include \"eldbus_%s.h\"\n\n", iface->c_name);
567 567
568 eina_strbuf_append_printf(c_header, "static int _log_main = -1;\n"); 568 eina_strbuf_append_printf(c_header, "static int _log_main = -1;\n");
569 eina_strbuf_append_printf(c_header, "#undef ERR\n"); 569 eina_strbuf_append_printf(c_header, "#undef ERR\n");
@@ -573,20 +573,20 @@ source_client_generate(DBus_Object *path, const char *prefix, const char *interf
573 eina_strbuf_append_printf(c_init_function, " _log_main = id;\n"); 573 eina_strbuf_append_printf(c_init_function, " _log_main = id;\n");
574 eina_strbuf_append_printf(c_init_function, "}\n"); 574 eina_strbuf_append_printf(c_init_function, "}\n");
575 575
576 eina_strbuf_append_printf(c_init_function, "\nvoid\n%s_proxy_unref(EDBus_Proxy *proxy)\n{\n", prefix_append(iface->c_name)); 576 eina_strbuf_append_printf(c_init_function, "\nvoid\n%s_proxy_unref(Eldbus_Proxy *proxy)\n{\n", prefix_append(iface->c_name));
577 eina_strbuf_append_printf(c_init_function, " EDBus_Object *obj = edbus_proxy_object_get(proxy);\n"); 577 eina_strbuf_append_printf(c_init_function, " Eldbus_Object *obj = eldbus_proxy_object_get(proxy);\n");
578 eina_strbuf_append_printf(c_init_function, " edbus_proxy_unref(proxy);\n"); 578 eina_strbuf_append_printf(c_init_function, " eldbus_proxy_unref(proxy);\n");
579 eina_strbuf_append_printf(c_init_function, " edbus_object_unref(obj);\n"); 579 eina_strbuf_append_printf(c_init_function, " eldbus_object_unref(obj);\n");
580 eina_strbuf_append_printf(c_init_function, "}\n"); 580 eina_strbuf_append_printf(c_init_function, "}\n");
581 581
582 eina_strbuf_append_printf(c_init_function, "\nEDBus_Proxy *\n%s_proxy_get(EDBus_Connection *conn, const char *bus, const char *path)\n{\n", prefix_append(iface->c_name)); 582 eina_strbuf_append_printf(c_init_function, "\nEldbus_Proxy *\n%s_proxy_get(Eldbus_Connection *conn, const char *bus, const char *path)\n{\n", prefix_append(iface->c_name));
583 eina_strbuf_append_printf(c_init_function, " EDBus_Object *obj;\n"); 583 eina_strbuf_append_printf(c_init_function, " Eldbus_Object *obj;\n");
584 eina_strbuf_append_printf(c_init_function, " EDBus_Proxy *proxy;\n"); 584 eina_strbuf_append_printf(c_init_function, " Eldbus_Proxy *proxy;\n");
585 eina_strbuf_append_printf(c_init_function, " EINA_SAFETY_ON_NULL_RETURN_VAL(conn, NULL);\n"); 585 eina_strbuf_append_printf(c_init_function, " EINA_SAFETY_ON_NULL_RETURN_VAL(conn, NULL);\n");
586 eina_strbuf_append_printf(c_init_function, " EINA_SAFETY_ON_NULL_RETURN_VAL(bus, NULL);\n"); 586 eina_strbuf_append_printf(c_init_function, " EINA_SAFETY_ON_NULL_RETURN_VAL(bus, NULL);\n");
587 eina_strbuf_append_printf(c_init_function, " if (!path) path = \"%s\";\n", path->name); 587 eina_strbuf_append_printf(c_init_function, " if (!path) path = \"%s\";\n", path->name);
588 eina_strbuf_append_printf(c_init_function, " obj = edbus_object_get(conn, bus, path);\n"); 588 eina_strbuf_append_printf(c_init_function, " obj = eldbus_object_get(conn, bus, path);\n");
589 eina_strbuf_append_printf(c_init_function, " proxy = edbus_proxy_get(obj, \"%s\");\n", iface->name); 589 eina_strbuf_append_printf(c_init_function, " proxy = eldbus_proxy_get(obj, \"%s\");\n", iface->name);
590 590
591 EINA_INLIST_FOREACH(iface->methods, method) 591 EINA_INLIST_FOREACH(iface->methods, method)
592 source_client_method_generate(method, c_code, h); 592 source_client_method_generate(method, c_code, h);
@@ -605,7 +605,7 @@ source_client_generate(DBus_Object *path, const char *prefix, const char *interf
605 if (interface_name && output_name) 605 if (interface_name && output_name)
606 file_name = string_build("%s.h", output_name); 606 file_name = string_build("%s.h", output_name);
607 else 607 else
608 file_name = string_build("edbus_%s.h", iface->c_name); 608 file_name = string_build("eldbus_%s.h", iface->c_name);
609 file_write(file_name, eina_strbuf_string_get(h)); 609 file_write(file_name, eina_strbuf_string_get(h));
610 eina_strbuf_free(h); 610 eina_strbuf_free(h);
611 free(file_name); 611 free(file_name);
@@ -618,7 +618,7 @@ source_client_generate(DBus_Object *path, const char *prefix, const char *interf
618 if (interface_name && output_name) 618 if (interface_name && output_name)
619 file_name = string_build("%s.c", output_name); 619 file_name = string_build("%s.c", output_name);
620 else 620 else
621 file_name = string_build("edbus_%s.c", iface->c_name); 621 file_name = string_build("eldbus_%s.c", iface->c_name);
622 file_write(file_name, eina_strbuf_string_get(c_header)); 622 file_write(file_name, eina_strbuf_string_get(c_header));
623 eina_strbuf_free(c_header); 623 eina_strbuf_free(c_header);
624 free(file_name); 624 free(file_name);
diff --git a/src/bin/edbus/utils.c b/src/bin/eldbus/utils.c
index 47d8c77c19..a020445e1d 100644
--- a/src/bin/edbus/utils.c
+++ b/src/bin/eldbus/utils.c
@@ -132,28 +132,28 @@ string_build(const char *fmt, ...)
132} 132}
133 133
134#define UTIL_H "\ 134#define UTIL_H "\
135#ifndef EDBUS_UTILS_H\n\ 135#ifndef ELDBUS_UTILS_H\n\
136#define EDBUS_UTILS_H 1\n\ 136#define ELDBUS_UTILS_H 1\n\
137\n\ 137\n\
138typedef struct _EDBus_Error_Info\n\ 138typedef struct _Eldbus_Error_Info\n\
139{\n\ 139{\n\
140 const char *error;\n\ 140 const char *error;\n\
141 const char *message;\n\ 141 const char *message;\n\
142} EDBus_Error_Info;\n\ 142} Eldbus_Error_Info;\n\
143\n\ 143\n\
144typedef void (*EDBus_Codegen_Property_Set_Cb)(void *data, const char *propname, EDBus_Proxy *proxy, EDBus_Pending *p, EDBus_Error_Info *error_info);\n\ 144typedef void (*Eldbus_Codegen_Property_Set_Cb)(void *data, const char *propname, Eldbus_Proxy *proxy, Eldbus_Pending *p, Eldbus_Error_Info *error_info);\n\
145\n\ 145\n\
146typedef void (*EDBus_Codegen_Property_String_Get_Cb)(void *data, EDBus_Pending *p, const char *propname, EDBus_Proxy *proxy, EDBus_Error_Info *error_info, const char *value);\n\ 146typedef void (*Eldbus_Codegen_Property_String_Get_Cb)(void *data, Eldbus_Pending *p, const char *propname, Eldbus_Proxy *proxy, Eldbus_Error_Info *error_info, const char *value);\n\
147typedef void (*EDBus_Codegen_Property_Int32_Get_Cb)(void *data, EDBus_Pending *p, const char *propname, EDBus_Proxy *proxy, EDBus_Error_Info *error_info, int value);\n\ 147typedef void (*Eldbus_Codegen_Property_Int32_Get_Cb)(void *data, Eldbus_Pending *p, const char *propname, Eldbus_Proxy *proxy, Eldbus_Error_Info *error_info, int value);\n\
148typedef void (*EDBus_Codegen_Property_Byte_Get_Cb)(void *data, EDBus_Pending *p, const char *propname, EDBus_Proxy *proxy, EDBus_Error_Info *error_info, unsigned char value);\n\ 148typedef void (*Eldbus_Codegen_Property_Byte_Get_Cb)(void *data, Eldbus_Pending *p, const char *propname, Eldbus_Proxy *proxy, Eldbus_Error_Info *error_info, unsigned char value);\n\
149typedef void (*EDBus_Codegen_Property_Bool_Get_Cb)(void *data, EDBus_Pending *p, const char *propname, EDBus_Proxy *proxy, EDBus_Error_Info *error_info, Eina_Bool value);\n\ 149typedef void (*Eldbus_Codegen_Property_Bool_Get_Cb)(void *data, Eldbus_Pending *p, const char *propname, Eldbus_Proxy *proxy, Eldbus_Error_Info *error_info, Eina_Bool value);\n\
150typedef void (*EDBus_Codegen_Property_Int16_Get_Cb)(void *data, EDBus_Pending *p, const char *propname, EDBus_Proxy *proxy, EDBus_Error_Info *error_info, short int value);\n\ 150typedef void (*Eldbus_Codegen_Property_Int16_Get_Cb)(void *data, Eldbus_Pending *p, const char *propname, Eldbus_Proxy *proxy, Eldbus_Error_Info *error_info, short int value);\n\
151typedef void (*EDBus_Codegen_Property_Uint16_Get_Cb)(void *data, EDBus_Pending *p, const char *propname, EDBus_Proxy *proxy, EDBus_Error_Info *error_info, unsigned short int value);\n\ 151typedef void (*Eldbus_Codegen_Property_Uint16_Get_Cb)(void *data, Eldbus_Pending *p, const char *propname, Eldbus_Proxy *proxy, Eldbus_Error_Info *error_info, unsigned short int value);\n\
152typedef void (*EDBus_Codegen_Property_Uint32_Get_Cb)(void *data, EDBus_Pending *p, const char *propname, EDBus_Proxy *proxy, EDBus_Error_Info *error_info, unsigned int value);\n\ 152typedef void (*Eldbus_Codegen_Property_Uint32_Get_Cb)(void *data, Eldbus_Pending *p, const char *propname, Eldbus_Proxy *proxy, Eldbus_Error_Info *error_info, unsigned int value);\n\
153typedef void (*EDBus_Codegen_Property_Double_Get_Cb)(void *data, EDBus_Pending *p, const char *propname, EDBus_Proxy *proxy, EDBus_Error_Info *error_info, double value);\n\ 153typedef void (*Eldbus_Codegen_Property_Double_Get_Cb)(void *data, Eldbus_Pending *p, const char *propname, Eldbus_Proxy *proxy, Eldbus_Error_Info *error_info, double value);\n\
154typedef void (*EDBus_Codegen_Property_Int64_Get_Cb)(void *data, EDBus_Pending *p, const char *propname, EDBus_Proxy *proxy, EDBus_Error_Info *error_info, int64_t value);\n\ 154typedef void (*Eldbus_Codegen_Property_Int64_Get_Cb)(void *data, Eldbus_Pending *p, const char *propname, Eldbus_Proxy *proxy, Eldbus_Error_Info *error_info, int64_t value);\n\
155typedef void (*EDBus_Codegen_Property_Uint64_Get_Cb)(void *data, EDBus_Pending *p, const char *propname, EDBus_Proxy *proxy, EDBus_Error_Info *error_info, uint64_t value);\n\ 155typedef void (*Eldbus_Codegen_Property_Uint64_Get_Cb)(void *data, Eldbus_Pending *p, const char *propname, Eldbus_Proxy *proxy, Eldbus_Error_Info *error_info, uint64_t value);\n\
156typedef void (*EDBus_Codegen_Property_Complex_Get_Cb)(void *data, EDBus_Pending *p, const char *propname, EDBus_Proxy *proxy, EDBus_Error_Info *error_info, Eina_Value *value);\n\ 156typedef void (*Eldbus_Codegen_Property_Complex_Get_Cb)(void *data, Eldbus_Pending *p, const char *propname, Eldbus_Proxy *proxy, Eldbus_Error_Info *error_info, Eina_Value *value);\n\
157\n\ 157\n\
158#endif\ 158#endif\
159" 159"
@@ -161,5 +161,5 @@ typedef void (*EDBus_Codegen_Property_Complex_Get_Cb)(void *data, EDBus_Pending
161Eina_Bool 161Eina_Bool
162util_h_write(void) 162util_h_write(void)
163{ 163{
164 return file_write("edbus_utils.h", UTIL_H); 164 return file_write("eldbus_utils.h", UTIL_H);
165} 165}
diff --git a/src/bin/ethumb_client/ethumbd.c b/src/bin/ethumb_client/ethumbd.c
index a68aed618c..11433ef0e9 100644
--- a/src/bin/ethumb_client/ethumbd.c
+++ b/src/bin/ethumb_client/ethumbd.c
@@ -33,7 +33,7 @@
33#include <Eina.h> 33#include <Eina.h>
34#include <Ecore_Getopt.h> 34#include <Ecore_Getopt.h>
35#include <Ecore.h> 35#include <Ecore.h>
36#include <EDBus.h> 36#include <Eldbus.h>
37#include <Ethumb.h> 37#include <Ethumb.h>
38#include <Ethumb_Client.h> 38#include <Ethumb_Client.h>
39 39
@@ -130,7 +130,7 @@ struct _Ethumbd_Object
130 int id_count; 130 int id_count;
131 int max_id; 131 int max_id;
132 int min_id; 132 int min_id;
133 EDBus_Service_Interface *iface; 133 Eldbus_Service_Interface *iface;
134}; 134};
135 135
136struct _Ethumbd_Queue 136struct _Ethumbd_Queue
@@ -154,7 +154,7 @@ struct _Ethumbd_Slave
154 154
155struct _Ethumbd 155struct _Ethumbd
156{ 156{
157 EDBus_Connection *conn; 157 Eldbus_Connection *conn;
158 Ecore_Idler *idler; 158 Ecore_Idler *idler;
159 Ethumbd_Request *processing; 159 Ethumbd_Request *processing;
160 Ethumbd_Queue queue; 160 Ethumbd_Queue queue;
@@ -194,27 +194,27 @@ const Ecore_Getopt optdesc = {
194 } 194 }
195}; 195};
196 196
197static EDBus_Message *_ethumb_dbus_queue_add_cb(const EDBus_Service_Interface *iface, const EDBus_Message *msg); 197static Eldbus_Message *_ethumb_dbus_queue_add_cb(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg);
198static EDBus_Message *_ethumb_dbus_queue_remove_cb(const EDBus_Service_Interface *iface, const EDBus_Message *msg); 198static Eldbus_Message *_ethumb_dbus_queue_remove_cb(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg);
199static EDBus_Message *_ethumb_dbus_queue_clear_cb(const EDBus_Service_Interface *iface, const EDBus_Message *msg); 199static Eldbus_Message *_ethumb_dbus_queue_clear_cb(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg);
200static EDBus_Message *_ethumb_dbus_ethumb_setup_cb(const EDBus_Service_Interface *iface, const EDBus_Message *msg); 200static Eldbus_Message *_ethumb_dbus_ethumb_setup_cb(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg);
201static EDBus_Message *_ethumb_dbus_delete_cb(const EDBus_Service_Interface *iface, const EDBus_Message *msg); 201static Eldbus_Message *_ethumb_dbus_delete_cb(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg);
202 202
203static const EDBus_Method _ethumb_dbus_objects_methods[] = { 203static const Eldbus_Method _ethumb_dbus_objects_methods[] = {
204 { 204 {
205 "queue_add", 205 "queue_add",
206 EDBUS_ARGS({"i", "id"}, {"ay", "file"}, {"ay", "key"}, {"ay", "thumb"}, {"ay", "thumb_key"}), 206 ELDBUS_ARGS({"i", "id"}, {"ay", "file"}, {"ay", "key"}, {"ay", "thumb"}, {"ay", "thumb_key"}),
207 EDBUS_ARGS({"i", "queue_id"}), _ethumb_dbus_queue_add_cb, 0 207 ELDBUS_ARGS({"i", "queue_id"}), _ethumb_dbus_queue_add_cb, 0
208 }, 208 },
209 { 209 {
210 "queue_remove", EDBUS_ARGS({"i", "queue_id"}), EDBUS_ARGS({"b", "result"}), 210 "queue_remove", ELDBUS_ARGS({"i", "queue_id"}), ELDBUS_ARGS({"b", "result"}),
211 _ethumb_dbus_queue_remove_cb, 0 211 _ethumb_dbus_queue_remove_cb, 0
212 }, 212 },
213 { 213 {
214 "clear_queue", NULL, NULL, _ethumb_dbus_queue_clear_cb, 0 214 "clear_queue", NULL, NULL, _ethumb_dbus_queue_clear_cb, 0
215 }, 215 },
216 { 216 {
217 "ethumb_setup", EDBUS_ARGS({"a{sv}", "array"}), EDBUS_ARGS({"b", "result"}), 217 "ethumb_setup", ELDBUS_ARGS({"a{sv}", "array"}), ELDBUS_ARGS({"b", "result"}),
218 _ethumb_dbus_ethumb_setup_cb, 0 218 _ethumb_dbus_ethumb_setup_cb, 0
219 }, 219 },
220 { 220 {
@@ -228,9 +228,9 @@ enum
228 ETHUMB_DBUS_OBJECTS_SIGNAL_GENERATED = 0, 228 ETHUMB_DBUS_OBJECTS_SIGNAL_GENERATED = 0,
229}; 229};
230 230
231static const EDBus_Signal _ethumb_dbus_objects_signals[] = { 231static const Eldbus_Signal _ethumb_dbus_objects_signals[] = {
232 [ETHUMB_DBUS_OBJECTS_SIGNAL_GENERATED] = { "generated", 232 [ETHUMB_DBUS_OBJECTS_SIGNAL_GENERATED] = { "generated",
233 EDBUS_ARGS({ "i", "id" }, { "ay", "paths" }, { "ay", "keys" }, 233 ELDBUS_ARGS({ "i", "id" }, { "ay", "paths" }, { "ay", "keys" },
234 { "b", "success" }) }, 234 { "b", "success" }) },
235 { } 235 { }
236}; 236};
@@ -851,13 +851,13 @@ _ethumb_table_del(Ethumbd *ed, int i)
851 } 851 }
852 q->nqueue -= q->table[i].nqueue; 852 q->nqueue -= q->table[i].nqueue;
853 853
854 odata = edbus_service_object_data_del(q->table[i].iface, ODATA); 854 odata = eldbus_service_object_data_del(q->table[i].iface, ODATA);
855 edbus_name_owner_changed_callback_del(ed->conn, ed->queue.table[i].client, 855 eldbus_name_owner_changed_callback_del(ed->conn, ed->queue.table[i].client,
856 _name_owner_changed_cb, odata); 856 _name_owner_changed_cb, odata);
857 //this string was not been freed previously 857 //this string was not been freed previously
858 eina_stringshare_del(ed->queue.table[i].client); 858 eina_stringshare_del(ed->queue.table[i].client);
859 free(odata); 859 free(odata);
860 edbus_service_object_unregister(q->table[i].iface); 860 eldbus_service_object_unregister(q->table[i].iface);
861 861
862 memset(&(q->table[i]), 0, sizeof(Ethumbd_Object)); 862 memset(&(q->table[i]), 0, sizeof(Ethumbd_Object));
863 for (j = 0; j < q->count; j++) 863 for (j = 0; j < q->count; j++)
@@ -894,24 +894,24 @@ _name_owner_changed_cb(void *context, const char *bus, const char *old_id, const
894 _ethumb_table_del(ed, odata->idx); 894 _ethumb_table_del(ed, odata->idx);
895} 895}
896 896
897static const EDBus_Service_Interface_Desc client_desc = { 897static const Eldbus_Service_Interface_Desc client_desc = {
898 _ethumb_dbus_objects_interface, _ethumb_dbus_objects_methods, 898 _ethumb_dbus_objects_interface, _ethumb_dbus_objects_methods,
899 _ethumb_dbus_objects_signals 899 _ethumb_dbus_objects_signals
900}; 900};
901 901
902static EDBus_Message * 902static Eldbus_Message *
903_ethumb_dbus_ethumb_new_cb(const EDBus_Service_Interface *interface, const EDBus_Message *msg) 903_ethumb_dbus_ethumb_new_cb(const Eldbus_Service_Interface *interface, const Eldbus_Message *msg)
904{ 904{
905 EDBus_Message *reply; 905 Eldbus_Message *reply;
906 EDBus_Service_Interface *iface; 906 Eldbus_Service_Interface *iface;
907 Ethumbd_Object_Data *odata; 907 Ethumbd_Object_Data *odata;
908 int i; 908 int i;
909 const char *return_path = ""; 909 const char *return_path = "";
910 const char *client; 910 const char *client;
911 Ethumbd *ed; 911 Ethumbd *ed;
912 912
913 ed = edbus_service_object_data_get(interface, DAEMON); 913 ed = eldbus_service_object_data_get(interface, DAEMON);
914 client = edbus_message_sender_get(msg); 914 client = eldbus_message_sender_get(msg);
915 if (!client) 915 if (!client)
916 goto end_new; 916 goto end_new;
917 917
@@ -926,7 +926,7 @@ _ethumb_dbus_ethumb_new_cb(const EDBus_Service_Interface *interface, const EDBus
926 ed->queue.table[i].client = eina_stringshare_add(client); 926 ed->queue.table[i].client = eina_stringshare_add(client);
927 return_path = ed->queue.table[i].path; 927 return_path = ed->queue.table[i].path;
928 928
929 iface = edbus_service_interface_register(ed->conn, return_path, &client_desc); 929 iface = eldbus_service_interface_register(ed->conn, return_path, &client_desc);
930 if (!iface) 930 if (!iface)
931 { 931 {
932 ERR("could not create dbus_object."); 932 ERR("could not create dbus_object.");
@@ -934,38 +934,38 @@ _ethumb_dbus_ethumb_new_cb(const EDBus_Service_Interface *interface, const EDBus
934 return_path = ""; 934 return_path = "";
935 goto end_new; 935 goto end_new;
936 } 936 }
937 edbus_service_object_data_set(iface, ODATA, odata); 937 eldbus_service_object_data_set(iface, ODATA, odata);
938 ed->queue.table[i].iface = iface; 938 ed->queue.table[i].iface = iface;
939 edbus_name_owner_changed_callback_add(ed->conn, client, 939 eldbus_name_owner_changed_callback_add(ed->conn, client,
940 _name_owner_changed_cb, odata, 940 _name_owner_changed_cb, odata,
941 EINA_TRUE); 941 EINA_TRUE);
942 _ethumbd_child_write_op_new(&ed->slave, i); 942 _ethumbd_child_write_op_new(&ed->slave, i);
943 _ethumbd_timeout_stop(ed); 943 _ethumbd_timeout_stop(ed);
944 944
945 end_new: 945 end_new:
946 reply = edbus_message_method_return_new(msg); 946 reply = eldbus_message_method_return_new(msg);
947 edbus_message_arguments_append(reply, "o", return_path); 947 eldbus_message_arguments_append(reply, "o", return_path);
948 return reply; 948 return reply;
949} 949}
950 950
951static const EDBus_Method _ethumb_dbus_methods[] = { 951static const Eldbus_Method _ethumb_dbus_methods[] = {
952 { 952 {
953 "new", NULL, EDBUS_ARGS({"o", "path"}), _ethumb_dbus_ethumb_new_cb, 0 953 "new", NULL, ELDBUS_ARGS({"o", "path"}), _ethumb_dbus_ethumb_new_cb, 0
954 }, 954 },
955 { } 955 { }
956}; 956};
957 957
958static const char * 958static const char *
959_ethumb_dbus_get_bytearray(EDBus_Message_Iter *iter) 959_ethumb_dbus_get_bytearray(Eldbus_Message_Iter *iter)
960{ 960{
961 int length; 961 int length;
962 const char *result; 962 const char *result;
963 963
964 if (!edbus_message_iter_fixed_array_get(iter, 'y', &result, 964 if (!eldbus_message_iter_fixed_array_get(iter, 'y', &result,
965 &length)) 965 &length))
966 { 966 {
967 ERR("not byte array element. Signature: %s", 967 ERR("not byte array element. Signature: %s",
968 edbus_message_iter_signature_get(iter)); 968 eldbus_message_iter_signature_get(iter));
969 return NULL; 969 return NULL;
970 } 970 }
971 971
@@ -976,7 +976,7 @@ _ethumb_dbus_get_bytearray(EDBus_Message_Iter *iter)
976} 976}
977 977
978static void 978static void
979_ethumb_dbus_append_bytearray(EDBus_Message_Iter *parent, EDBus_Message_Iter *array, const char *string) 979_ethumb_dbus_append_bytearray(Eldbus_Message_Iter *parent, Eldbus_Message_Iter *array, const char *string)
980{ 980{
981 int i, size; 981 int i, size;
982 982
@@ -985,23 +985,23 @@ _ethumb_dbus_append_bytearray(EDBus_Message_Iter *parent, EDBus_Message_Iter *ar
985 985
986 size = strlen(string) + 1; 986 size = strlen(string) + 1;
987 for (i = 0; i < size; i++) 987 for (i = 0; i < size; i++)
988 edbus_message_iter_basic_append(array, 'y', string[i]); 988 eldbus_message_iter_basic_append(array, 'y', string[i]);
989 edbus_message_iter_container_close(parent, array); 989 eldbus_message_iter_container_close(parent, array);
990} 990}
991 991
992static EDBus_Message * 992static Eldbus_Message *
993_ethumb_dbus_queue_add_cb(const EDBus_Service_Interface *iface, const EDBus_Message *msg) 993_ethumb_dbus_queue_add_cb(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
994{ 994{
995 EDBus_Message *reply; 995 Eldbus_Message *reply;
996 const char *file, *key, *thumb, *thumb_key; 996 const char *file, *key, *thumb, *thumb_key;
997 Ethumbd_Object_Data *odata; 997 Ethumbd_Object_Data *odata;
998 Ethumbd_Object *eobject; 998 Ethumbd_Object *eobject;
999 Ethumbd *ed; 999 Ethumbd *ed;
1000 Ethumbd_Request *request; 1000 Ethumbd_Request *request;
1001 int id = -1; 1001 int id = -1;
1002 EDBus_Message_Iter *file_iter, *key_iter, *thumb_iter, *thumb_key_iter; 1002 Eldbus_Message_Iter *file_iter, *key_iter, *thumb_iter, *thumb_key_iter;
1003 1003
1004 if (!edbus_message_arguments_get(msg, "iayayayay", &id, &file_iter, 1004 if (!eldbus_message_arguments_get(msg, "iayayayay", &id, &file_iter,
1005 &key_iter, &thumb_iter, &thumb_key_iter)) 1005 &key_iter, &thumb_iter, &thumb_key_iter))
1006 { 1006 {
1007 ERR("Error getting arguments."); 1007 ERR("Error getting arguments.");
@@ -1021,7 +1021,7 @@ _ethumb_dbus_queue_add_cb(const EDBus_Service_Interface *iface, const EDBus_Mess
1021 goto end; 1021 goto end;
1022 } 1022 }
1023 1023
1024 odata = edbus_service_object_data_get(iface, ODATA); 1024 odata = eldbus_service_object_data_get(iface, ODATA);
1025 if (!odata) 1025 if (!odata)
1026 { 1026 {
1027 eina_stringshare_del(file); 1027 eina_stringshare_del(file);
@@ -1050,15 +1050,15 @@ _ethumb_dbus_queue_add_cb(const EDBus_Service_Interface *iface, const EDBus_Mess
1050 _process_queue_start(ed); 1050 _process_queue_start(ed);
1051 1051
1052end: 1052end:
1053 reply = edbus_message_method_return_new(msg); 1053 reply = eldbus_message_method_return_new(msg);
1054 edbus_message_arguments_append(reply, "i", id); 1054 eldbus_message_arguments_append(reply, "i", id);
1055 return reply; 1055 return reply;
1056} 1056}
1057 1057
1058static EDBus_Message * 1058static Eldbus_Message *
1059_ethumb_dbus_queue_remove_cb(const EDBus_Service_Interface *iface, const EDBus_Message *msg) 1059_ethumb_dbus_queue_remove_cb(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
1060{ 1060{
1061 EDBus_Message *reply; 1061 Eldbus_Message *reply;
1062 int id; 1062 int id;
1063 Ethumbd_Object_Data *odata; 1063 Ethumbd_Object_Data *odata;
1064 Ethumbd_Object *eobject; 1064 Ethumbd_Object *eobject;
@@ -1067,12 +1067,12 @@ _ethumb_dbus_queue_remove_cb(const EDBus_Service_Interface *iface, const EDBus_M
1067 Eina_Bool r = EINA_FALSE; 1067 Eina_Bool r = EINA_FALSE;
1068 Eina_List *l; 1068 Eina_List *l;
1069 1069
1070 if (!edbus_message_arguments_get(msg, "i", &id)) 1070 if (!eldbus_message_arguments_get(msg, "i", &id))
1071 { 1071 {
1072 ERR("Error getting arguments."); 1072 ERR("Error getting arguments.");
1073 goto end; 1073 goto end;
1074 } 1074 }
1075 odata = edbus_service_object_data_get(iface, ODATA); 1075 odata = eldbus_service_object_data_get(iface, ODATA);
1076 if (!odata) 1076 if (!odata)
1077 { 1077 {
1078 ERR("could not get dbus_object data."); 1078 ERR("could not get dbus_object data.");
@@ -1105,20 +1105,20 @@ _ethumb_dbus_queue_remove_cb(const EDBus_Service_Interface *iface, const EDBus_M
1105 } 1105 }
1106 1106
1107 end: 1107 end:
1108 reply = edbus_message_method_return_new(msg); 1108 reply = eldbus_message_method_return_new(msg);
1109 edbus_message_arguments_append(reply, "b", r); 1109 eldbus_message_arguments_append(reply, "b", r);
1110 return reply; 1110 return reply;
1111} 1111}
1112 1112
1113static EDBus_Message * 1113static Eldbus_Message *
1114_ethumb_dbus_queue_clear_cb(const EDBus_Service_Interface *iface, const EDBus_Message *msg) 1114_ethumb_dbus_queue_clear_cb(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
1115{ 1115{
1116 Ethumbd_Object_Data *odata; 1116 Ethumbd_Object_Data *odata;
1117 Ethumbd_Object *eobject; 1117 Ethumbd_Object *eobject;
1118 Ethumbd *ed; 1118 Ethumbd *ed;
1119 Eina_List *l; 1119 Eina_List *l;
1120 1120
1121 odata = edbus_service_object_data_get(iface, ODATA); 1121 odata = eldbus_service_object_data_get(iface, ODATA);
1122 if (!odata) 1122 if (!odata)
1123 { 1123 {
1124 ERR("could not get dbus_object data."); 1124 ERR("could not get dbus_object data.");
@@ -1142,19 +1142,19 @@ _ethumb_dbus_queue_clear_cb(const EDBus_Service_Interface *iface, const EDBus_Me
1142 eobject->nqueue = 0; 1142 eobject->nqueue = 0;
1143 1143
1144 end: 1144 end:
1145 return edbus_message_method_return_new(msg); 1145 return eldbus_message_method_return_new(msg);
1146} 1146}
1147 1147
1148static EDBus_Message * 1148static Eldbus_Message *
1149_ethumb_dbus_delete_cb(const EDBus_Service_Interface *iface, const EDBus_Message *msg) 1149_ethumb_dbus_delete_cb(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
1150{ 1150{
1151 EDBus_Message *reply; 1151 Eldbus_Message *reply;
1152 Ethumbd_Object_Data *odata; 1152 Ethumbd_Object_Data *odata;
1153 Ethumbd *ed; 1153 Ethumbd *ed;
1154 1154
1155 reply = edbus_message_method_return_new(msg); 1155 reply = eldbus_message_method_return_new(msg);
1156 1156
1157 odata = edbus_service_object_data_get(iface, ODATA); 1157 odata = eldbus_service_object_data_get(iface, ODATA);
1158 if (!odata) 1158 if (!odata)
1159 { 1159 {
1160 ERR("could not get dbus_object data for del_cb."); 1160 ERR("could not get dbus_object data for del_cb.");
@@ -1168,11 +1168,11 @@ _ethumb_dbus_delete_cb(const EDBus_Service_Interface *iface, const EDBus_Message
1168} 1168}
1169 1169
1170static int 1170static int
1171_ethumb_dbus_fdo_set(Ethumbd_Object *eobject EINA_UNUSED, EDBus_Message_Iter *variant, Ethumbd_Request *request) 1171_ethumb_dbus_fdo_set(Ethumbd_Object *eobject EINA_UNUSED, Eldbus_Message_Iter *variant, Ethumbd_Request *request)
1172{ 1172{
1173 int fdo; 1173 int fdo;
1174 1174
1175 if (!edbus_message_iter_arguments_get(variant, "i", &fdo)) 1175 if (!eldbus_message_iter_arguments_get(variant, "i", &fdo))
1176 { 1176 {
1177 ERR("invalid param for fdo_set."); 1177 ERR("invalid param for fdo_set.");
1178 return 0; 1178 return 0;
@@ -1186,18 +1186,18 @@ _ethumb_dbus_fdo_set(Ethumbd_Object *eobject EINA_UNUSED, EDBus_Message_Iter *va
1186} 1186}
1187 1187
1188static int 1188static int
1189_ethumb_dbus_size_set(Ethumbd_Object *eobject EINA_UNUSED, EDBus_Message_Iter *variant, Ethumbd_Request *request) 1189_ethumb_dbus_size_set(Ethumbd_Object *eobject EINA_UNUSED, Eldbus_Message_Iter *variant, Ethumbd_Request *request)
1190{ 1190{
1191 EDBus_Message_Iter *st; 1191 Eldbus_Message_Iter *st;
1192 int w, h; 1192 int w, h;
1193 1193
1194 if (!edbus_message_iter_arguments_get(variant, "(ii)", &st)) 1194 if (!eldbus_message_iter_arguments_get(variant, "(ii)", &st))
1195 { 1195 {
1196 ERR("invalid param for size_set."); 1196 ERR("invalid param for size_set.");
1197 return 0; 1197 return 0;
1198 } 1198 }
1199 1199
1200 edbus_message_iter_arguments_get(st, "ii", &w, &h); 1200 eldbus_message_iter_arguments_get(st, "ii", &w, &h);
1201 DBG("setting size to: %dx%d", w, h); 1201 DBG("setting size to: %dx%d", w, h);
1202 request->setup.flags.size = 1; 1202 request->setup.flags.size = 1;
1203 request->setup.tw = w; 1203 request->setup.tw = w;
@@ -1207,11 +1207,11 @@ _ethumb_dbus_size_set(Ethumbd_Object *eobject EINA_UNUSED, EDBus_Message_Iter *v
1207} 1207}
1208 1208
1209static int 1209static int
1210_ethumb_dbus_format_set(Ethumbd_Object *eobject EINA_UNUSED, EDBus_Message_Iter *variant, Ethumbd_Request *request) 1210_ethumb_dbus_format_set(Ethumbd_Object *eobject EINA_UNUSED, Eldbus_Message_Iter *variant, Ethumbd_Request *request)
1211{ 1211{
1212 int format; 1212 int format;
1213 1213
1214 if (!edbus_message_iter_arguments_get(variant, "i", &format)) 1214 if (!eldbus_message_iter_arguments_get(variant, "i", &format))
1215 { 1215 {
1216 ERR("invalid param for format_set."); 1216 ERR("invalid param for format_set.");
1217 return 0; 1217 return 0;
@@ -1225,11 +1225,11 @@ _ethumb_dbus_format_set(Ethumbd_Object *eobject EINA_UNUSED, EDBus_Message_Iter
1225} 1225}
1226 1226
1227static int 1227static int
1228_ethumb_dbus_aspect_set(Ethumbd_Object *eobject EINA_UNUSED, EDBus_Message_Iter *variant, Ethumbd_Request *request) 1228_ethumb_dbus_aspect_set(Ethumbd_Object *eobject EINA_UNUSED, Eldbus_Message_Iter *variant, Ethumbd_Request *request)
1229{ 1229{
1230 int aspect; 1230 int aspect;
1231 1231
1232 if (!edbus_message_iter_arguments_get(variant, "i", &aspect)) 1232 if (!eldbus_message_iter_arguments_get(variant, "i", &aspect))
1233 { 1233 {
1234 ERR("invalid param for aspect_set."); 1234 ERR("invalid param for aspect_set.");
1235 return 0; 1235 return 0;
@@ -1243,11 +1243,11 @@ _ethumb_dbus_aspect_set(Ethumbd_Object *eobject EINA_UNUSED, EDBus_Message_Iter
1243} 1243}
1244 1244
1245static int 1245static int
1246_ethumb_dbus_orientation_set(Ethumbd_Object *eobject EINA_UNUSED, EDBus_Message_Iter *variant, Ethumbd_Request *request) 1246_ethumb_dbus_orientation_set(Ethumbd_Object *eobject EINA_UNUSED, Eldbus_Message_Iter *variant, Ethumbd_Request *request)
1247{ 1247{
1248 int orientation; 1248 int orientation;
1249 1249
1250 if (!edbus_message_iter_arguments_get(variant, "i", &orientation)) 1250 if (!eldbus_message_iter_arguments_get(variant, "i", &orientation))
1251 { 1251 {
1252 ERR("invalid param for orientation_set."); 1252 ERR("invalid param for orientation_set.");
1253 return 0; 1253 return 0;
@@ -1261,18 +1261,18 @@ _ethumb_dbus_orientation_set(Ethumbd_Object *eobject EINA_UNUSED, EDBus_Message_
1261} 1261}
1262 1262
1263static int 1263static int
1264_ethumb_dbus_crop_set(Ethumbd_Object *eobject EINA_UNUSED, EDBus_Message_Iter *variant, Ethumbd_Request *request) 1264_ethumb_dbus_crop_set(Ethumbd_Object *eobject EINA_UNUSED, Eldbus_Message_Iter *variant, Ethumbd_Request *request)
1265{ 1265{
1266 EDBus_Message_Iter *st; 1266 Eldbus_Message_Iter *st;
1267 double x, y; 1267 double x, y;
1268 1268
1269 if (!edbus_message_iter_arguments_get(variant, "(dd)", &st)) 1269 if (!eldbus_message_iter_arguments_get(variant, "(dd)", &st))
1270 { 1270 {
1271 ERR("invalid param for crop_set."); 1271 ERR("invalid param for crop_set.");
1272 return 0; 1272 return 0;
1273 } 1273 }
1274 1274
1275 edbus_message_iter_arguments_get(st, "dd", &x, &y); 1275 eldbus_message_iter_arguments_get(st, "dd", &x, &y);
1276 DBG("setting crop to: %3.2f,%3.2f", x, y); 1276 DBG("setting crop to: %3.2f,%3.2f", x, y);
1277 request->setup.flags.crop = 1; 1277 request->setup.flags.crop = 1;
1278 request->setup.cx = x; 1278 request->setup.cx = x;
@@ -1282,11 +1282,11 @@ _ethumb_dbus_crop_set(Ethumbd_Object *eobject EINA_UNUSED, EDBus_Message_Iter *v
1282} 1282}
1283 1283
1284static int 1284static int
1285_ethumb_dbus_quality_set(Ethumbd_Object *eobject EINA_UNUSED, EDBus_Message_Iter *variant, Ethumbd_Request *request) 1285_ethumb_dbus_quality_set(Ethumbd_Object *eobject EINA_UNUSED, Eldbus_Message_Iter *variant, Ethumbd_Request *request)
1286{ 1286{
1287 int quality; 1287 int quality;
1288 1288
1289 if (!edbus_message_iter_arguments_get(variant, "i", &quality)) 1289 if (!eldbus_message_iter_arguments_get(variant, "i", &quality))
1290 { 1290 {
1291 ERR("invalid param for quality_set."); 1291 ERR("invalid param for quality_set.");
1292 return 0; 1292 return 0;
@@ -1301,11 +1301,11 @@ _ethumb_dbus_quality_set(Ethumbd_Object *eobject EINA_UNUSED, EDBus_Message_Iter
1301 1301
1302 1302
1303static int 1303static int
1304_ethumb_dbus_compress_set(Ethumbd_Object *eobject EINA_UNUSED, EDBus_Message_Iter *variant, Ethumbd_Request *request) 1304_ethumb_dbus_compress_set(Ethumbd_Object *eobject EINA_UNUSED, Eldbus_Message_Iter *variant, Ethumbd_Request *request)
1305{ 1305{
1306 int compress; 1306 int compress;
1307 1307
1308 if (!edbus_message_iter_arguments_get(variant, "i", &compress)) 1308 if (!eldbus_message_iter_arguments_get(variant, "i", &compress))
1309 { 1309 {
1310 ERR("invalid param for compress_set."); 1310 ERR("invalid param for compress_set.");
1311 return 0; 1311 return 0;
@@ -1319,18 +1319,18 @@ _ethumb_dbus_compress_set(Ethumbd_Object *eobject EINA_UNUSED, EDBus_Message_Ite
1319} 1319}
1320 1320
1321static int 1321static int
1322_ethumb_dbus_frame_set(Ethumbd_Object *eobject EINA_UNUSED, EDBus_Message_Iter *variant, Ethumbd_Request *request) 1322_ethumb_dbus_frame_set(Ethumbd_Object *eobject EINA_UNUSED, Eldbus_Message_Iter *variant, Ethumbd_Request *request)
1323{ 1323{
1324 EDBus_Message_Iter *_struct, *file_iter, *group_iter, *swallow_iter; 1324 Eldbus_Message_Iter *_struct, *file_iter, *group_iter, *swallow_iter;
1325 const char *file, *group, *swallow; 1325 const char *file, *group, *swallow;
1326 1326
1327 if (!edbus_message_iter_arguments_get(variant, "(ayayay)", &_struct)) 1327 if (!eldbus_message_iter_arguments_get(variant, "(ayayay)", &_struct))
1328 { 1328 {
1329 ERR("invalid param for frame_set."); 1329 ERR("invalid param for frame_set.");
1330 return 0; 1330 return 0;
1331 } 1331 }
1332 1332
1333 edbus_message_iter_arguments_get(_struct, "ayayay", &file_iter, &group_iter, &swallow_iter); 1333 eldbus_message_iter_arguments_get(_struct, "ayayay", &file_iter, &group_iter, &swallow_iter);
1334 1334
1335 file = _ethumb_dbus_get_bytearray(file_iter); 1335 file = _ethumb_dbus_get_bytearray(file_iter);
1336 group = _ethumb_dbus_get_bytearray(group_iter); 1336 group = _ethumb_dbus_get_bytearray(group_iter);
@@ -1345,12 +1345,12 @@ _ethumb_dbus_frame_set(Ethumbd_Object *eobject EINA_UNUSED, EDBus_Message_Iter *
1345} 1345}
1346 1346
1347static int 1347static int
1348_ethumb_dbus_directory_set(Ethumbd_Object *eobject EINA_UNUSED, EDBus_Message_Iter *variant, Ethumbd_Request *request) 1348_ethumb_dbus_directory_set(Ethumbd_Object *eobject EINA_UNUSED, Eldbus_Message_Iter *variant, Ethumbd_Request *request)
1349{ 1349{
1350 const char *directory; 1350 const char *directory;
1351 EDBus_Message_Iter *array; 1351 Eldbus_Message_Iter *array;
1352 1352
1353 if (!edbus_message_iter_arguments_get(variant, "ay", &array)) 1353 if (!eldbus_message_iter_arguments_get(variant, "ay", &array))
1354 { 1354 {
1355 ERR("invalid param for dir_path_set."); 1355 ERR("invalid param for dir_path_set.");
1356 return 0; 1356 return 0;
@@ -1365,12 +1365,12 @@ _ethumb_dbus_directory_set(Ethumbd_Object *eobject EINA_UNUSED, EDBus_Message_It
1365} 1365}
1366 1366
1367static int 1367static int
1368_ethumb_dbus_category_set(Ethumbd_Object *eobject EINA_UNUSED, EDBus_Message_Iter *variant, Ethumbd_Request *request) 1368_ethumb_dbus_category_set(Ethumbd_Object *eobject EINA_UNUSED, Eldbus_Message_Iter *variant, Ethumbd_Request *request)
1369{ 1369{
1370 const char *category; 1370 const char *category;
1371 EDBus_Message_Iter *array; 1371 Eldbus_Message_Iter *array;
1372 1372
1373 if (!edbus_message_iter_arguments_get(variant, "ay", &array)) 1373 if (!eldbus_message_iter_arguments_get(variant, "ay", &array))
1374 { 1374 {
1375 ERR("invalid param for category."); 1375 ERR("invalid param for category.");
1376 return 0; 1376 return 0;
@@ -1385,11 +1385,11 @@ _ethumb_dbus_category_set(Ethumbd_Object *eobject EINA_UNUSED, EDBus_Message_Ite
1385} 1385}
1386 1386
1387static int 1387static int
1388_ethumb_dbus_video_time_set(Ethumbd_Object *eobject EINA_UNUSED, EDBus_Message_Iter *variant, Ethumbd_Request *request) 1388_ethumb_dbus_video_time_set(Ethumbd_Object *eobject EINA_UNUSED, Eldbus_Message_Iter *variant, Ethumbd_Request *request)
1389{ 1389{
1390 double video_time; 1390 double video_time;
1391 1391
1392 if (!edbus_message_iter_arguments_get(variant, "d", &video_time)) 1392 if (!eldbus_message_iter_arguments_get(variant, "d", &video_time))
1393 { 1393 {
1394 ERR("invalid param for video_time_set."); 1394 ERR("invalid param for video_time_set.");
1395 return 0; 1395 return 0;
@@ -1403,11 +1403,11 @@ _ethumb_dbus_video_time_set(Ethumbd_Object *eobject EINA_UNUSED, EDBus_Message_I
1403} 1403}
1404 1404
1405static int 1405static int
1406_ethumb_dbus_video_start_set(Ethumbd_Object *eobject EINA_UNUSED, EDBus_Message_Iter *variant, Ethumbd_Request *request) 1406_ethumb_dbus_video_start_set(Ethumbd_Object *eobject EINA_UNUSED, Eldbus_Message_Iter *variant, Ethumbd_Request *request)
1407{ 1407{
1408 double video_start; 1408 double video_start;
1409 1409
1410 if (!edbus_message_iter_arguments_get(variant, "d", &video_start)) 1410 if (!eldbus_message_iter_arguments_get(variant, "d", &video_start))
1411 { 1411 {
1412 ERR("invalid param for video_start_set."); 1412 ERR("invalid param for video_start_set.");
1413 return 0; 1413 return 0;
@@ -1421,11 +1421,11 @@ _ethumb_dbus_video_start_set(Ethumbd_Object *eobject EINA_UNUSED, EDBus_Message_
1421} 1421}
1422 1422
1423static int 1423static int
1424_ethumb_dbus_video_interval_set(Ethumbd_Object *eobject EINA_UNUSED, EDBus_Message_Iter *variant, Ethumbd_Request *request) 1424_ethumb_dbus_video_interval_set(Ethumbd_Object *eobject EINA_UNUSED, Eldbus_Message_Iter *variant, Ethumbd_Request *request)
1425{ 1425{
1426 double video_interval; 1426 double video_interval;
1427 1427
1428 if (!edbus_message_iter_arguments_get(variant, "d", &video_interval)) 1428 if (!eldbus_message_iter_arguments_get(variant, "d", &video_interval))
1429 { 1429 {
1430 ERR("invalid param for video_interval_set."); 1430 ERR("invalid param for video_interval_set.");
1431 return 0; 1431 return 0;
@@ -1438,11 +1438,11 @@ _ethumb_dbus_video_interval_set(Ethumbd_Object *eobject EINA_UNUSED, EDBus_Messa
1438} 1438}
1439 1439
1440static int 1440static int
1441_ethumb_dbus_video_ntimes_set(Ethumbd_Object *eobject EINA_UNUSED, EDBus_Message_Iter *variant, Ethumbd_Request *request) 1441_ethumb_dbus_video_ntimes_set(Ethumbd_Object *eobject EINA_UNUSED, Eldbus_Message_Iter *variant, Ethumbd_Request *request)
1442{ 1442{
1443 unsigned int video_ntimes; 1443 unsigned int video_ntimes;
1444 1444
1445 if (!edbus_message_iter_arguments_get(variant, "u", &video_ntimes)) 1445 if (!eldbus_message_iter_arguments_get(variant, "u", &video_ntimes))
1446 { 1446 {
1447 ERR("invalid param for video_ntimes_set."); 1447 ERR("invalid param for video_ntimes_set.");
1448 return 0; 1448 return 0;
@@ -1456,11 +1456,11 @@ _ethumb_dbus_video_ntimes_set(Ethumbd_Object *eobject EINA_UNUSED, EDBus_Message
1456} 1456}
1457 1457
1458static int 1458static int
1459_ethumb_dbus_video_fps_set(Ethumbd_Object *eobject EINA_UNUSED, EDBus_Message_Iter *variant, Ethumbd_Request *request) 1459_ethumb_dbus_video_fps_set(Ethumbd_Object *eobject EINA_UNUSED, Eldbus_Message_Iter *variant, Ethumbd_Request *request)
1460{ 1460{
1461 unsigned int video_fps; 1461 unsigned int video_fps;
1462 1462
1463 if (!edbus_message_iter_arguments_get(variant, "u", &video_fps)) 1463 if (!eldbus_message_iter_arguments_get(variant, "u", &video_fps))
1464 { 1464 {
1465 ERR("invalid param for video_fps_set."); 1465 ERR("invalid param for video_fps_set.");
1466 return 0; 1466 return 0;
@@ -1474,11 +1474,11 @@ _ethumb_dbus_video_fps_set(Ethumbd_Object *eobject EINA_UNUSED, EDBus_Message_It
1474} 1474}
1475 1475
1476static int 1476static int
1477_ethumb_dbus_document_page_set(Ethumbd_Object *eobject EINA_UNUSED, EDBus_Message_Iter *variant, Ethumbd_Request *request) 1477_ethumb_dbus_document_page_set(Ethumbd_Object *eobject EINA_UNUSED, Eldbus_Message_Iter *variant, Ethumbd_Request *request)
1478{ 1478{
1479 unsigned int document_page; 1479 unsigned int document_page;
1480 1480
1481 if (!edbus_message_iter_arguments_get(variant, "u", &document_page)) 1481 if (!eldbus_message_iter_arguments_get(variant, "u", &document_page))
1482 { 1482 {
1483 ERR("invalid param for document_page_set."); 1483 ERR("invalid param for document_page_set.");
1484 return 0; 1484 return 0;
@@ -1494,7 +1494,7 @@ _ethumb_dbus_document_page_set(Ethumbd_Object *eobject EINA_UNUSED, EDBus_Messag
1494static struct 1494static struct
1495{ 1495{
1496 const char *option; 1496 const char *option;
1497 int (*setup_func)(Ethumbd_Object *eobject, EDBus_Message_Iter *variant, Ethumbd_Request *request); 1497 int (*setup_func)(Ethumbd_Object *eobject, Eldbus_Message_Iter *variant, Ethumbd_Request *request);
1498} _option_cbs[] = { 1498} _option_cbs[] = {
1499 {"fdo", _ethumb_dbus_fdo_set}, 1499 {"fdo", _ethumb_dbus_fdo_set},
1500 {"size", _ethumb_dbus_size_set}, 1500 {"size", _ethumb_dbus_size_set},
@@ -1517,13 +1517,13 @@ static struct
1517}; 1517};
1518 1518
1519static int 1519static int
1520_ethumb_dbus_ethumb_setup_parse_element(Ethumbd_Object *eobject, EDBus_Message_Iter *data, Ethumbd_Request *request) 1520_ethumb_dbus_ethumb_setup_parse_element(Ethumbd_Object *eobject, Eldbus_Message_Iter *data, Ethumbd_Request *request)
1521{ 1521{
1522 EDBus_Message_Iter *variant; 1522 Eldbus_Message_Iter *variant;
1523 const char *option; 1523 const char *option;
1524 int i, r; 1524 int i, r;
1525 1525
1526 edbus_message_iter_arguments_get(data, "sv", &option, &variant); 1526 eldbus_message_iter_arguments_get(data, "sv", &option, &variant);
1527 1527
1528 r = 0; 1528 r = 0;
1529 for (i = 0; _option_cbs[i].option; i++) 1529 for (i = 0; _option_cbs[i].option; i++)
@@ -1542,25 +1542,25 @@ _ethumb_dbus_ethumb_setup_parse_element(Ethumbd_Object *eobject, EDBus_Message_I
1542 return _option_cbs[i].setup_func(eobject, variant, request); 1542 return _option_cbs[i].setup_func(eobject, variant, request);
1543} 1543}
1544 1544
1545static EDBus_Message * 1545static Eldbus_Message *
1546_ethumb_dbus_ethumb_setup_cb(const EDBus_Service_Interface *iface, const EDBus_Message *msg) 1546_ethumb_dbus_ethumb_setup_cb(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
1547{ 1547{
1548 EDBus_Message *reply; 1548 Eldbus_Message *reply;
1549 Ethumbd_Object_Data *odata; 1549 Ethumbd_Object_Data *odata;
1550 Ethumbd *ed; 1550 Ethumbd *ed;
1551 Ethumbd_Object *eobject; 1551 Ethumbd_Object *eobject;
1552 Ethumbd_Request *request; 1552 Ethumbd_Request *request;
1553 Eina_Bool r = EINA_FALSE; 1553 Eina_Bool r = EINA_FALSE;
1554 EDBus_Message_Iter *array; 1554 Eldbus_Message_Iter *array;
1555 EDBus_Message_Iter *data; 1555 Eldbus_Message_Iter *data;
1556 1556
1557 if (!edbus_message_arguments_get(msg, "a{sv}", &array)) 1557 if (!eldbus_message_arguments_get(msg, "a{sv}", &array))
1558 { 1558 {
1559 ERR("could not get dbus_object data for setup_cb."); 1559 ERR("could not get dbus_object data for setup_cb.");
1560 goto end; 1560 goto end;
1561 } 1561 }
1562 1562
1563 odata = edbus_service_object_data_get(iface, ODATA); 1563 odata = eldbus_service_object_data_get(iface, ODATA);
1564 if (!odata) 1564 if (!odata)
1565 { 1565 {
1566 ERR("could not get dbus_object data for setup_cb."); 1566 ERR("could not get dbus_object data for setup_cb.");
@@ -1574,7 +1574,7 @@ _ethumb_dbus_ethumb_setup_cb(const EDBus_Service_Interface *iface, const EDBus_M
1574 request->id = -1; 1574 request->id = -1;
1575 1575
1576 r = EINA_TRUE; 1576 r = EINA_TRUE;
1577 while (edbus_message_iter_get_and_next(array, 'r', &data) && r) 1577 while (eldbus_message_iter_get_and_next(array, 'r', &data) && r)
1578 { 1578 {
1579 if (!_ethumb_dbus_ethumb_setup_parse_element(eobject, data, request)) 1579 if (!_ethumb_dbus_ethumb_setup_parse_element(eobject, data, request))
1580 r = EINA_FALSE; 1580 r = EINA_FALSE;
@@ -1585,57 +1585,57 @@ _ethumb_dbus_ethumb_setup_cb(const EDBus_Service_Interface *iface, const EDBus_M
1585 ed->queue.nqueue++; 1585 ed->queue.nqueue++;
1586 1586
1587end: 1587end:
1588 reply = edbus_message_method_return_new(msg); 1588 reply = eldbus_message_method_return_new(msg);
1589 edbus_message_arguments_append(reply, "b", r); 1589 eldbus_message_arguments_append(reply, "b", r);
1590 return reply; 1590 return reply;
1591} 1591}
1592 1592
1593static void 1593static void
1594_ethumb_dbus_generated_signal(Ethumbd *ed, int *id, const char *thumb_path, const char *thumb_key, Eina_Bool success) 1594_ethumb_dbus_generated_signal(Ethumbd *ed, int *id, const char *thumb_path, const char *thumb_key, Eina_Bool success)
1595{ 1595{
1596 EDBus_Message *sig; 1596 Eldbus_Message *sig;
1597 EDBus_Service_Interface *iface; 1597 Eldbus_Service_Interface *iface;
1598 EDBus_Message_Iter *iter, *iter_path, *iter_key; 1598 Eldbus_Message_Iter *iter, *iter_path, *iter_key;
1599 int id32; 1599 int id32;
1600 1600
1601 id32 = *id; 1601 id32 = *id;
1602 1602
1603 iface = ed->queue.table[ed->queue.current].iface; 1603 iface = ed->queue.table[ed->queue.current].iface;
1604 sig = edbus_service_signal_new(iface, ETHUMB_DBUS_OBJECTS_SIGNAL_GENERATED); 1604 sig = eldbus_service_signal_new(iface, ETHUMB_DBUS_OBJECTS_SIGNAL_GENERATED);
1605 1605
1606 iter = edbus_message_iter_get(sig); 1606 iter = eldbus_message_iter_get(sig);
1607 edbus_message_iter_arguments_append(iter, "iay", id32, &iter_path); 1607 eldbus_message_iter_arguments_append(iter, "iay", id32, &iter_path);
1608 _ethumb_dbus_append_bytearray(iter, iter_path, thumb_path); 1608 _ethumb_dbus_append_bytearray(iter, iter_path, thumb_path);
1609 edbus_message_iter_arguments_append(iter, "ay", &iter_key); 1609 eldbus_message_iter_arguments_append(iter, "ay", &iter_key);
1610 _ethumb_dbus_append_bytearray(iter, iter_key, thumb_key); 1610 _ethumb_dbus_append_bytearray(iter, iter_key, thumb_key);
1611 edbus_message_iter_arguments_append(iter, "b", success); 1611 eldbus_message_iter_arguments_append(iter, "b", success);
1612 1612
1613 edbus_service_signal_send(iface, sig); 1613 eldbus_service_signal_send(iface, sig);
1614} 1614}
1615 1615
1616static const EDBus_Service_Interface_Desc server_desc = { 1616static const Eldbus_Service_Interface_Desc server_desc = {
1617 _ethumb_dbus_interface, _ethumb_dbus_methods 1617 _ethumb_dbus_interface, _ethumb_dbus_methods
1618}; 1618};
1619 1619
1620static void 1620static void
1621_ethumb_dbus_request_name_cb(void *data, const EDBus_Message *msg, EDBus_Pending *pending EINA_UNUSED) 1621_ethumb_dbus_request_name_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
1622{ 1622{
1623 EDBus_Service_Interface *iface; 1623 Eldbus_Service_Interface *iface;
1624 const char *errname, *errmsg; 1624 const char *errname, *errmsg;
1625 Ethumbd *ed = data; 1625 Ethumbd *ed = data;
1626 1626
1627 if (edbus_message_error_get(msg, &errname, &errmsg)) 1627 if (eldbus_message_error_get(msg, &errname, &errmsg))
1628 { 1628 {
1629 ERR("request name error: %s %s", errname, errmsg); 1629 ERR("request name error: %s %s", errname, errmsg);
1630 edbus_connection_unref(ed->conn); 1630 eldbus_connection_unref(ed->conn);
1631 return; 1631 return;
1632 } 1632 }
1633 1633
1634 iface = edbus_service_interface_register(ed->conn, _ethumb_dbus_path, 1634 iface = eldbus_service_interface_register(ed->conn, _ethumb_dbus_path,
1635 &server_desc); 1635 &server_desc);
1636 EINA_SAFETY_ON_NULL_RETURN(iface); 1636 EINA_SAFETY_ON_NULL_RETURN(iface);
1637 1637
1638 edbus_service_object_data_set(iface, DAEMON, ed); 1638 eldbus_service_object_data_set(iface, DAEMON, ed);
1639 1639
1640 _ethumbd_timeout_start(ed); 1640 _ethumbd_timeout_start(ed);
1641} 1641}
@@ -1643,7 +1643,7 @@ _ethumb_dbus_request_name_cb(void *data, const EDBus_Message *msg, EDBus_Pending
1643static int 1643static int
1644_ethumb_dbus_setup(Ethumbd *ed) 1644_ethumb_dbus_setup(Ethumbd *ed)
1645{ 1645{
1646 edbus_name_request(ed->conn, _ethumb_dbus_bus_name, 0, 1646 eldbus_name_request(ed->conn, _ethumb_dbus_bus_name, 0,
1647 _ethumb_dbus_request_name_cb, ed); 1647 _ethumb_dbus_request_name_cb, ed);
1648 return 1; 1648 return 1;
1649} 1649}
@@ -1653,7 +1653,7 @@ _ethumb_dbus_finish(Ethumbd *ed)
1653{ 1653{
1654 _process_queue_stop(ed); 1654 _process_queue_stop(ed);
1655 _ethumb_table_clear(ed); 1655 _ethumb_table_clear(ed);
1656 edbus_connection_unref(ed->conn); 1656 eldbus_connection_unref(ed->conn);
1657 free(ed->queue.table); 1657 free(ed->queue.table);
1658 free(ed->queue.list); 1658 free(ed->queue.list);
1659} 1659}
@@ -1737,9 +1737,9 @@ main(int argc, char *argv[])
1737 goto finish; 1737 goto finish;
1738 } 1738 }
1739 1739
1740 if (!edbus_init()) 1740 if (!eldbus_init())
1741 { 1741 {
1742 ERR("could not init edbus."); 1742 ERR("could not init eldbus.");
1743 exit_value = -1; 1743 exit_value = -1;
1744 goto finish; 1744 goto finish;
1745 } 1745 }
@@ -1764,35 +1764,35 @@ main(int argc, char *argv[])
1764 if (quit_option) 1764 if (quit_option)
1765 goto finish; 1765 goto finish;
1766 1766
1767 ed.conn = edbus_connection_get(EDBUS_CONNECTION_TYPE_SESSION); 1767 ed.conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
1768 if (!ed.conn) 1768 if (!ed.conn)
1769 { 1769 {
1770 ERR("could not connect to session bus."); 1770 ERR("could not connect to session bus.");
1771 exit_value = -3; 1771 exit_value = -3;
1772 goto finish_edbus; 1772 goto finish_eldbus;
1773 } 1773 }
1774 1774
1775 ed.timeout = timeout; 1775 ed.timeout = timeout;
1776 1776
1777 if (!_ethumb_dbus_setup(&ed)) 1777 if (!_ethumb_dbus_setup(&ed))
1778 { 1778 {
1779 edbus_connection_unref(ed.conn); 1779 eldbus_connection_unref(ed.conn);
1780 ERR("could not setup dbus connection."); 1780 ERR("could not setup dbus connection.");
1781 exit_value = -5; 1781 exit_value = -5;
1782 goto finish_edbus; 1782 goto finish_eldbus;
1783 } 1783 }
1784 1784
1785 ecore_main_loop_begin(); 1785 ecore_main_loop_begin();
1786 _ethumb_dbus_finish(&ed); 1786 _ethumb_dbus_finish(&ed);
1787 1787
1788 finish_edbus: 1788 finish_eldbus:
1789 if (_log_domain >= 0) 1789 if (_log_domain >= 0)
1790 { 1790 {
1791 eina_log_domain_unregister(_log_domain); 1791 eina_log_domain_unregister(_log_domain);
1792 _log_domain = -1; 1792 _log_domain = -1;
1793 } 1793 }
1794 1794
1795 edbus_shutdown(); 1795 eldbus_shutdown();
1796 finish: 1796 finish:
1797 if (ed.slave.exe) 1797 if (ed.slave.exe)
1798 ecore_exe_quit(ed.slave.exe); 1798 ecore_exe_quit(ed.slave.exe);