Adapt to e19 changes

This commit is contained in:
Igor Murzov 2014-08-11 01:38:18 +04:00
parent 2387d76be1
commit 93f60c338a
2 changed files with 19 additions and 15 deletions

View File

@ -36,7 +36,7 @@ AM_CONDITIONAL([HAVE_PO], [false])
]) ])
AC_SUBST(LTLIBINTL) AC_SUBST(LTLIBINTL)
PKG_CHECK_MODULES(E, [enlightenment >= 0.17.99]) PKG_CHECK_MODULES(E, [enlightenment >= 0.18.99])
PKG_CHECK_MODULES(EVRY, [everything]) PKG_CHECK_MODULES(EVRY, [everything])
PKG_CHECK_MODULES(CURL, [libcurl]) PKG_CHECK_MODULES(CURL, [libcurl])

View File

@ -176,7 +176,7 @@ _send_notification(unsigned int id, const char *icon, const char *summary,
n.app_name = _("Everything"); n.app_name = _("Everything");
n.replaces_id = 0; // id n.replaces_id = 0; // id
n.icon.icon = icon; n.icon.icon = icon;
n.sumary = summary; n.summary = summary;
n.body = body; n.body = body;
n.timeout = timeout; n.timeout = timeout;
e_notification_client_send(&n, NULL, NULL); e_notification_client_send(&n, NULL, NULL);
@ -656,8 +656,8 @@ _open_url(const char *url)
{ {
Evry_Item_App *app = E_NEW(Evry_Item_App, 1); Evry_Item_App *app = E_NEW(Evry_Item_App, 1);
Evry_Item_File *file = E_NEW(Evry_Item_File, 1); Evry_Item_File *file = E_NEW(Evry_Item_File, 1);
Eina_List *l;
E_Border *bd; E_Client *bd;
app->desktop = efreet_util_desktop_exec_find(_conf->browser); app->desktop = efreet_util_desktop_exec_find(_conf->browser);
@ -670,16 +670,20 @@ _open_url(const char *url)
if (app->desktop) if (app->desktop)
{ {
EINA_LIST_FOREACH(e_border_client_list(), l, bd) E_Comp *comp;
{ const Eina_List *l, *ll;
if (bd->desktop && bd->desktop == app->desktop) EINA_LIST_FOREACH(e_comp_list(), l, comp)
{ EINA_LIST_FOREACH(comp->clients, ll, bd)
e_desk_show(bd->desk); {
e_border_raise(bd); if (e_client_util_ignored_get(bd)) continue;
break; if (bd->desktop && bd->desktop == app->desktop)
} {
} e_desk_show(bd->desk);
efreet_desktop_free(app->desktop); evas_object_raise(bd->frame);
break;
}
}
efreet_desktop_free(app->desktop);
} }
E_FREE(file); E_FREE(file);
@ -1349,7 +1353,7 @@ static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dia
static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static E_Config_Dialog * static E_Config_Dialog *
_conf_dialog(E_Container *con, const char *params) _conf_dialog(E_Comp *con, const char *params)
{ {
E_Config_Dialog *cfd = NULL; E_Config_Dialog *cfd = NULL;
E_Config_Dialog_View *v = NULL; E_Config_Dialog_View *v = NULL;