Add section related to resolution of issue TDE/tdebase#1. #194

Merged
SlavekB merged 1 commits from issue/1 into master 3 years ago
Collaborator

Hope I've done it correctly.

Hope I've done it correctly.
Poster
Collaborator

I have tested this and it seems to work.

I have tested this and it seems to work.
Owner

Great, I will run a test here tomorrow and let you know.

Hope I've done it correctly.

Looks good at first sight. If I can suggest a small improvement, instead of "grep && sed+Log" you could use the same structure used in other cases "if grep -> sed + log" (see example just above your changes here ). Yes, Slavek and I can be a bit annoying sometimes with the changes we ask for 😅

Great, I will run a test here tomorrow and let you know. > Hope I've done it correctly. Looks good at first sight. If I can suggest a small improvement, instead of "grep && sed+Log" you could use the same structure used in other cases "if grep -> sed + log" (see example just above your changes [here](https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/src/branch/master/r14-xdg-update#L1004) ). Yes, Slavek and I can be a bit annoying sometimes with the changes we ask for 😅
Owner

the above just for code consistency

the above just for code consistency
Poster
Collaborator

Well, at least I tried to be consistent... or else I would have used test instead of if ;-)
I'll make the proposed change right now.

Well, at least I tried to be consistent... or else I would have used `test` instead of `if` ;-) I'll make the proposed change right now.
blu.256 force-pushed issue/1 from 762067ef20 to 9713c57a68 3 years ago
Poster
Collaborator

Done

Done
blu.256 changed title from Added section related to resolution of issue TDE/tdebase#1. to Add section related to resolution of issue TDE/tdebase#1. 3 years ago
Owner

Hi Philippe,
I tested this together with TDE/tdelibs#129.
It works great if the user has the "text-x-generic-new" in his cache. It fails oherwise.
One of the users on my computer had a different icon there (not sure why but that is what it was) and the check failed to detect that.

Possible solutions:

  1. we remove the complete cache line from the konq_history file. A bit intrusive, but I think the side effects are none and it is easy to implement. Would work regardless of what icon was there before

  2. match exactly only the "/" entry in that file and discard whatever icon is there. Trickier to get it right compared to point 1.

What do you think?

Hi Philippe, I tested this together with TDE/tdelibs#129. It works great if the user has the "text-x-generic-new" in his cache. It fails oherwise. One of the users on my computer had a different icon there (not sure why but that is what it was) and the check failed to detect that. Possible solutions: 1. we remove the complete cache line from the konq_history file. A bit intrusive, but I think the side effects are none and it is easy to implement. Would work regardless of what icon was there before 2. match exactly only the "/" entry in that file and discard whatever icon is there. Trickier to get it right compared to point 1. What do you think?
MicheleC requested changes 3 years ago
MicheleC left a comment
Owner

Needs changes as per comments.

Needs changes as per comments.
r14-xdg-update Outdated
# Remove Konqueror's icon cache entry for / (issue TDE/tdebase#1)
if [ "$R14_VERSION" -lt "202103280" ]; then
if [ "`grep "/,text-x-generic-new[,]*" ${TDEHOME}/share/config/konq_history`" ]; then
Owner

This would match any entry ending in / and followed by that icon. For example I have some entries that ends in /.
I suggest we check for either "=/," (first entry in the line) or ",/," (clean / entry).

This would match any entry ending in / and followed by that icon. For example I have some entries that ends in /. I suggest we check for either "=/," (first entry in the line) or ",/," (clean / entry).
Poster
Collaborator

Resolved in 151a847b1b.

Resolved in 151a847b1b.
blu.256 marked this conversation as resolved
r14-xdg-update Outdated
# Remove Konqueror's icon cache entry for / (issue TDE/tdebase#1)
if [ "$R14_VERSION" -lt "202103280" ]; then
if [ "`grep "/,text-x-generic-new[,]*" ${TDEHOME}/share/config/konq_history`" ]; then
sed -i "s:/,text-x-generic-new[,]*::g" ${TDEHOME}/share/config/konq_history
Owner

There is a trailing space at the end of the line 1015 (sed line). Since I have requested changes already, I am pointing out this one too 😃

There is a trailing space at the end of the line 1015 (sed line). Since I have requested changes already, I am pointing out this one too 😃
Poster
Collaborator

Resolved in e0be8fcc0c.

Resolved in e0be8fcc0c.
blu.256 marked this conversation as resolved
Owner

Thanks, this should do the job. I will rebuild and test!

Thanks, this should do the job. I will rebuild and test!
Owner

Great, works fine even with that account that failed the previous test. If you can squash the commit, then I will merge.

Great, works fine even with that account that failed the previous test. If you can squash the commit, then I will merge.
MicheleC approved these changes 3 years ago
blu.256 force-pushed issue/1 from e0be8fcc0c to ab9ca7de7f 3 years ago
Poster
Collaborator

Done, sorry for the delay

Done, sorry for the delay
SlavekB merged commit ab9ca7de7f into master 3 years ago
SlavekB deleted branch issue/1 3 years ago
SlavekB added this to the R14.0.10 release milestone 3 years ago

Reviewers

MicheleC approved these changes 3 years ago
The pull request has been merged as ab9ca7de7f.
Sign in to join this conversation.
No reviewers
No Milestone
No Assignees
2 Participants
Notifications
Due Date

No due date set.

Dependencies

No dependencies set.

Reference: TDE/tdebase#194
Loading…
There is no content yet.