summaryrefslogtreecommitdiff
path: root/src/bin/ethumb_client/ethumbd.c
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/ethumb_client/ethumbd.c
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 'src/bin/ethumb_client/ethumbd.c')
-rw-r--r--src/bin/ethumb_client/ethumbd.c288
1 files changed, 144 insertions, 144 deletions
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);