trinity-users@lists.pearsoncomputing.net

Message: previous - next
Month: July 2018

Re: [trinity-users] SOLVED: info: in konqueror fails

From: Stefan Krusche <linux@...>
Date: Wed, 25 Jul 2018 14:17:13 +0200
Am Mittwoch 25 Juli 2018 schrieb Stefan Krusche:

> This patch made the script work again:
>
> RCS file: ./RCS/kde-info2html,v
> retrieving revision 1.1
> diff -u -r1.1 ./kde-info2html
> --- ./kde-info2html     2018-07-25 13:33:38+02  1.1
> +++ ./kde-info2html     2018-07-25 13:39:20+02
> @@ -151,7 +151,7 @@
>                 next if $looking && !/\* Menu/;
>                 $looking = 0;
>                 my @item = &ParseMenuItem($_,'dir');
> -               if (!defined(@item)) { next }
> +               if (!@item) { next }
>                 my ($MenuLinkTag, $MenuLinkFile, $MenuLinkRef,
> $MenuLinkText) = @item;
>                 if ($MenuLinkRef eq $FileName) {
>                         &Redirect($MenuLinkFile, $MenuLinkTag);
> @@ -406,7 +406,7 @@
>  sub MenuItem2HTML {
>      my ($Line, $BaseInfoFile) = @_;
>      my @parse_results = &ParseMenuItem($Line, $BaseInfoFile);
> -    if (!defined (@parse_results)) { return $Line; }
> +    if (!@parse_results) { return $Line; }
>      my ($MenuLinkTag, $MenuLinkFile, $MenuLinkRef, $MenuLinkText) =
> @parse_results;
>      #-- produce a HTML line
>      return "<tr class=\"infomenutr\"><td class=\"infomenutd\"
> width=\"30%\"><ul><li><a
> href=\"info:/$MenuLinkFile/$MenuLinkTag\">$MenuLinkRef</a></ul></td><td
> class=\"infomenutd\">$MenuLinkText";
>
> But, as I'm an absote perl newbie, someone with perl knowledge should
> probably check if that's okay. If so, it would be nice to include it
> upstream.

So, there is already a bug report: #2822 and it is already fixed in commit 
e436f535 (for R14.0.x) just today: 2018-07-25 10:52:48. What a coincidence. I 
should have been looking before I started to tamper ;-).

Will this patch be in TDE preliminary stable builds (R14.0.5) soon or do I have 
to wait for the official release?

Thanks,
Stefan