Changeset 295739 in webkit

Timestamp:

Jun 22, 2022, 11:12:01 AM (4 years ago)

Author:

Patrick Griffis

Message:

[GLIB] Fix invalid D-Bus name for MPRIS
​https://bugs.webkit.org/show_bug.cgi?id=241807

Reviewed by Philippe Normand.

A mistake introduced in #1651 used a bus name where a segment started with
a number which is not allowed. Change this to .instance-$INSTANCE_ID to fix that.

• Source/WebCore/platform/audio/glib/MediaSessionGLib.cpp:

(WebCore::MediaSessionGLib::MediaSessionGLib):

Canonical link: ​https://commits.webkit.org/251744@main

File:

• trunk/Source/WebCore/platform/audio/glib/MediaSessionGLib.cpp (modified) (1 diff)

trunk/Source/WebCore/platform/audio/glib/MediaSessionGLib.cpp

@@ -223 +223 @@
 
     const auto& applicationID = getApplicationID();
-    m_instanceId = applicationID.isEmpty() ? makeString("org.mpris.MediaPlayer2.webkit.instance", getpid(), "-", identifier.toUInt64()) : makeString("org.mpris.MediaPlayer2.", applicationID.ascii().data(), ".", identifier.toUInt64());
+    m_instanceId = applicationID.isEmpty() ? makeString("org.mpris.MediaPlayer2.webkit.instance", getpid(), "-", identifier.toUInt64()) : makeString("org.mpris.MediaPlayer2.", applicationID.ascii().data(), ".instance-", identifier.toUInt64());
 
     m_ownerId = g_bus_own_name_on_connection(m_connection.get(), m_instanceId.ascii().data(), G_BUS_NAME_OWNER_FLAGS_NONE, nullptr, nullptr, this, nullptr);