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

Fix timeout with gnome-keyring 3.34 #223

Merged
merged 2 commits into from Oct 8, 2019
Merged

Fix timeout with gnome-keyring 3.34 #223

merged 2 commits into from Oct 8, 2019

Conversation

jmakovicka
Copy link
Contributor

Launch gnome-keyring-daemon asynchronously, and remove the
GNOME_KEYRING_PID reading code.

GNOME_KEYRING_PID exposure was removed from gnome-keyring in 2014.

@jmakovicka jmakovicka mentioned this pull request Oct 4, 2019
Closed
@jmakovicka
Remove GNOME_KEYRING_LIFETIME_FD
8bcc715 
Keyring lifetime fd was removed from gnome-keyring in 2009

See "[daemon] Use new control protocol for daemon."
@jmakovicka
Fix timeout with gnome-keyring 3.34
023f6f7 
Launch gnome-keyring-daemon asynchronously, and remove the
GNOME_KEYRING_PID reading code.

GNOME_KEYRING_PID exposure was removed from gnome-keyring in 2014.
@raveit65
Copy link
Member

raveit65 commented Oct 6, 2019 •
edited

I can confirm that this fixes the problem in fedora-31-beta, but is this tested and save to use for older gnome versions?
In result we can use it for 1.22?

@raveit65 raveit65 requested a review from a team October 6, 2019 15:10
sc0w
sc0w approved these changes Oct 6, 2019
View reviewed changes
Copy link
Member

@sc0w sc0w left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It works, fixes #222

I have tested over the 1.22 branch, no new warnings and it works.

NOTE: I didn't test with master

@sc0w sc0w requested a review from a team October 6, 2019 19:41
flexiondotorg
flexiondotorg approved these changes Oct 6, 2019
View reviewed changes
Copy link
Member

@flexiondotorg flexiondotorg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I applied this patch to mate-session-manager 1.22.2 and tested on Ubuntu MATE 19.10 which ships with gnome-keyring 3.31.91, so doesn't currently exhibit the timeout. No new warnings that I could see and no regressions either 👍

yetist
yetist approved these changes Oct 7, 2019
View reviewed changes
Copy link
Member

@yetist yetist left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On my Archlinux, it no longer display the dialog with at-spi-bus-launcher and can be shutdown successfully.

monsta
monsta reviewed Oct 8, 2019
View reviewed changes
Copy link
Contributor

@monsta monsta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't reproduce the issue in my Debian Testing VM, but gnome-keyring-daemon seems to start and run same as before.

@monsta
Copy link
Contributor

monsta commented Oct 8, 2019 •
edited

Seems to work as before in Debian Stretch as well (gnome-keyring is 3.20.0 there).

@sc0w sc0w merged commit 7f61a65 into mate-desktop:master Oct 8, 2019
@sc0w sc0w mentioned this pull request Oct 14, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@monsta monsta monsta left review comments

@flexiondotorg flexiondotorg flexiondotorg approved these changes

@yetist yetist yetist approved these changes

@sc0w sc0w sc0w approved these changes

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

Successfully merging this pull request may close these issues.

None yet
6 participants
@jmakovicka @raveit65 @monsta @flexiondotorg @yetist @sc0w