mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-03 08:05:12 +00:00
Code Issues Releases Wiki Activity

Handle snap icon problem in snapcraft.yaml rather than in code

Browse Source
This commit is contained in:
Ilya Fedin
2020-11-04 09:32:50 +04:00
committed by John Preston
parent 7dffc6e912
commit 55167ea95b
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -593,9 +593,7 @@ void MainWindow::setSNITrayIcon(int counter, bool muted) {
const auto iconName = GetTrayIconName(counter, muted);
if (qEnvironmentVariableIsSet(kDisableTrayCounter.utf8())
&& !iconName.isEmpty()
&& (!InSnap()
|| qEnvironmentVariableIsSet(kForcePanelIcon.utf8()))) {
&& !iconName.isEmpty()) {
if (_sniTrayIcon->iconName() == iconName) {
return;
}

5
snap/snapcraft.yaml
View File

@@ -117,7 +117,10 @@ parts:
snapcraftctl set-version "$version"
sed -i 's|^Icon=.*|Icon=/usr/share/icons/hicolor/512x512/apps/telegram.png|g' lib/xdg/telegramdesktop.desktop
sed -i 's|^Icon=.*|Icon=${SNAP}/meta/gui/icon.png|g' lib/xdg/telegramdesktop.desktop
override-build: |
snapcraftctl build
rm -rf "$SNAPCRAFT_PART_INSTALL/usr/share/icons"
stage:
- -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libjpeg.so.8.2.2
after: