GNOME 49 support and misc fixes

[3v1n0]

Backport fixes for 49 from ubuntu-dock branch and handle the dock app icons clicks issues.

Note that this may not yet work properly in not-fully updated GNOME setups.

Close: #2434

[3v1n0]

/cc @aleasto

[aleasto]

vfunc_touch_event needs the same treatment as vfunc_button_press_event

[3v1n0]

vfunc_touch_event needs the same treatment as vfunc_button_press_event

Yeah, right... Done.

[aleasto]

Nice catch on the appSpread focus thing.
LGTM

[fulalas]

Note that this may not yet work properly in #2434 (comment) setups

Tested from official link on GNOME 49 rc (most recent from their Git):

[3v1n0]

Note that this may not yet work properly in #2434 (comment) setups

Tested from official link on GNOME 49 rc (most recent from their Git):

Sure, that's normal as said you need all the GNOME stack being updated, see #2434 (comment)

[fulalas]

Hmmm... I have glib 2.86.0, but gjs is still 1.84.2. Is there any workaround?

[3v1n0]

Hmmm... I have glib 2.86.0, but gjs is still 1.84.2. Is there any workaround?

You can add this to the extension.js file:

import Gio from 'gi://Gio';
import GioUnix from 'gi://GioUnix';

// [ ... ]


if (!GioUnix.DesktopAppInfo.prototype.has_key) {
    const reservedNames = ['$gtype', 'prototype', 'length', 'name']
    Object.getOwnPropertyNames(GioUnix.DesktopAppInfo).forEach(prop => {
        if (reservedNames.includes(prop))
            return;

        if (prop.startsWith('new'))
            return;

        if (GioUnix.DesktopAppInfo.prototype[prop] !== undefined)
            return;

        GioUnix.DesktopAppInfo.prototype[prop] = function (...args) {
            return GioUnix.DesktopAppInfo[prop](this, ...args);
        };
    });
}

Object.entries(Object.getOwnPropertyDescriptors(GioUnix)).forEach(([prop, desc]) => {
    if (Object.hasOwn(Gio, prop)) {
        console.debug(`Gio already contains property ${prop}`);
        return;
    }

    const newDesc = {
        enumerable: true,
        configurable: false,
        get() {
            if (!newDesc._deprecationWarningDone) {
                console.warn(`Gio.${prop} is deprecated, please use ` +
                    `${GioUnix.__name__}.${prop} instead`);
                newDesc._deprecationWarningDone = true;
            }
            return desc.get?.() ?? desc.value;
        },
    };
    Object.defineProperty(Gio, prop, newDesc);
});

[fulalas]

So the whole file would be like this?

import { DockManager } from './docking.js';
import { Extension } from './dependencies/shell/extensions/extension.js';
import Gio from 'gi://Gio';
import GioUnix from 'gi://GioUnix';

// We export this so it can be accessed by other extensions
export let dockManager;

export default class DashToDockExtension extends Extension.Extension {
    enable() {
        dockManager = new DockManager(this);
    }

    disable() {
        dockManager?.destroy();
        dockManager = null;
    }
}

if (!GioUnix.DesktopAppInfo.prototype.has_key) {
    const reservedNames = ['$gtype', 'prototype', 'length', 'name']
    Object.getOwnPropertyNames(GioUnix.DesktopAppInfo).forEach(prop => {
        if (reservedNames.includes(prop))
            return;

        if (prop.startsWith('new'))
            return;

        if (GioUnix.DesktopAppInfo.prototype[prop] !== undefined)
            return;

        GioUnix.DesktopAppInfo.prototype[prop] = function (...args) {
            return GioUnix.DesktopAppInfo[prop](this, ...args);
        };
    });
}

Object.entries(Object.getOwnPropertyDescriptors(GioUnix)).forEach(([prop, desc]) => {
    if (Object.hasOwn(Gio, prop)) {
        console.debug(`Gio already contains property ${prop}`);
        return;
    }

    const newDesc = {
        enumerable: true,
        configurable: false,
        get() {
            if (!newDesc._deprecationWarningDone) {
                console.warn(`Gio.${prop} is deprecated, please use ` +
                    `${GioUnix.__name__}.${prop} instead`);
                newDesc._deprecationWarningDone = true;
            }
            return desc.get?.() ?? desc.value;
        },
    };
    Object.defineProperty(Gio, prop, newDesc);
});

[3v1n0]

Oh, one line was left there, I've edited your comment so that the whole file is fine.

[fulalas]

Thanks a lot, but I'm still having the same error as I showed in the screenshot here.