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

Kdesktop 1269 app doesn t start because of an unknown proxy type #355

Conversation

ChristopheLarchier
Copy link
Contributor

No description provided.

# Conflicts:
#	src/libcommonserver/log/log.cpp
#	src/server/appserver.cpp
#	src/server/socketapi.cpp
This reverts commit 39a5dc62048882f31f3ed652257ff83fab8c756d.
@ChristopheLarchier ChristopheLarchier marked this pull request as ready for review October 21, 2024 13:16
@ChristopheLarchier ChristopheLarchier requested a review from a team as a code owner October 21, 2024 13:16
@ChristopheLarchier ChristopheLarchier marked this pull request as draft October 21, 2024 13:17
@ChristopheLarchier ChristopheLarchier marked this pull request as ready for review October 22, 2024 12:52
ClementKunz
ClementKunz previously approved these changes Oct 25, 2024
Copy link
Contributor

@luc-guyot-infomaniak luc-guyot-infomaniak left a comment

Choose a reason for hiding this comment

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

Minor comments, including suggestions to avoid duplicated code caused by similar logging operations.

src/libcommonserver/log/log.cpp Show resolved Hide resolved
src/libcommonserver/network/proxy.cpp Show resolved Hide resolved
src/libcommonserver/utility/utility.cpp Outdated Show resolved Hide resolved
src/libparms/db/parmsdb.cpp Show resolved Hide resolved
src/libparms/db/parmsdb.cpp Show resolved Hide resolved
src/server/socketapi.cpp Outdated Show resolved Hide resolved
src/server/socketapi.cpp Outdated Show resolved Hide resolved
src/server/socketapi.cpp Outdated Show resolved Hide resolved
src/server/vfs/mac/litesyncextconnector.mm Show resolved Hide resolved
test/libsyncengine/requests/testserverrequests.cpp Outdated Show resolved Hide resolved
…roxy-type' of github.com:Infomaniak/desktop-kDrive into KDESKTOP-1269-App-doesn-t-start-because-of-an-unknown-proxy-type
Copy link

sonarcloud bot commented Oct 29, 2024

@ClementKunz ClementKunz merged commit 382eefe into develop Oct 30, 2024
6 checks passed
@ClementKunz ClementKunz deleted the KDESKTOP-1269-App-doesn-t-start-because-of-an-unknown-proxy-type branch October 30, 2024 10:54
@luc-guyot-infomaniak luc-guyot-infomaniak added this to the 3.6.7 milestone Nov 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants