[gtk/gtk-3-24] printing: Use original names for remote CUPS printers
- From: Marek Kašík <mkasik src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/gtk-3-24] printing: Use original names for remote CUPS printers
- Date: Thu, 20 Aug 2020 11:56:11 +0000 (UTC)
commit 963e5dd0c80dbb01f795d29fd8ee00d3fcb18a3c
Author: Marek Kasik <mkasik redhat com>
Date: Thu Aug 20 13:40:04 2020 +0200
printing: Use original names for remote CUPS printers
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.
modules/printbackends/cups/gtkprintbackendcups.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/modules/printbackends/cups/gtkprintbackendcups.c
b/modules/printbackends/cups/gtkprintbackendcups.c
index 610d688797..d95d632e0b 100644
--- a/modules/printbackends/cups/gtkprintbackendcups.c
+++ b/modules/printbackends/cups/gtkprintbackendcups.c
@@ -3194,8 +3194,8 @@ avahi_service_resolver_cb (GObject *source_object,
if (data->resource_path != NULL)
{
if (data->got_printer_type &&
- (g_strcmp0 (data->resource_path, "printers/") == 0 ||
- g_strcmp0 (data->resource_path, "classes/") == 0))
+ (g_str_has_prefix (data->resource_path, "printers/") ||
+ g_str_has_prefix (data->resource_path, "classes/")))
{
/* This is a CUPS printer advertised via Avahi */
printer_name = g_strrstr (data->resource_path, "/");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]