enlightenment
/
enlightenment-module-places
7
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix for recent e20 changes

This commit is contained in:
Davide Andreoli 2015-03-21 12:59:35 +01:00
parent 20e7d512dd
commit 2115f5aac5
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/e_mod_main.c
View File

@ -514,7 +514,6 @@ _places_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event)
{ {
Instance *inst = NULL; Instance *inst = NULL;
Evas_Event_Mouse_Down *ev; Evas_Event_Mouse_Down *ev;
E_Zone *zone = NULL;
E_Menu_Item *mi = NULL; E_Menu_Item *mi = NULL;
int x, y; int x, y;
@ -524,9 +523,6 @@ _places_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event)
{ {
E_Menu *m; E_Menu *m;
/* grab current zone */
zone = e_zone_current_get();
/* create popup menu */ /* create popup menu */
m = e_menu_new(); m = e_menu_new();
@ -544,7 +540,8 @@ _places_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event)
NULL, NULL); NULL, NULL);
/* show the menu relative to gadgets position */ /* show the menu relative to gadgets position */
e_menu_activate_mouse(m, zone, (x + ev->output.x), e_menu_activate_mouse(m, e_zone_current_get(),
(x + ev->output.x),
(y + ev->output.y), 1, 1, (y + ev->output.y), 1, 1,
E_MENU_POP_DIRECTION_AUTO, ev->timestamp); E_MENU_POP_DIRECTION_AUTO, ev->timestamp);
evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button, evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button,

5
src/e_mod_places.c
View File

@ -500,10 +500,9 @@ places_run_fm(const char *directory)
else else
{ {
E_Action *act = e_action_find("fileman"); E_Action *act = e_action_find("fileman");
Eina_List *managers = e_manager_list();
if (act && act->func.go && managers && managers->data) if (act && act->func.go)
act->func.go(E_OBJECT(managers->data), directory); act->func.go(E_OBJECT(e_comp), directory);
else else
e_util_dialog_internal(D_("Warning"), e_util_dialog_internal(D_("Warning"),
D_("<b>Cannot run the Enlightenment FileManager.</b><br>" D_("<b>Cannot run the Enlightenment FileManager.</b><br>"