callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

printing: Use original names for remote CUPS printers

Browse Source 
CUPS uses resource paths in the form of "printers/printer_name"
or "classes/class_name" so it is enough to remove the "printers/"
or "classes/" prefix and use the string behind it as a name.

There was recently introduced a wrong check for the prefix.
This commit fixes it in the way it was originally intended.
This commit is contained in:
Marek Kasik 2020-08-20 13:40:04 +02:00
parent 1dcd916c7e
commit 963e5dd0c8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/printbackends/cups/gtkprintbackendcups.c
View File

@ -3194,8 +3194,8 @@ avahi_service_resolver_cb (GObject *source_object,
if (data->resource_path != NULL) if (data->resource_path != NULL)
{ {
if (data->got_printer_type && if (data->got_printer_type &&
(g_strcmp0 (data->resource_path, "printers/") == 0 || (g_str_has_prefix (data->resource_path, "printers/") ||
g_strcmp0 (data->resource_path, "classes/") == 0)) g_str_has_prefix (data->resource_path, "classes/")))
{ {
/* This is a CUPS printer advertised via Avahi */ /* This is a CUPS printer advertised via Avahi */
printer_name = g_strrstr (data->resource_path, "/"); printer_name = g_strrstr (data->resource_path, "/");