summaryrefslogtreecommitdiff
path: root/legacy/ethumb
diff options
context:
space:
mode:
authorLucas De Marchi <lucas.demarchi@profusion.mobi>2012-12-18 21:35:27 +0000
committerLucas De Marchi <lucas.demarchi@profusion.mobi>2012-12-18 21:35:27 +0000
commitbd978c7f336733c61ec57fb102db99c8e72a6c5c (patch)
tree916906fa4b25d90edee6e53bd49c521568cda315 /legacy/ethumb
parent1329aad821b7ee741bb29c7d40a2f91b0e03cb91 (diff)
ethumb: don't use edbus_service_signal_new()
this function is being removed from edbus. SVN revision: 81308
Diffstat (limited to '')
-rw-r--r--legacy/ethumb/src/bin/ethumbd.c24
1 files changed, 11 insertions, 13 deletions
diff --git a/legacy/ethumb/src/bin/ethumbd.c b/legacy/ethumb/src/bin/ethumbd.c
index 997265f58a..dc917bc6f6 100644
--- a/legacy/ethumb/src/bin/ethumbd.c
+++ b/legacy/ethumb/src/bin/ethumbd.c
@@ -221,12 +221,14 @@ static const EDBus_Method _ethumb_dbus_objects_methods[] = {
221 { } 221 { }
222}; 222};
223 223
224enum
225{
226 ETHUMB_DBUS_OBJECTS_SIGNAL_GENERATED = 0,
227};
228
224static const EDBus_Signal _ethumb_dbus_objects_signals[] = { 229static const EDBus_Signal _ethumb_dbus_objects_signals[] = {
225 { 230 [ETHUMB_DBUS_OBJECTS_SIGNAL_GENERATED] = { "generated",
226 "generated", 231 EDBUS_ARGS({"i", ""}, {"ay", "array"}, {"ay", "array"}, {"b", "bool"}) },
227 EDBUS_ARGS({"i", ""}, {"ay", "array"}, {"ay", "array"}, {"b", "bool"}),
228 0
229 },
230 { } 232 { }
231}; 233};
232 234
@@ -1583,17 +1585,14 @@ static void
1583_ethumb_dbus_generated_signal(Ethumbd *ed, int *id, const char *thumb_path, const char *thumb_key, Eina_Bool success) 1585_ethumb_dbus_generated_signal(Ethumbd *ed, int *id, const char *thumb_path, const char *thumb_key, Eina_Bool success)
1584{ 1586{
1585 EDBus_Message *sig; 1587 EDBus_Message *sig;
1586 int current; 1588 EDBus_Service_Interface *iface;
1587 const char *opath;
1588 EDBus_Message_Iter *iter, *iter_path, *iter_key; 1589 EDBus_Message_Iter *iter, *iter_path, *iter_key;
1589 int id32; 1590 int id32;
1590 1591
1591 id32 = *id; 1592 id32 = *id;
1592 1593
1593 current = ed->queue.current; 1594 iface = ed->queue.table[ed->queue.current].iface;
1594 opath = ed->queue.table[current].path; 1595 sig = edbus_service_signal_new(iface, ETHUMB_DBUS_OBJECTS_SIGNAL_GENERATED);
1595 sig = edbus_message_signal_new(opath, _ethumb_dbus_objects_interface,
1596 "generated");
1597 1596
1598 iter = edbus_message_iter_get(sig); 1597 iter = edbus_message_iter_get(sig);
1599 edbus_message_iter_arguments_append(iter, "iay", id32, &iter_path); 1598 edbus_message_iter_arguments_append(iter, "iay", id32, &iter_path);
@@ -1602,8 +1601,7 @@ _ethumb_dbus_generated_signal(Ethumbd *ed, int *id, const char *thumb_path, cons
1602 _ethumb_dbus_append_bytearray(iter, iter_key, thumb_key); 1601 _ethumb_dbus_append_bytearray(iter, iter_key, thumb_key);
1603 edbus_message_iter_arguments_append(iter, "b", success); 1602 edbus_message_iter_arguments_append(iter, "b", success);
1604 1603
1605 edbus_connection_send(ed->conn, sig, NULL, NULL, -1); 1604 edbus_service_signal_send(iface, sig);
1606 edbus_message_unref(sig);
1607} 1605}
1608 1606
1609static const EDBus_Service_Interface_Desc server_desc = { 1607static const EDBus_Service_Interface_Desc server_desc = {