From 1152eacfdd0c4f61e175e691cef98dc210e73055 Mon Sep 17 00:00:00 2001 From: "chunmao.guo" Date: Mon, 15 Jan 2024 17:09:25 +0800 Subject: [PATCH] FIX: hide_id_middle_string 2 Change-Id: Iadf17b13416b8c6a3e8b4191493d459851d4d7d8 --- src/slic3r/GUI/MediaFilePanel.cpp | 2 +- src/slic3r/GUI/Printer/PrinterFileSystem.cpp | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/slic3r/GUI/MediaFilePanel.cpp b/src/slic3r/GUI/MediaFilePanel.cpp index c9ed86c25..17d3daa89 100644 --- a/src/slic3r/GUI/MediaFilePanel.cpp +++ b/src/slic3r/GUI/MediaFilePanel.cpp @@ -200,7 +200,7 @@ MediaFilePanel::~MediaFilePanel() wxString hide_id_middle_string(wxString const &str, size_t offset = 0, size_t length = -1); - void MediaFilePanel::SetMachineObject(MachineObject* obj) +void MediaFilePanel::SetMachineObject(MachineObject* obj) { std::string machine = obj ? obj->dev_id : ""; if (obj) { diff --git a/src/slic3r/GUI/Printer/PrinterFileSystem.cpp b/src/slic3r/GUI/Printer/PrinterFileSystem.cpp index aeba24834..93bbe8649 100644 --- a/src/slic3r/GUI/Printer/PrinterFileSystem.cpp +++ b/src/slic3r/GUI/Printer/PrinterFileSystem.cpp @@ -1210,10 +1210,6 @@ void PrinterFileSystem::HandleResponse(boost::unique_lock &l, Bamb } } -namespace Slic3r { namespace GUI { - extern wxString hide_passwd(wxString url, std::vector const &passwords); -}} - void PrinterFileSystem::Reconnect(boost::unique_lock &l, int result) { if (m_session.tunnel) { @@ -1255,7 +1251,7 @@ void PrinterFileSystem::Reconnect(boost::unique_lock &l, int resul wxLogMessage("PrinterFileSystem::Reconnect Initialize failed: %s", wxString::FromUTF8(url)); m_last_error = atoi(url.c_str()); } else { - wxLogMessage("PrinterFileSystem::Reconnect Initialized: %s", Slic3r::GUI::hide_passwd(wxString::FromUTF8(url), {"authkey=", "passwd="})); + wxLogInfo("PrinterFileSystem::Reconnect Initialized: %s", wxString::FromUTF8(url)); l.unlock(); m_status = Status::Connecting; wxLogMessage("PrinterFileSystem::Reconnect Connecting");