[gnome] Fix version for gjsosk and gsconnect, add impatience
This commit is contained in:
@ -2,16 +2,13 @@
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
'use strict';
|
||||
|
||||
const Gio = imports.gi.Gio;
|
||||
const GLib = imports.gi.GLib;
|
||||
const GObject = imports.gi.GObject;
|
||||
import Gio from 'gi://Gio';
|
||||
import GLib from 'gi://GLib';
|
||||
import GObject from 'gi://GObject';
|
||||
|
||||
const SERVICE_NAME = 'org.gnome.Shell.Extensions.GSConnect';
|
||||
const SERVICE_PATH = '/org/gnome/Shell/Extensions/GSConnect';
|
||||
const DEVICE_NAME = 'org.gnome.Shell.Extensions.GSConnect.Device';
|
||||
const DEVICE_PATH = '/org/gnome/Shell/Extensions/GSConnect/Device';
|
||||
|
||||
|
||||
const _PROPERTIES = {
|
||||
@ -51,7 +48,7 @@ function _proxyInit(proxy, cancellable = null) {
|
||||
/**
|
||||
* A simple proxy wrapper for devices exported over DBus.
|
||||
*/
|
||||
var Device = GObject.registerClass({
|
||||
export const Device = GObject.registerClass({
|
||||
GTypeName: 'GSConnectRemoteDevice',
|
||||
Implements: [Gio.DBusInterface],
|
||||
Properties: {
|
||||
@ -222,7 +219,7 @@ var Device = GObject.registerClass({
|
||||
/**
|
||||
* A simple proxy wrapper for the GSConnect service.
|
||||
*/
|
||||
var Service = GObject.registerClass({
|
||||
export const Service = GObject.registerClass({
|
||||
GTypeName: 'GSConnectRemoteService',
|
||||
Implements: [Gio.DBusInterface],
|
||||
Properties: {
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
// SPDX-FileCopyrightText: GSConnect Developers https://github.com/GSConnect
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
import GLib from 'gi://GLib';
|
||||
|
||||
const [filename] = GLib.filename_from_uri(import.meta.url);
|
||||
const dirname = GLib.path_get_dirname(filename);
|
||||
imports.searchPath.unshift(dirname);
|
||||
|
||||
const Remote = imports.remote;
|
||||
export default Remote;
|
||||
@ -2,18 +2,18 @@
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
const Gio = imports.gi.Gio;
|
||||
const GLib = imports.gi.GLib;
|
||||
import Gio from 'gi://Gio';
|
||||
import GLib from 'gi://GLib';
|
||||
|
||||
const Gettext = imports.gettext;
|
||||
import Gettext from 'gettext';
|
||||
|
||||
const Config = imports.config;
|
||||
import Config from '../config.js';
|
||||
|
||||
|
||||
/**
|
||||
* Initialise and setup Gettext.
|
||||
*/
|
||||
function setupGettext() {
|
||||
export function setupGettext() {
|
||||
// Init Gettext
|
||||
String.prototype.format = imports.format.format;
|
||||
Gettext.bindtextdomain(Config.APP_ID, Config.PACKAGE_LOCALEDIR);
|
||||
@ -25,7 +25,7 @@ function setupGettext() {
|
||||
* Initialise and setup Config, GResources and GSchema.
|
||||
* @param {string} extensionPath - The absolute path to the extension directory
|
||||
*/
|
||||
function setup(extensionPath) {
|
||||
export default function setup(extensionPath) {
|
||||
// Ensure config.js is setup properly
|
||||
Config.PACKAGE_DATADIR = extensionPath;
|
||||
const userDir = GLib.build_filenamev([GLib.get_user_data_dir(), 'gnome-shell']);
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
// SPDX-FileCopyrightText: GSConnect Developers https://github.com/GSConnect
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
import GLib from 'gi://GLib';
|
||||
|
||||
const [filename] = GLib.filename_from_uri(import.meta.url);
|
||||
const dirname = GLib.path_get_dirname(filename);
|
||||
imports.searchPath.unshift(dirname);
|
||||
|
||||
export const {setup, setupGettext} = imports.setup;
|
||||
export default setup;
|
||||
Reference in New Issue
Block a user