Contents of /trunk/cups/patches/cups-1.6.1-dnssd-deviceid.patch
Parent Directory | Revision Log
Revision 2028 -
(show annotations)
(download)
Wed Jan 16 10:59:19 2013 UTC (11 years, 8 months ago) by niro
File size: 1579 byte(s)
Wed Jan 16 10:59:19 2013 UTC (11 years, 8 months ago) by niro
File size: 1579 byte(s)
-patches for 1.6.1
1 | diff -up cups-1.6b1/backend/dnssd.c.dnssd-deviceid cups-1.6b1/backend/dnssd.c |
2 | --- cups-1.6b1/backend/dnssd.c.dnssd-deviceid 2012-05-21 18:05:58.000000000 +0200 |
3 | +++ cups-1.6b1/backend/dnssd.c 2012-05-25 16:27:49.226874427 +0200 |
4 | @@ -1181,15 +1181,22 @@ query_callback( |
5 | if (device->device_id) |
6 | free(device->device_id); |
7 | |
8 | + if (device_id[0]) |
9 | + { |
10 | + /* Mark this as the real device ID. */ |
11 | + ptr = device_id + strlen(device_id); |
12 | + snprintf(ptr, sizeof(device_id) - (ptr - device_id), "FZY:0;"); |
13 | + } |
14 | + |
15 | if (!device_id[0] && strcmp(model, "Unknown")) |
16 | { |
17 | if (make_and_model[0]) |
18 | - snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;", |
19 | + snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;FZY:1;", |
20 | make_and_model, model); |
21 | else if (!_cups_strncasecmp(model, "designjet ", 10)) |
22 | - snprintf(device_id, sizeof(device_id), "MFG:HP;MDL:%s", model + 10); |
23 | + snprintf(device_id, sizeof(device_id), "MFG:HP;MDL:%s;FZY:1;", model + 10); |
24 | else if (!_cups_strncasecmp(model, "stylus ", 7)) |
25 | - snprintf(device_id, sizeof(device_id), "MFG:EPSON;MDL:%s", model + 7); |
26 | + snprintf(device_id, sizeof(device_id), "MFG:EPSON;MDL:%s;FZY:1;", model + 7); |
27 | else if ((ptr = strchr(model, ' ')) != NULL) |
28 | { |
29 | /* |
30 | @@ -1199,7 +1206,7 @@ query_callback( |
31 | memcpy(make_and_model, model, ptr - model); |
32 | make_and_model[ptr - model] = '\0'; |
33 | |
34 | - snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s", |
35 | + snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;FZY:1;", |
36 | make_and_model, ptr + 1); |
37 | } |
38 | } |