garik pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/everything-websearch.git/commit/?id=2387d76be123dc6799d3df4b403bed327ee6bb1d
commit 2387d76be123dc6799d3df4b403bed327ee6bb1d Author: Igor Murzov <[email protected]> Date: Sat Jun 22 01:05:33 2013 +0400 Adapt to e18 changes --- configure.ac | 4 ++-- src/e_mod_main.c | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index 7d7ae85..cb5dbd5 100644 --- a/configure.ac +++ b/configure.ac @@ -36,8 +36,8 @@ AM_CONDITIONAL([HAVE_PO], [false]) ]) AC_SUBST(LTLIBINTL) -PKG_CHECK_MODULES(E, [enlightenment]) -PKG_CHECK_MODULES(EVRY, [everything, enotify]) +PKG_CHECK_MODULES(E, [enlightenment >= 0.17.99]) +PKG_CHECK_MODULES(EVRY, [everything]) PKG_CHECK_MODULES(CURL, [libcurl]) release=$(pkg-config --variable=release enlightenment) diff --git a/src/e_mod_main.c b/src/e_mod_main.c index 82277c4..2aee0fe 100644 --- a/src/e_mod_main.c +++ b/src/e_mod_main.c @@ -4,7 +4,6 @@ #include "json.h" #include <curl/curl.h> -#include <E_Notify.h> #define ACT_GOOGLE 1 @@ -172,11 +171,15 @@ static void _send_notification(unsigned int id, const char *icon, const char *summary, const char *body, int timeout) { - E_Notification *n; - - n = e_notification_full_new("Everything", id, icon, summary, body, timeout); - e_notification_send(n, NULL, NULL); - e_notification_unref(n); + E_Notification_Notify n; + memset(&n, 0, sizeof(E_Notification_Notify)); + n.app_name = _("Everything"); + n.replaces_id = 0; // id + n.icon.icon = icon; + n.sumary = summary; + n.body = body; + n.timeout = timeout; + e_notification_client_send(&n, NULL, NULL); } static Url_Data * @@ -1597,7 +1600,6 @@ e_modapi_init(E_Module *m) bindtextdomain(PACKAGE, buf); bind_textdomain_codeset(PACKAGE, "UTF-8"); - e_notification_init(); ecore_con_url_init(); _conf_init(m); @@ -1616,9 +1618,8 @@ EAPI int e_modapi_shutdown(E_Module *m) { EVRY_MODULE_FREE(evry_module); - + _conf_shutdown(); - e_notification_shutdown(); ecore_con_url_shutdown(); /* XXX free download handler */ --
