MrBesen/tdesktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix check for disconnected error

Browse Source
This commit is contained in:
Ilya Fedin 2021-04-30 06:53:39 +04:00 committed by John Preston
parent 41078869a9
commit 0d96657c33
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Telegram/SourceFiles/platform/linux/linux_xdp_file_dialog.cpp
View File

@ -71,8 +71,18 @@ auto MakeFilterList(const QString &filter) {
std::optional<uint> FileChooserPortalVersion() {
try {
const auto connection = Gio::DBus::Connection::get_sync(
Gio::DBus::BusType::BUS_TYPE_SESSION);
const auto connection = [] {
try {
return Gio::DBus::Connection::get_sync(
Gio::DBus::BusType::BUS_TYPE_SESSION);
} catch (...) {
return Glib::RefPtr<Gio::DBus::Connection>();
}
}();
if (!connection) {
return std::nullopt;
}
auto reply = connection->call_sync(
std::string(kXDGDesktopPortalObjectPath),
@ -90,7 +100,6 @@ std::optional<uint> FileChooserPortalVersion() {
reply.get_child(0)));
} catch (const Glib::Error &e) {
static const auto NotSupportedErrors = {
"org.freedesktop.DBus.Error.Disconnected",
"org.freedesktop.DBus.Error.ServiceUnknown",
};
@ -435,10 +444,7 @@ void XDPFileDialog::openPortal() {
},
_cancellable,
std::string(kXDGDesktopPortalService));
} catch (const Glib::Error &e) {
LOG(("XDP File Dialog Error: %1").arg(
QString::fromStdString(e.what())));
} catch (...) {
_reject.fire({});
}
}

15
Telegram/SourceFiles/platform/linux/main_window_linux.cpp
View File

@ -430,8 +430,18 @@ bool UseUnityCounter() {
bool IsSNIAvailable() {
try {
const auto connection = Gio::DBus::Connection::get_sync(
Gio::DBus::BusType::BUS_TYPE_SESSION);
const auto connection = [] {
try {
return Gio::DBus::Connection::get_sync(
Gio::DBus::BusType::BUS_TYPE_SESSION);
} catch (...) {
return Glib::RefPtr<Gio::DBus::Connection>();
}
}();
if (!connection) {
return false;
}
auto reply = connection->call_sync(
std::string(kSNIWatcherObjectPath),
@ -448,7 +458,6 @@ bool IsSNIAvailable() {
reply.get_child(0)));
} catch (const Glib::Error &e) {
static const auto NotSupportedErrors = {
"org.freedesktop.DBus.Error.Disconnected",
"org.freedesktop.DBus.Error.ServiceUnknown",
};