Enlightenment CVS committal Author : raster Project : e17 Module : apps/e
Dir : e17/apps/e/src/modules/fileman Modified Files: e_fwin.c Log Message: revert lok's patch - gettign segv's and mount success/failure is not working. =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/fileman/e_fwin.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- e_fwin.c 3 Oct 2007 16:46:29 -0000 1.8 +++ e_fwin.c 3 Oct 2007 17:19:17 -0000 1.9 @@ -964,14 +964,16 @@ Evas_Coord mw, mh; Evas_Object *o, *ocon, *of, *oi, *mt; Evas *evas; - Evas_List *l = NULL, *apps = NULL, *mlist = NULL; - Evas_Hash *mimes = NULL; + Evas_List *l; + Evas_List *apps; E_Fwin_Apps_Dialog *fad; E_Fm2_Config fmc; E_Fm2_Icon_Info *ici; char buf[PATH_MAX]; const char *f; int need_dia = 0; + Evas_Hash *mimes = NULL; + Evas_List *mlist = NULL; if (fwin->fad) { @@ -983,53 +985,30 @@ for (l = files; l; l = l->next) { ici = l->data; + printf("O: %s -- %i\n", ici->link, ici->removable); if ((ici->link) && (ici->mount)) { - if (!fileman_config->view.open_dirs_in_place || fwin->zone) - { - if (fwin->win) - fwin2 = _e_fwin_new(fwin->win->container, ici->link, "/"); - else if (fwin->zone) - fwin2 = _e_fwin_new(fwin->zone->container, ici->link, "/"); - } - else - { - e_fm2_path_set(fwin->fm_obj, ici->link, "/"); - _e_fwin_window_title_set(fwin); - } + if (fwin->win) + fwin2 = _e_fwin_new(fwin->win->container, ici->link, "/"); + else if (fwin->zone) + fwin2 = _e_fwin_new(fwin->zone->container, ici->link, "/"); } else if ((ici->link) && (ici->removable)) { snprintf(buf, sizeof(buf), "removable:%s", ici->link); - if (!fileman_config->view.open_dirs_in_place || fwin->zone) - { - if (fwin->win) - fwin2 = _e_fwin_new(fwin->win->container, buf, "/"); - else if (fwin->zone) - fwin2 = _e_fwin_new(fwin->zone->container, buf, "/"); - } - else - { - e_fm2_path_set(fwin->fm_obj, buf, "/"); - _e_fwin_window_title_set(fwin); - } + if (fwin->win) + fwin2 = _e_fwin_new(fwin->win->container, buf, "/"); + else if (fwin->zone) + fwin2 = _e_fwin_new(fwin->zone->container, buf, "/"); } else if (ici->real_link) { if (S_ISDIR(ici->statinfo.st_mode)) { - if (!fileman_config->view.open_dirs_in_place || fwin->zone) - { - if (fwin->win) - fwin2 = _e_fwin_new(fwin->win->container, NULL, ici->real_link); - else if (fwin->zone) - fwin2 = _e_fwin_new(fwin->zone->container, NULL, ici->real_link); - } - else - { - e_fm2_path_set(fwin->fm_obj, NULL, ici->real_link); - _e_fwin_window_title_set(fwin); - } + if (fwin->win) + fwin2 = _e_fwin_new(fwin->win->container, NULL, ici->real_link); + else if (fwin->zone) + fwin2 = _e_fwin_new(fwin->zone->container, NULL, ici->real_link); } else need_dia = 1; @@ -1040,18 +1019,10 @@ e_fm2_real_path_get(fwin->fm_obj), ici->file); if (S_ISDIR(ici->statinfo.st_mode)) { - if (!fileman_config->view.open_dirs_in_place || fwin->zone) - { - if (fwin->win) - fwin2 = _e_fwin_new(fwin->win->container, NULL, buf); - else - fwin2 = _e_fwin_new(fwin->zone->container, NULL, buf); - } - else - { - e_fm2_path_set(fwin->fm_obj, NULL, buf); - _e_fwin_window_title_set(fwin); - } + if (fwin->win) + fwin2 = _e_fwin_new(fwin->win->container, NULL, buf); + else + fwin2 = _e_fwin_new(fwin->zone->container, NULL, buf); } else need_dia = 1; ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs