FOSS/AyuGramDesktop
1
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2026-08-05 03:14:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'v4.15.0' into dev

Browse Source 
# Conflicts:
#	Telegram/Resources/winrc/Telegram.rc
#	Telegram/Resources/winrc/Updater.rc
#	Telegram/SourceFiles/core/version.h
#	Telegram/SourceFiles/dialogs/dialogs_row.cpp
#	Telegram/SourceFiles/dialogs/dialogs_widget.cpp
#	Telegram/SourceFiles/history/view/history_view_message.cpp
#	Telegram/SourceFiles/info/profile/info_profile_actions.cpp
#	Telegram/lib_ui
#	snap/snapcraft.yaml
This commit is contained in:
ZavaruKitsu
2024-02-18 21:37:55 +03:00
parent b8dda54e04 cb065146c2
commit 43b0df3f94
200 changed files with 3605 additions and 1270 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Telegram/SourceFiles/platform/linux/specific_linux.cpp
+5
View File
@@ -280,6 +280,11 @@ bool GenerateDesktopFile(
}
}
if (!args.isEmpty()
&& target->has_key("Desktop Entry", "DBusActivatable")) {
target->remove_key("Desktop Entry", "DBusActivatable");
}
target->save_to_file(targetFile.toStdString());
} catch (const std::exception &e) {
if (!silent) {