GNOME 48 support (#185)

* GNOME 48 support * MessageList.MediaSection instead of Mpris.MediaSection * orientation: Clutter.Orientation.VERTICAL * Clutter.Image removed use St.ImageContent * MessageList.MediaSection instead of Mpris.MediaSection * /ui/mpris.js/MediaSection has been renamed to /ui/mpris.js/MprisSource
sakithb · Feb 18, 2025 · 8f36f20 · 8f36f20
1 parent a4d9aa0
commit 8f36f20
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/src/extension.ts b/src/extension.ts
@@ -487,16 +487,16 @@ export default class MediaControls extends Extension {
 
     private updateMediaNotificationVisiblity(shouldReset = false) {
         if (this.mediaSectionAddFunc && (shouldReset || this.hideMediaNotification === false)) {
-            Mpris.MediaSection.prototype._addPlayer = this.mediaSectionAddFunc;
+            Mpris.MprisSource.prototype._addPlayer = this.mediaSectionAddFunc;
             this.mediaSectionAddFunc = null;
 
-            Main.panel.statusArea.dateMenu._messageList._mediaSection._onProxyReady();
+            Main.panel.statusArea.dateMenu._messageList._messageView._mediaSource._onProxyReady();
         } else {
-            this.mediaSectionAddFunc = Mpris.MediaSection.prototype._addPlayer;
-            Mpris.MediaSection.prototype._addPlayer = function () {};
+            this.mediaSectionAddFunc = Mpris.MprisSource.prototype._addPlayer;
+            Mpris.MprisSource.prototype._addPlayer = function () {};
 
-            if (Main.panel.statusArea.dateMenu._messageList._mediaSection._players != null) {
-                for (const player of Main.panel.statusArea.dateMenu._messageList._mediaSection._players.values()) {
+            if (Main.panel.statusArea.dateMenu._messageList._messageView._mediaSource._players != null) {
+                for (const player of Main.panel.statusArea.dateMenu._messageList._messageView._mediaSource._players.values()) {
                     player._close();
                 }
             }

diff --git a/src/helpers/shell/MenuSlider.ts b/src/helpers/shell/MenuSlider.ts
@@ -19,7 +19,7 @@ class MenuSlider extends St.BoxLayout {
     private rate: number;
 
     constructor() {
-        super({ vertical: true });
+        super({ orientation: Clutter.Orientation.VERTICAL });
 
         this.rate = 1.0;
         this.slider = new Slider.Slider(0);

diff --git a/src/helpers/shell/PanelButton.ts b/src/helpers/shell/PanelButton.ts
@@ -191,7 +191,7 @@ class PanelButton extends PanelMenu.Button {
     private addMenuPlayers() {
         if (this.menuPlayers == null) {
             this.menuPlayers = new St.BoxLayout({
-                vertical: true,
+                orientation: Clutter.Orientation.VERTICAL,
             });
         }
 
@@ -390,7 +390,7 @@ class PanelButton extends PanelMenu.Button {
                 const height = width / aspectRatio;
                 const format = pixbuf.hasAlpha ? Cogl.PixelFormat.RGBA_8888 : Cogl.PixelFormat.RGB_888;
 
-                const image = St.ImageContent.new_with_preferred_size(width, height) as St.ImageContent & Clutter.Image;
+                const image = St.ImageContent.new_with_preferred_size(width, height) as St.ImageContent;
                 image.set_bytes(pixbuf.pixelBytes, format, pixbuf.width, pixbuf.height, pixbuf.rowstride);
 
                 this.menuImage.iconSize = -1;
@@ -423,7 +423,7 @@ class PanelButton extends PanelMenu.Button {
     private addMenuLabels() {
         if (this.menuLabels == null) {
             this.menuLabels = new St.BoxLayout({
-                vertical: true,
+                orientation: Clutter.Orientation.VERTICAL,
             });
         }
 

diff --git a/src/metadata.json b/src/metadata.json
@@ -5,6 +5,8 @@
   "url": "https://github.com/cliffniff/media-controls",
   "settings-schema": "org.gnome.shell.extensions.mediacontrols",
   "gettext-domain": "[email protected]",
-  "version-name": "2.0.2",
-  "shell-version": ["45", "46", "47"]
-}
+  "version-name": "2.1.0",
+  "shell-version": [
+    "48"
+  ]
+}