From c2bbedc6aef6f163adb52f6587ea940678b4e9a0 Mon Sep 17 00:00:00 2001 From: handyande Date: Wed, 1 Jun 2005 14:27:18 +0000 Subject: [PATCH] Fixups for bg_get - learning new IPC code SVN revision: 15045 --- src/bin/e_ipc_handlers.h | 2 +- src/lib/Makefile.am | 2 ++ src/lib/e_main.c | 9 ++++++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/bin/e_ipc_handlers.h b/src/bin/e_ipc_handlers.h index 499349d9a..be9586d39 100644 --- a/src/bin/e_ipc_handlers.h +++ b/src/bin/e_ipc_handlers.h @@ -291,7 +291,7 @@ break; #elif (TYPE == E_REMOTE_OUT) REQ_NULL(HDL); #elif (TYPE == E_WM_IN) - SEND_STRING(e_config->desktop_default_background, E_IPC_OP_MODULE_LIST_REPLY, HDL); + SEND_STRING(e_config->desktop_default_background, E_IPC_OP_BG_GET_REPLY, HDL); #elif (TYPE == E_REMOTE_IN) #endif #undef HDL diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 1549c9695..9f7aa1af3 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -9,6 +9,8 @@ include_HEADERS = E.h libe_la_SOURCES= \ e_main.c \ +e.h \ +../bin/e_ipc_codec.c \ e_private.h libe_la_LIBADD = @ecore_libs@ diff --git a/src/lib/e_main.c b/src/lib/e_main.c index 1af452cae..ced8cc761 100644 --- a/src/lib/e_main.c +++ b/src/lib/e_main.c @@ -98,6 +98,7 @@ e_init(const char* display) return 0; } + /* FIXME */ e_ipc_codec_init(); /* setup e ipc service */ if (!_e_ipc_init(disp)) { @@ -126,6 +127,7 @@ e_init(const char* display) int e_shutdown(void) { + e_ipc_codec_shutdown(); _e_ipc_shutdown(); ecore_ipc_shutdown(); ecore_shutdown(); @@ -356,9 +358,14 @@ _e_cb_server_data(void *data __UNUSED__, int type, void *event) case E_IPC_OP_BG_GET_REPLY: { E_Response_Background_Get *res; + char *str = NULL; res = calloc(1, sizeof(E_Response_Background_Get)); - res->file = e->data; + if (e->data) + { + e_ipc_codec_str_dec(e->data, e->size, &str); + res->file = str; + } ecore_event_add(E_RESPONSE_BACKGROUND_GET, res, NULL, NULL); } break;