Skip to content

Fix several bugs: regex flags, implicit globals, crashes, ngettext, undefined icon #13643

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
KAMI911 wants to merge 8 commits into
base: master
Choose a base branch
from
+31 −12
Open

Fix several bugs: regex flags, implicit globals, crashes, ngettext, undefined icon #13643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b424d98
util: fixupPCIDescription: fix missing global flag in regex replacements
KAMI911 Mar 14, 2026
593a5a9
keyboardManager: fix implicit global variable declarations
KAMI911 Mar 14, 2026
263028e
notificationDaemon: add default case for unknown urgency in icon switch
KAMI911 Mar 14, 2026
1f2a2d7
notificationDaemon: fix crash in _expireNotification when notificatio…
KAMI911 Mar 14, 2026
f7a351b
windowManager: fix ngettext missing count argument in display-change …
KAMI911 Mar 14, 2026
dc43b84
cinnamonDBus: fix crash in activateCallback when xlet is not found
KAMI911 Mar 14, 2026
52825ea
cinnamonDBus: fix crash in updateSetting when instance_id is not found
KAMI911 Mar 14, 2026
38ca44f
cinnamonDBus: remove leftover debug comment in GetInputSources
KAMI911 Mar 14, 2026
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 js/misc/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,12 +369,12 @@ const _IGNORED_PHRASES = [
];

function fixupPCIDescription(desc) {
desc = desc.replace(/[_,]/, ' ');
desc = desc.replace(/[_,]/g, ' ');

/* Remove any parenthesized info longer than 2 chars (which
may be disambiguating numbers if there are multiple identical
cards present) */
desc = desc.replace(/\([\s\S][^\(\)]{2,}\)/, '');
desc = desc.replace(/\([\s\S][^\(\)]{2,}\)/g, '');

/* Attempt to shorten ID by ignoring certain phrases */
for (let i = 0; i < _IGNORED_PHRASES.length; i++) {
Expand Down
12 changes: 11 additions & 1 deletion js/ui/cinnamonDBus.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,10 @@ var CinnamonDBus = class {

activateCallback(callback, uuid, instance_id) {
let obj = this._getXletObject(uuid, instance_id);
if (!obj) {
global.logWarning(`[CinnamonDBus] activateCallback: xlet not found (uuid=${uuid}, instance_id=${instance_id})`);
return;
}
let cb = obj[callback].bind(obj);
cb();
}
Expand All @@ -386,6 +390,13 @@ var CinnamonDBus = class {
);
return;
}
if (!Main.settingsManager.uuids[uuid][instance_id]) {
global.logWarning(
`[CinnamonDBus] [${uuid}] Unable to find instance '${instance_id}' from SettingsManager - ` +
'this is likely due to configuring settings from a removed xlet instance.'
Copy link
Copy Markdown
Member

@mtwebster mtwebster Mar 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.... uuid] Unable to find instance 'instance_id' from SettingsManager' is enough, keep the message short.

);
return;
}
Main.settingsManager.uuids[uuid][instance_id].remoteUpdate(key, payload);
}

Expand Down Expand Up @@ -549,7 +560,6 @@ var CinnamonDBus = class {

for (let idx in sources) {
const source = sources[idx];
// global.log(source.preferences);
ret.push([
source.type,
source.id,
Expand Down
10 changes: 5 additions & 5 deletions js/ui/keyboardManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ const PopupMenu = imports.ui.popupMenu;
const Cairo = imports.cairo;
const Util = imports.misc.util;

DESKTOP_INPUT_SOURCES_SCHEMA = 'org.cinnamon.desktop.input-sources';
KEY_INPUT_SOURCES = 'sources';
KEY_KEYBOARD_OPTIONS = 'xkb-options';
KEY_PER_WINDOW = 'per-window';
KEY_SOURCE_LAYOUTS = 'source-layouts';
var DESKTOP_INPUT_SOURCES_SCHEMA = 'org.cinnamon.desktop.input-sources';
var KEY_INPUT_SOURCES = 'sources';
var KEY_KEYBOARD_OPTIONS = 'xkb-options';
var KEY_PER_WINDOW = 'per-window';
var KEY_SOURCE_LAYOUTS = 'source-layouts';

var INPUT_SOURCE_TYPE_XKB = 'xkb';
var INPUT_SOURCE_TYPE_IBUS = 'ibus';
Expand Down
11 changes: 10 additions & 1 deletion js/ui/notificationDaemon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,9 @@ NotificationDaemon.prototype = {
case Urgency.CRITICAL:
stockIcon = 'xsi-dialog-error-symbolic';
break;
default:
stockIcon = 'xsi-dialog-information-symbolic';
break;
}
return new St.Icon({ icon_name: stockIcon,
icon_type: St.IconType.SYMBOLIC,
Expand Down Expand Up @@ -265,7 +268,13 @@ NotificationDaemon.prototype = {
let ndata = this._expireNotifications[0];

if (ndata) {
ndata.notification.destroy(MessageTray.NotificationDestroyedReason.EXPIRED);
if (ndata.notification) {
ndata.notification.destroy(MessageTray.NotificationDestroyedReason.EXPIRED);
} else {
// notification object not yet created (async PID lookup still pending)
this._expireNotifications.shift();
this._restartExpire();
}
}

this._expireTimer = 0;
Expand Down
6 changes: 3 additions & 3 deletions js/ui/windowManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ class DisplayChangeDialog extends ModalDialog.ModalDialog {
}

_formatCountDown() {
let fmt = ngettext("Reverting to previous display settings in %d second.",
"Reverting to previous display settings in %d seconds.");
return fmt.format(this._countDown);
return ngettext("Reverting to previous display settings in %d second.",
"Reverting to previous display settings in %d seconds.",
this._countDown).format(this._countDown);
}

_tick() {
Expand Down
Loading