Adapt to e18 changes

This commit is contained in:
Igor Murzov 2013-06-22 01:05:33 +04:00 committed by Igor Murzov
parent bb0fb57183
commit 2387d76be1
2 changed files with 12 additions and 11 deletions

View File

@ -36,8 +36,8 @@ AM_CONDITIONAL([HAVE_PO], [false])
]) ])
AC_SUBST(LTLIBINTL) AC_SUBST(LTLIBINTL)
PKG_CHECK_MODULES(E, [enlightenment]) PKG_CHECK_MODULES(E, [enlightenment >= 0.17.99])
PKG_CHECK_MODULES(EVRY, [everything, enotify]) PKG_CHECK_MODULES(EVRY, [everything])
PKG_CHECK_MODULES(CURL, [libcurl]) PKG_CHECK_MODULES(CURL, [libcurl])
release=$(pkg-config --variable=release enlightenment) release=$(pkg-config --variable=release enlightenment)

View File

@ -4,7 +4,6 @@
#include "json.h" #include "json.h"
#include <curl/curl.h> #include <curl/curl.h>
#include <E_Notify.h>
#define ACT_GOOGLE 1 #define ACT_GOOGLE 1
@ -172,11 +171,15 @@ static void
_send_notification(unsigned int id, const char *icon, const char *summary, _send_notification(unsigned int id, const char *icon, const char *summary,
const char *body, int timeout) const char *body, int timeout)
{ {
E_Notification *n; E_Notification_Notify n;
memset(&n, 0, sizeof(E_Notification_Notify));
n = e_notification_full_new("Everything", id, icon, summary, body, timeout); n.app_name = _("Everything");
e_notification_send(n, NULL, NULL); n.replaces_id = 0; // id
e_notification_unref(n); n.icon.icon = icon;
n.sumary = summary;
n.body = body;
n.timeout = timeout;
e_notification_client_send(&n, NULL, NULL);
} }
static Url_Data * static Url_Data *
@ -1597,7 +1600,6 @@ e_modapi_init(E_Module *m)
bindtextdomain(PACKAGE, buf); bindtextdomain(PACKAGE, buf);
bind_textdomain_codeset(PACKAGE, "UTF-8"); bind_textdomain_codeset(PACKAGE, "UTF-8");
e_notification_init();
ecore_con_url_init(); ecore_con_url_init();
_conf_init(m); _conf_init(m);
@ -1616,9 +1618,8 @@ EAPI int
e_modapi_shutdown(E_Module *m) e_modapi_shutdown(E_Module *m)
{ {
EVRY_MODULE_FREE(evry_module); EVRY_MODULE_FREE(evry_module);
_conf_shutdown(); _conf_shutdown();
e_notification_shutdown();
ecore_con_url_shutdown(); ecore_con_url_shutdown();
/* XXX free download handler */ /* XXX free download handler */