summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Murzov <garik@efl.so>2014-08-11 01:38:18 +0400
committerIgor Murzov <garik@efl.so>2014-08-18 16:25:17 +0400
commit93f60c338aa38911161a7dcd699dca18e3c74d6e (patch)
tree0f56023f2264fe535dd3f469ebb90b86fdbe5d3b
parent2387d76be123dc6799d3df4b403bed327ee6bb1d (diff)
Adapt to e19 changesHEADmaster
-rw-r--r--configure.ac2
-rw-r--r--src/e_mod_main.c32
2 files changed, 19 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac
index cb5dbd5..a5a1555 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,7 +36,7 @@ AM_CONDITIONAL([HAVE_PO], [false])
36]) 36])
37AC_SUBST(LTLIBINTL) 37AC_SUBST(LTLIBINTL)
38 38
39PKG_CHECK_MODULES(E, [enlightenment >= 0.17.99]) 39PKG_CHECK_MODULES(E, [enlightenment >= 0.18.99])
40PKG_CHECK_MODULES(EVRY, [everything]) 40PKG_CHECK_MODULES(EVRY, [everything])
41PKG_CHECK_MODULES(CURL, [libcurl]) 41PKG_CHECK_MODULES(CURL, [libcurl])
42 42
diff --git a/src/e_mod_main.c b/src/e_mod_main.c
index 2aee0fe..04afc8c 100644
--- a/src/e_mod_main.c
+++ b/src/e_mod_main.c
@@ -176,7 +176,7 @@ _send_notification(unsigned int id, const char *icon, const char *summary,
176 n.app_name = _("Everything"); 176 n.app_name = _("Everything");
177 n.replaces_id = 0; // id 177 n.replaces_id = 0; // id
178 n.icon.icon = icon; 178 n.icon.icon = icon;
179 n.sumary = summary; 179 n.summary = summary;
180 n.body = body; 180 n.body = body;
181 n.timeout = timeout; 181 n.timeout = timeout;
182 e_notification_client_send(&n, NULL, NULL); 182 e_notification_client_send(&n, NULL, NULL);
@@ -656,8 +656,8 @@ _open_url(const char *url)
656{ 656{
657 Evry_Item_App *app = E_NEW(Evry_Item_App, 1); 657 Evry_Item_App *app = E_NEW(Evry_Item_App, 1);
658 Evry_Item_File *file = E_NEW(Evry_Item_File, 1); 658 Evry_Item_File *file = E_NEW(Evry_Item_File, 1);
659 Eina_List *l; 659
660 E_Border *bd; 660 E_Client *bd;
661 661
662 app->desktop = efreet_util_desktop_exec_find(_conf->browser); 662 app->desktop = efreet_util_desktop_exec_find(_conf->browser);
663 663
@@ -670,16 +670,20 @@ _open_url(const char *url)
670 670
671 if (app->desktop) 671 if (app->desktop)
672 { 672 {
673 EINA_LIST_FOREACH(e_border_client_list(), l, bd) 673 E_Comp *comp;
674 { 674 const Eina_List *l, *ll;
675 if (bd->desktop && bd->desktop == app->desktop) 675 EINA_LIST_FOREACH(e_comp_list(), l, comp)
676 { 676 EINA_LIST_FOREACH(comp->clients, ll, bd)
677 e_desk_show(bd->desk); 677 {
678 e_border_raise(bd); 678 if (e_client_util_ignored_get(bd)) continue;
679 break; 679 if (bd->desktop && bd->desktop == app->desktop)
680 } 680 {
681 } 681 e_desk_show(bd->desk);
682 efreet_desktop_free(app->desktop); 682 evas_object_raise(bd->frame);
683 break;
684 }
685 }
686 efreet_desktop_free(app->desktop);
683 } 687 }
684 688
685 E_FREE(file); 689 E_FREE(file);
@@ -1349,7 +1353,7 @@ static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dia
1349static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); 1353static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
1350 1354
1351static E_Config_Dialog * 1355static E_Config_Dialog *
1352_conf_dialog(E_Container *con, const char *params) 1356_conf_dialog(E_Comp *con, const char *params)
1353{ 1357{
1354 E_Config_Dialog *cfd = NULL; 1358 E_Config_Dialog *cfd = NULL;
1355 E_Config_Dialog_View *v = NULL; 1359 E_Config_Dialog_View *v = NULL;