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.

Sign up for GitHub

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

Jump to bottom

gtk: Remove outdated Gir.toml downstream fixes #167

Merged
merged 1 commit into from
Jan 27, 2021
Merged

gtk: Remove outdated Gir.toml downstream fixes #167

merged 1 commit into from
Jan 27, 2021

Conversation

sophie-h
Copy link
Contributor

Not all of the annotations from PR #83 got accepted upstream.

Cc @bilelmoussaoui

@sophie-h
Copy link
Contributor Author

There is a strange conflict with TextView::get_extra_menu. It's marked nullable in gtk4-rs, but nullable was removed upstream.

@sophie-h
Copy link
Contributor Author

@bilelmoussaoui any idea what to do with the remaining "remove after https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2887" annotations? Trust upstream?

@sophie-h sophie-h marked this pull request as draft January 17, 2021 19:36
@bilelmoussaoui
Copy link
Member

@bilelmoussaoui any idea what to do with the remaining "remove after https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2887" annotations? Trust upstream?

I don't think upstream revisited all of those, but we should definitely remove the ones that aren't needed anymore

@sophie-h sophie-h marked this pull request as ready for review January 27, 2021 16:12
@sophie-h
Copy link
Contributor Author

Imo this can be merged as is. I am revisiting the remaining annotations in others MRs (see #178 for example.)

@bilelmoussaoui
Copy link
Member

Imo this can be merged as is. I am revisiting the remaining annotations in others MRs (see #178 for example.)

It needs rebasing first :)

@sophie-h
Copy link
Contributor Author

It needs rebasing first :)

Oh, great, I force pushed my rebase away. Now it's back.

@bilelmoussaoui bilelmoussaoui merged commit a76b285 into gtk-rs:master Jan 27, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bilelmoussaoui bilelmoussaoui Awaiting requested review from bilelmoussaoui

Assignees
No one assigned
Labels
gtk
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@sophie-h @bilelmoussaoui