Skip to content

printers@cinnamon.org: Update the applet when the printer list is empty or unavailable, and check for system-config-printer #13936

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
Fantu wants to merge 2 commits into
base: master
Choose a base branch
from
+43 −13
Open

printers@cinnamon.org: Update the applet when the printer list is empty or unavailable, and check for system-config-printer #13936

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd89468
printers@cinnamon.org: update the applet even when lpstat fails
Fantu Aug 16, 2026
ef8d969
printers@cinnamon.org: don't offer system-config-printer when it is m…
Fantu Aug 17, 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
56 changes: 43 additions & 13 deletions files/usr/share/cinnamon/applets/printers@cinnamon.org/applet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const Applet = imports.ui.applet;
const Cinnamon = imports.gi.Cinnamon;
const CinnamonDesktop = imports.gi.CinnamonDesktop;
const GLib = imports.gi.GLib;
const Gio = imports.gi.Gio;
Expand All @@ -12,6 +13,8 @@ const Util = imports.misc.util;

const PANEL_EDIT_MODE_KEY = "panel-edit-mode";

const CONFIG_TOOL = 'system-config-printer';

const PRINTER_STATE_STOPPED = 5;

const JOB_STATE_PROCESSING = 5;
Expand Down Expand Up @@ -141,9 +144,13 @@ class CinnamonPrintersApplet extends Applet.TextIconApplet {
this.set_applet_tooltip(_("Printers"));
this.set_applet_icon_symbolic_name('xsi-printer');

let printersContextItem = new PopupMenu.PopupIconMenuItem(_("Printers"), 'xsi-printer', St.IconType.SYMBOLIC);
printersContextItem.connect('activate', () => Util.spawn(['system-config-printer']));
this._applet_context_menu.addMenuItem(printersContextItem);
// Kept hidden until the asynchronous lookup below says the program is
// there; the separator finalizeContextMenu() adds hides itself along
// with it.
this._printersContextItem = new PopupMenu.PopupIconMenuItem(_("Printers"), 'xsi-printer', St.IconType.SYMBOLIC);
this._printersContextItem.connect('activate', () => Util.spawn([CONFIG_TOOL]));
this._applet_context_menu.addMenuItem(this._printersContextItem);
this._printersContextItem.actor.hide();

this.menu = new Applet.AppletPopupMenu(this, orientation);
this.menu.connect('open-state-changed', (menu, open) => {
Expand All @@ -163,13 +170,24 @@ class CinnamonPrintersApplet extends Applet.TextIconApplet {

this._printers = new Map();
this._hasPrinterConfig = false;
this._hasConfigTool = false;
this._cupsSubscription = null;
this._rebuildId = 0;
this._menuDirty = false;

this._wallClock = new CinnamonDesktop.WallClock();

this._cancellable = new Gio.Cancellable();

Cinnamon.find_program_in_path(CONFIG_TOOL, (path) => {
if (path == null || !this._cancellable || this._cancellable.is_cancelled())
return;

this._hasConfigTool = true;
this._printersContextItem.actor.show();
this._scheduleMenuRebuild();
});

Gio.DBus.session.call(
'org.freedesktop.DBus', '/org/freedesktop/DBus',
'org.freedesktop.DBus', 'ListActivatableNames',
Expand Down Expand Up @@ -243,19 +261,25 @@ class CinnamonPrintersApplet extends Applet.TextIconApplet {

_bootstrapPrinters() {
try {
Util.spawn_async(['/usr/bin/lpstat', '-e'], (out) => {
if (!out || !this._cancellable || this._cancellable.is_cancelled())
Util.spawnAsyncIO(['lpstat', '-e'], (out, err, exitCode) => {
if (!this._cancellable || this._cancellable.is_cancelled())
return;

for (const name of out.trim().split('\n')) {
if (name.trim())
this._getOrCreatePrinter(name.trim());
if (exitCode !== 0) {
global.logWarning(`printers@cinnamon.org: could not list printers: ${err ? err.trim() : `lpstat exited with ${exitCode}`}`);
} else if (out) {
for (const name of out.trim().split('\n')) {
if (name.trim())
this._getOrCreatePrinter(name.trim());
}
}

this._updateApplet();
});
} catch (e) {
// lpstat is missing (no cups client installed) - nothing to list.
global.logWarning(`printers@cinnamon.org: could not list printers: ${e.message}`);
this._updateApplet();
}
}

Expand Down Expand Up @@ -474,8 +498,12 @@ class CinnamonPrintersApplet extends Applet.TextIconApplet {
this.menu.removeAll();

if (this._printers.size === 0) {
let printersItem = new PopupMenu.PopupIconMenuItem(_("Printers"), 'xsi-printer', St.IconType.SYMBOLIC);
printersItem.connect('activate', () => Util.spawn(['system-config-printer']));
let printersItem = new PopupMenu.PopupIconMenuItem(_("Printers"), 'xsi-printer', St.IconType.SYMBOLIC,
{ reactive: this._hasConfigTool });
if (this._hasConfigTool)
printersItem.connect('activate', () => Util.spawn([CONFIG_TOOL]));
else
printersItem.actor.add_style_class_name('popup-inactive-menu-item');
this.menu.addMenuItem(printersItem);
}

Expand All @@ -496,9 +524,11 @@ class CinnamonPrintersApplet extends Applet.TextIconApplet {
printerItem.setButton(0, null, null, null);
if (warning || printer.state === PRINTER_STATE_STOPPED || printer.jobs.size > 0)
printerItem.label.add_style_class_name('popup-device-menu-item');
printerItem.connect('activate', () => {
Util.spawn(['system-config-printer', '--show-jobs', name]);
});
if (this._hasConfigTool) {
printerItem.connect('activate', () => {
Util.spawn([CONFIG_TOOL, '--show-jobs', name]);
});
}

if (this._hasPrinterConfig) {
printerItem.setButton(1, 'xsi-emblem-system', _("Show properties"), () => {
Expand Down
Loading