NorwayFun
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make e_fm.c readable 

SVN revision: 71944
This commit is contained in:
Mike Blumenkrantz 2012-06-11 10:18:25 +00:00
parent 33562f92a1
commit 0e468b1d01
1 changed files with 702 additions and 699 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/bin/e_fm.c
View File

@ -1180,7 +1180,6 @@ _e_fm2_dir_load_props(E_Fm2_Smart_Data *sd)
{
E_Fm2_Custom_File *cf;
if (!sd->realpath) return; /* come back later */
if (!(sd->view_flags & E_FM2_VIEW_LOAD_DIR_CUSTOM)) return;
@ -2582,7 +2581,7 @@ _e_fm2_client_file_symlink(const char *path, const char *dest, const char *rel,
rel = NULL;
rel_to = 0;
x = 0;
y= 0;
y = 0;
res_w = 0;
res_h = 0;
}
@ -3282,7 +3281,8 @@ _e_fm2_dev_path_map(const char *dev, const char *path)
{
if ((!v->mount_point) && (v->efm_mode == EFM_MODE_USING_HAL_MOUNT))
v->mount_point = e_fm2_device_volume_mountpoint_get(v);
else if (!v->mount_point) return NULL;
else if (!v->mount_point)
return NULL;
if (PRT("%s/%s", v->mount_point, path) >= (int)sizeof(buf))
return NULL;
@ -3677,7 +3677,8 @@ _e_fm2_queue_process(Evas_Object *obj)
p0 = 0; p1 = n;
i = (p0 + p1) / 2;
ll = sd->tmp.list_index;
if (ll[i]) do /* avoid garbage deref */
if (ll[i])
do /* avoid garbage deref */
{
ic2 = eina_list_data_get(ll[i]);
v = _e_fm2_cb_icon_sort(ic, ic2);
@ -4952,7 +4953,8 @@ _e_fm2_icon_desktop_url_eval(const char *val)
p = e_util_shell_env_path_eval(path);
if (!p) return NULL;
path = p;
while (*path == '/') path++;
while (*path == '/')
path++;
path--;
s = eina_stringshare_add(path);
free(p);
@ -5067,7 +5069,8 @@ _e_fm2_region_realize(E_Fm2_Region *rg)
/* actually create evas objects etc. */
rg->realized = 1;
edje_freeze();
EINA_LIST_FOREACH(rg->list, l, ic) _e_fm2_icon_realize(ic);
EINA_LIST_FOREACH(rg->list, l, ic)
_e_fm2_icon_realize(ic);
EINA_LIST_FOREACH(rg->list, l, ic)
{
if (ic->selected)
@ -5086,7 +5089,8 @@ _e_fm2_region_unrealize(E_Fm2_Region *rg)
/* delete evas objects */
rg->realized = 0;
edje_freeze();
EINA_LIST_FOREACH(rg->list, l, ic) _e_fm2_icon_unrealize(ic);
EINA_LIST_FOREACH(rg->list, l, ic)
_e_fm2_icon_unrealize(ic);
edje_thaw();
}
@ -5125,7 +5129,7 @@ _e_fm2_icon_make_visible(E_Fm2_Icon *ic)
if (
((ic->y - ic->sd->pos.y) >= 0) &&
((ic->y + ic->h/* + ICON_BOTTOM_SPACE*/ - ic->sd->pos.y) <= (ic->sd->h)) &&
((ic->y + ic->h /* + ICON_BOTTOM_SPACE*/ - ic->sd->pos.y) <= (ic->sd->h)) &&
((ic->x - ic->sd->pos.x) >= 0) &&
((ic->x + ic->w - ic->sd->pos.x) <= (ic->sd->w))
)
@ -5138,8 +5142,8 @@ _e_fm2_icon_make_visible(E_Fm2_Icon *ic)
y = ic->sd->pos.y;
if ((ic->y - ic->sd->pos.y) < 0)
y = ic->y;
else if ((ic->y + ic->h/* + ICON_BOTTOM_SPACE*/ - ic->sd->pos.y) > (ic->sd->h))
y = ic->y + ic->h/* + ICON_BOTTOM_SPACE*/ - ic->sd->h;
else if ((ic->y + ic->h /* + ICON_BOTTOM_SPACE*/ - ic->sd->pos.y) > (ic->sd->h))
y = ic->y + ic->h /* + ICON_BOTTOM_SPACE*/ - ic->sd->h;
e_fm2_pan_set(ic->sd->obj, x, y);
}
evas_object_smart_callback_call(ic->sd->obj, "pan_changed", NULL);
@ -7649,7 +7653,6 @@ _e_fm2_smart_add(Evas_Object *obj)
_e_fm2_cb_theme,
sd->obj));
_e_fm2_list = eina_list_append(_e_fm2_list, sd->obj);
}