mirror of
https://github.com/ProtonMail/proton-bridge.git
synced 2025-12-22 18:16:43 +00:00
Other: fix bug in login screen <-> main window transition. [skip ci]
Other: fixed bug with split mode toggle. [skip ci] Other: fix QML warnings. [skip ci] Other: fix showMainWindow gRPC event binding. [skip ci]. QML Fixes [skip ci] Other: wait for EventStreamReader thread to finish on exit. Other: made BridgeMonitor generic, as ProcessMonitor. [skip ci]
This commit is contained in:
@ -16,8 +16,8 @@
|
||||
// along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
|
||||
#ifndef BRIDGE_GUI_TESTER_EVENT_FACTORY_H
|
||||
#define BRIDGE_GUI_TESTER_EVENT_FACTORY_H
|
||||
#ifndef BRIDGE_PP_EVENT_FACTORY_H
|
||||
#define BRIDGE_PP_EVENT_FACTORY_H
|
||||
|
||||
|
||||
#include "bridge.grpc.pb.h"
|
||||
@ -85,4 +85,4 @@ SPStreamEvent newUserChangedEvent(QString const &userID); ///< Create a new User
|
||||
} // namespace bridgepp
|
||||
|
||||
|
||||
#endif //BRIDGE_GUI_TESTER_EVENT_FACTORY_H
|
||||
#endif //BRIDGE_PP_EVENT_FACTORY_H
|
||||
|
||||
@ -16,8 +16,8 @@
|
||||
// along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
|
||||
#ifndef BRIDGE_GUI_RPC_CLIENT_H
|
||||
#define BRIDGE_GUI_RPC_CLIENT_H
|
||||
#ifndef BRIDGE_PP_RPC_CLIENT_H
|
||||
#define BRIDGE_PP_RPC_CLIENT_H
|
||||
|
||||
|
||||
#include "../User/User.h"
|
||||
@ -233,4 +233,4 @@ private: // data members.
|
||||
}
|
||||
|
||||
|
||||
#endif // BRIDGE_GUI_RPC_CLIENT_H
|
||||
#endif // BRIDGE_PP_RPC_CLIENT_H
|
||||
|
||||
@ -16,8 +16,8 @@
|
||||
// along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
|
||||
#ifndef BRIDGE_GUI_GRPC_UTILS_H
|
||||
#define BRIDGE_GUI_GRPC_UTILS_H
|
||||
#ifndef BRIDGE_PP_GRPC_UTILS_H
|
||||
#define BRIDGE_PP_GRPC_UTILS_H
|
||||
|
||||
|
||||
#include "../User/User.h"
|
||||
@ -42,4 +42,4 @@ SPUser userFromGRPC(grpc::User const &grpcUser); ///< Create a bridgepp::User fr
|
||||
}
|
||||
|
||||
|
||||
#endif // BRIDGE_GUI_GRPC_UTILS_H
|
||||
#endif // BRIDGE_PP_GRPC_UTILS_H
|
||||
|
||||
Reference in New Issue
Block a user