From 06437b0e337ecfaa222599376ea2c6fff2131bc4 Mon Sep 17 00:00:00 2001 From: Viktor Kojouharov Date: Mon, 8 Jun 2009 15:29:52 +0000 Subject: [PATCH] make the generated callback receive the thumb path and key SVN revision: 40969 --- legacy/ethumb/src/lib/client/Ethumb_Client.c | 5 +++-- legacy/ethumb/src/lib/client/Ethumb_Client.h | 4 +++- legacy/ethumb/src/tests/ethumb_dbus.c | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/legacy/ethumb/src/lib/client/Ethumb_Client.c b/legacy/ethumb/src/lib/client/Ethumb_Client.c index 569d4bc11d..3313b320e0 100644 --- a/legacy/ethumb/src/lib/client/Ethumb_Client.c +++ b/legacy/ethumb/src/lib/client/Ethumb_Client.c @@ -736,8 +736,9 @@ _ethumb_client_generated_cb(void *data, DBusMessage *msg) if (found) { client->pending_gen = eina_list_remove_list(client->pending_gen, l); - pending->generated_cb(id, pending->file, pending->key, success, - pending->data); + pending->generated_cb(id, pending->file, pending->key, + pending->thumb, pending->thumb_key, + success, pending->data); eina_stringshare_del(pending->file); eina_stringshare_del(pending->key); eina_stringshare_del(pending->thumb); diff --git a/legacy/ethumb/src/lib/client/Ethumb_Client.h b/legacy/ethumb/src/lib/client/Ethumb_Client.h index 54bca88816..07d40afe9f 100644 --- a/legacy/ethumb/src/lib/client/Ethumb_Client.h +++ b/legacy/ethumb/src/lib/client/Ethumb_Client.h @@ -39,7 +39,9 @@ extern "C" { typedef struct _Ethumb_Client Ethumb_Client; typedef void (*ec_connect_callback_t)(Ethumb_Client *client, Eina_Bool success, void *data); -typedef void (*generated_callback_t)(long id, const char *file, const char *key, Eina_Bool success, void *data); +typedef void (*generated_callback_t)(long id, const char *file, const char *key, + const char *thumb_path, const char *thumb_key, + Eina_Bool success, void *data); EAPI int ethumb_client_init(void); EAPI int ethumb_client_shutdown(void); diff --git a/legacy/ethumb/src/tests/ethumb_dbus.c b/legacy/ethumb/src/tests/ethumb_dbus.c index f92d6f106f..1c4026bc77 100644 --- a/legacy/ethumb/src/tests/ethumb_dbus.c +++ b/legacy/ethumb/src/tests/ethumb_dbus.c @@ -39,9 +39,9 @@ _on_server_die_cb(Ethumb_Client *client, void *data) } static void -_queue_add_cb(long id, const char *file, const char *key, Eina_Bool success, void *data) +_queue_add_cb(long id, const char *file, const char *key, const char *thumb_path, const char *thumb_key, Eina_Bool success, void *data) { - fprintf(stderr, ">>> file ready: %s; id = %ld\n", file, id); + fprintf(stderr, ">>> file ready: %s; thumb ready: %s; id = %ld\n", file, thumb_path, id); } static void