AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

printing: Show Avahi printers on IPv6 network

Browse Source 
Create correct URIs for printers on IPv6 networks.
This commit is contained in:
Marek Kasik 2013-03-12 16:26:37 +01:00
parent b9e189150b
commit 36d2324891
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2533,6 +2533,7 @@ avahi_resolver_found_cb (GaServiceResolver *resolver,
{ {
GtkPrintBackendCups *backend = GTK_PRINT_BACKEND_CUPS (user_data); GtkPrintBackendCups *backend = GTK_PRINT_BACKEND_CUPS (user_data);
AvahiStringList *item; AvahiStringList *item;
const gchar *protocol_string;
gchar host[AVAHI_ADDRESS_STR_MAX]; gchar host[AVAHI_ADDRESS_STR_MAX];
gchar *suffix = NULL; gchar *suffix = NULL;
gchar *printer_uri; gchar *printer_uri;
@ -2546,9 +2547,14 @@ avahi_resolver_found_cb (GaServiceResolver *resolver,
if (suffix) if (suffix)
{ {
if (g_strcmp0 (type, "_ipp._tcp") == 0) if (g_strcmp0 (type, "_ipp._tcp") == 0)
printer_uri = g_strdup_printf ("ipp://%s:%u/%s", host, port, suffix); protocol_string = "ipp";
else else
printer_uri = g_strdup_printf ("ipps://%s:%u/%s", host, port, suffix); protocol_string = "ipps";
if (protocol == GA_PROTOCOL_INET6)
printer_uri = g_strdup_printf ("%s://[%s]:%u/%s", protocol_string, host, port, suffix);
else
printer_uri = g_strdup_printf ("%s://%s:%u/%s", protocol_string, host, port, suffix);
cups_request_avahi_printer_info (printer_uri, cups_request_avahi_printer_info (printer_uri,
host, host,