On Tue, Mar 12, 2013 at 7:47 AM, Carsten Haitzler - Enlightenment Git
<no-re...@enlightenment.org> wrote:
> raster pushed a commit to branch master.
>
> commit 174a5fab15dc13a328984dfd7d61efda4e8f174f
> Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
> Date: Tue Mar 12 15:47:41 2013 +0900
>
> fix efm link resolving.. again. new case.
> ---
> src/bin/e_fm.c | 16 +++++++++++-----
> 1 file changed, 11 insertions(+), 5 deletions(-)
>
> diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
> index 9aa6052..48f5d9f 100644
> --- a/src/bin/e_fm.c
> +++ b/src/bin/e_fm.c
> @@ -536,11 +536,14 @@ _e_fm2_icon_path(const E_Fm2_Icon *ic, char *buf, int
> buflen)
> char *tmp;
>
> r = snprintf(buf, buflen, "%s/%s", ic->sd->path, ic->info.file);
> - tmp = ecore_file_realpath(buf);
> - if (tmp)
> + if (!ic->sd->dev)
> {
> - r = snprintf(buf, buflen, "%s", tmp);
> - free(tmp);
> + tmp = ecore_file_realpath(buf);
> + if (tmp)
> + {
> + r = snprintf(buf, buflen, "%s", tmp);
> + free(tmp);
> + }
> }
> }
> }
> @@ -5746,7 +5749,10 @@ _e_fm2_inplace_open(const E_Fm2_Icon *ic)
> if (!_e_fm2_icon_path(ic, buf, sizeof(buf)))
> return -1;
>
> - e_fm2_path_set(ic->sd->obj, ic->info.link ? "/" : ic->sd->dev, buf);
> + e_fm2_path_set(ic->sd->obj,
> +// ic->info.link ? "/" : ic->sd->dev,
> + ic->sd->dev,
> + buf);
> return 1;
> }
>
>
> --
>I know it's plenty late to notice this, but this commit breaks in-place opening of directory symlinks in e_fm2. It seems that the second part of the commit goes too far. I don't think this should be reverted, so attached you will find a patch. It works for me, please test before applying. Note: I realize that this patch also fixes trailing white spaces, but since they are in the one changed function call, I figured this should be OK. Regards, -- thomasg
0001-fix-inplace-open-for-symlink-dirs.patch
Description: Binary data
------------------------------------------------------------------------------ Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! Discover the easy way to master current and previous Microsoft technologies and advance your career. Get an incredible 1,500+ hours of step-by-step tutorial videos with LearnDevNow. Subscribe today and save! http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk
_______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
