From bb008911b0d75b03eb2dca224cc8148c7572ed35 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 23 Apr 2023 00:44:46 +0400
Subject: [PATCH] Get rid of SystemMediaControls::setServiceName usage
---
.../SourceFiles/media/system_media_controls_manager.cpp | 6 ------
snap/snapcraft.yaml | 7 +------
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/Telegram/SourceFiles/media/system_media_controls_manager.cpp b/Telegram/SourceFiles/media/system_media_controls_manager.cpp
index fc6105ab3..4fb87dc90 100644
--- a/Telegram/SourceFiles/media/system_media_controls_manager.cpp
+++ b/Telegram/SourceFiles/media/system_media_controls_manager.cpp
@@ -21,8 +21,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "media/streaming/media_streaming_player.h"
#include "ui/text/format_song_document_name.h"
-#include <ksandbox.h>
-
namespace Media {
namespace {
@@ -50,10 +48,6 @@ SystemMediaControlsManager::SystemMediaControlsManager()
base::Platform::SystemMediaControls::PlaybackStatus;
using Command = base::Platform::SystemMediaControls::Command;
- // Flatpak provides default permission to MPRIS, but not snap
- if (!KSandbox::isFlatpak()) {
- _controls->setServiceName(u"tdesktop"_q);
- }
_controls->setApplicationName(AppName.utf16());
const auto inited = _controls->init();
if (!inited) {
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index bf5658bef..c0cb0a3a4 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -38,7 +38,7 @@ apps:
- wayland
- x11
slots:
- - tdesktop-mpris
+ - mpris
hooks:
configure:
@@ -66,11 +66,6 @@ plugs:
target: $SNAP/data-dir/sounds
default-provider: gtk-common-themes
-slots:
- tdesktop-mpris:
- interface: mpris
- name: tdesktop
-
layout:
/usr/share/alsa:
bind: $SNAP/usr/share/alsa