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

libsync: Fix compilation with TOKEN_AUTH_ONLY #6184

Merged
merged 1 commit into from
Nov 25, 2017
Merged

libsync: Fix compilation with TOKEN_AUTH_ONLY #6184

merged 1 commit into from
Nov 25, 2017

Conversation

ogoffart
Copy link
Contributor

This means we cannot use QtGui in libsync.
So this mostly disable the avatar from the account and the avatarjob

Note that there is one logic change: in ConnectionValidator::slotUserFetched
we do the avatar job even if the user is empty. Otherwise we would end up in
a invalid state. This restore the 2.3.x behavior that was broken in
commit e05d6bf

This means we cannot use QtGui in libsync.
So this mostly disable the avatar from the account and the avatarjob

Note that there is one logic change: in ConnectionValidator::slotUserFetched
we do the avatar job even if the user is empty. Otherwise we would end up in
a invalid state. This restore the 2.3.x behavior that was broken in
commit e05d6bf
@guruz
Copy link
Contributor

guruz commented Nov 23, 2017

Looks Ok but i'd like @ckamm to review this because of the reportResult change

@ogoffart
Copy link
Contributor Author

@guruz the reportResult is also what was before commit e05d6bf

@guruz guruz merged commit 753d7ad into 2.4 Nov 25, 2017
@guruz guruz deleted the nogui branch November 25, 2017 11:57
@ckamm
Copy link
Contributor

ckamm commented Nov 29, 2017

Thanks for fixing! I didn't know TOKEN_AUTH required not using QtGui in libsync.

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.

3 participants