Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync glib-utils.c with upstream #263

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Sync glib-utils.c with upstream #263

wants to merge 1 commit into from

Conversation

iamthesenate1
Copy link
Contributor

Note that this commit does not include mate-desktop/engrampa@7d5048d#diff-6a06d066ffba9f72d916ed7c4424b33597749fbcf3161803f16d0c17604aefca as it does not affect LXQt.

@tsujan
Copy link
Member

tsujan commented Sep 25, 2021

For various reasons, our core code isn't identical to that of engrampa anymore. I've already commented out some parts of glib-utils.c; will comment out more functions and make small changes later by following the commits that you included here.

That being said, it's good to keep an eye on changes in engrampa, as you did here. Keep up the good work! Thanks!

@iamthesenate1
Copy link
Contributor Author

iamthesenate1 commented Sep 25, 2021

Oh. I now see that some of the code was already commented out.
For future reference, when there are deletions like this in engrampa should I comment them out or should I delete them?

@tsujan
Copy link
Member

tsujan commented Sep 25, 2021

For future reference, when there are deletions like this in engrampa should I comment them out or should I delete them?

Particularly after 35df3d3, 8b299c2 and some other commits, parts of our core code may be different from those of engrampa. If you encounter differences, you could open an issue and mention the engrampa commits in them; I'll make a PR and will give you the credit.

You don't need to do anything here; I might use your PR later.

@iamthesenate1
Copy link
Contributor Author

Ok. Thank you for the clarifications.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants