Skip to content

Fixed bug which causes this._panelZoneSizes is null error #13034

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed bug which causes this._panelZoneSizes is null error #13034

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions files/usr/share/cinnamon/applets/[email protected]/applet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ class CinnamonKeyboardApplet extends Applet.TextIconApplet {
this.desktop_settings.connect("changed::keyboard-layout-show-flags", _syncConfig);
this.desktop_settings.connect("changed::keyboard-layout-use-upper", _syncConfig);
this.desktop_settings.connect("changed::keyboard-layout-prefer-variant-names", _syncConfig);
global.settings.connect('changed::' + PANEL_EDIT_MODE_KEY, () => this._onPanelEditModeChanged());
this.panelEditModeHandler = global.settings.connect('changed::' + PANEL_EDIT_MODE_KEY, () => this._onPanelEditModeChanged());

this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
this.menu.addAction(_("Show Keyboard Layout"), () => {
Expand Down Expand Up @@ -454,7 +454,7 @@ class CinnamonKeyboardApplet extends Applet.TextIconApplet {

on_applet_removed_from_panel() {
this._controller.applet_removed();

global.settings.disconnect(this.panelEditModeHandler);
Main.systrayManager.unregisterTrayIconReplacement(this.metadata.uuid);
}
};
Expand Down
3 changes: 2 additions & 1 deletion files/usr/share/cinnamon/applets/[email protected]/applet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class CinnamonNotificationsApplet extends Applet.TextIconApplet {

// Events
Main.messageTray.connect('notify-applet-update', Lang.bind(this, this._notification_added));
global.settings.connect('changed::' + PANEL_EDIT_MODE_KEY, Lang.bind(this, this._on_panel_edit_mode_changed));
this.panelEditModeHandler = global.settings.connect('changed::' + PANEL_EDIT_MODE_KEY, Lang.bind(this, this._on_panel_edit_mode_changed));

// States
this._blinking = false;
Expand All @@ -53,6 +53,7 @@ class CinnamonNotificationsApplet extends Applet.TextIconApplet {
on_applet_removed_from_panel () {
Main.keybindingManager.removeHotKey("notification-open-" + this.instance_id);
Main.keybindingManager.removeHotKey("notification-clear-" + this.instance_id);
global.settings.disconnect(this.panelEditModeHandler);
}

_openMenu() {
Expand Down
3 changes: 2 additions & 1 deletion files/usr/share/cinnamon/applets/[email protected]/applet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class CinnamonPrintersApplet extends Applet.TextIconApplet {
this.settings = new Settings.AppletSettings(this, metadata.uuid, instance_id);
this.settings.bind('show-icon', 'show_icon', this.update);

global.settings.connect('changed::' + PANEL_EDIT_MODE_KEY, Lang.bind(this, this._on_panel_edit_mode_changed));
this.panelEditModeHandler = global.settings.connect('changed::' + PANEL_EDIT_MODE_KEY, Lang.bind(this, this._on_panel_edit_mode_changed));

this.jobsCount = 0;
this.printersCount = 0;
Expand All @@ -56,6 +56,7 @@ class CinnamonPrintersApplet extends Applet.TextIconApplet {

on_applet_removed_from_panel() {
this.settings.finalize();
global.settings.disconnect(this.panelEditModeHandler);
}

_on_panel_edit_mode_changed () {
Expand Down