Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP: GNOME 43 #1444

Closed
wants to merge 1 commit into from
Closed

WIP: GNOME 43 #1444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/metadata.json.in
View file
Open in desktop
Expand Up @@ -3,6 +3,6 @@
"name": "GSConnect",
"description": "GSConnect is a complete implementation of KDE Connect especially for GNOME Shell with Nautilus, Chrome and Firefox integration. It does not rely on the KDE Connect desktop application and will not work with it installed.\n\nKDE Connect allows devices to securely share content like notifications or files and other features like SMS messaging and remote control. The KDE Connect team has applications for Linux, BSD, Android, Sailfish, iOS, macOS and Windows.\n\nPlease report issues on Github!",
"version": @PACKAGE_VERSION@,
"shell-version": [ "42" ],
"shell-version": [ "43" ],
"url": "@PACKAGE_URL@/wiki"
}
14 changes: 7 additions & 7 deletions src/extension.js
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ const Gtk = imports.gi.Gtk;
const Main = imports.ui.main;
const PanelMenu = imports.ui.panelMenu;
const PopupMenu = imports.ui.popupMenu;
const AggregateMenu = Main.panel.statusArea.aggregateMenu;
const QuickSettings = Main.panel.statusArea.quickSettings;

// Bootstrap
const Extension = imports.misc.extensionUtils.getCurrentExtension();
Expand Down Expand Up @@ -84,8 +84,8 @@ const ServiceIndicator = GObject.registerClass({
);
this._indicator.visible = false;

AggregateMenu._indicators.insert_child_at_index(this, 0);
AggregateMenu._gsconnect = this;
QuickSettings._indicators.insert_child_at_index(this, 0);
QuickSettings._gsconnect = this;

// Service Menu
this._item = new PopupMenu.PopupSubMenuMenuItem(_('Mobile Devices'), true);
Expand All @@ -94,11 +94,11 @@ const ServiceIndicator = GObject.registerClass({
this.menu.addMenuItem(this._item);

// Find current index of network menu
const menuItems = AggregateMenu.menu._getMenuItems();
const networkMenuIndex = AggregateMenu._network ? menuItems.indexOf(AggregateMenu._network.menu) : -1;
const menuItems = QuickSettings.menu._getMenuItems();
const networkMenuIndex = QuickSettings._network ? menuItems.indexOf(QuickSettings._network.menu) : -1;
const menuIndex = networkMenuIndex > -1 ? networkMenuIndex : 3;
// Place our menu below the network menu
AggregateMenu.menu.addMenuItem(this.menu, menuIndex + 1);
QuickSettings.menu.addMenuItem(this.menu, menuIndex + 1);

// Service Menu -> Devices Section
this.deviceSection = new PopupMenu.PopupMenuSection();
Expand Down Expand Up @@ -413,7 +413,7 @@ const ServiceIndicator = GObject.registerClass({
this._item.destroy();
this.menu.destroy();

delete AggregateMenu._gsconnect;
delete QuickSettings._gsconnect;
super.destroy();
}
});
Expand Down