|
 |
1807628 |
--- cups-pk-helper-0.0.4/src/cups.c 2009-09-30 10:38:21.895761263 +0100
|
|
|
1807628 |
+++ cups-pk-helper-0.0.4/src/cups.c 2009-09-30 10:44:07.794636125 +0100
|
|
|
1807628 |
@@ -2,8 +2,9 @@
|
|
|
1807628 |
* vim: set et ts=8 sw=8:
|
|
|
1807628 |
*
|
|
|
1807628 |
* Copyright (C) 2008 Novell, Inc.
|
|
|
1807628 |
+ * Copyright (C) 2009 Red Hat, Inc.
|
|
|
1807628 |
*
|
|
|
1807628 |
- * Authors: Vincent Untz
|
|
|
1807628 |
+ * Authors: Vincent Untz, Tim Waugh
|
|
|
1807628 |
*
|
|
|
1807628 |
* This program is free software; you can redistribute it and/or modify
|
|
|
1807628 |
* it under the terms of the GNU General Public License as published by
|
|
|
1807628 |
@@ -997,11 +998,13 @@ cph_cups_printer_add (CphCups *cups,
|
|
|
1807628 |
|
|
|
1807628 |
ippAddString (request, IPP_TAG_PRINTER, IPP_TAG_NAME,
|
|
|
1807628 |
"printer-name", NULL, printer_name);
|
|
|
1807628 |
- ippAddString (request, IPP_TAG_PRINTER, IPP_TAG_URI,
|
|
|
1807628 |
- "device-uri", NULL, printer_uri);
|
|
|
1807628 |
ippAddString (request, IPP_TAG_PRINTER, IPP_TAG_NAME,
|
|
|
1807628 |
"ppd-name", NULL, ppd_file);
|
|
|
1807628 |
|
|
|
1807628 |
+ if (printer_uri && printer_uri[0] != '\0') {
|
|
|
1807628 |
+ ippAddString (request, IPP_TAG_PRINTER, IPP_TAG_URI,
|
|
|
1807628 |
+ "device-uri", NULL, printer_uri);
|
|
|
1807628 |
+ }
|
|
|
1807628 |
if (info && info[0] != '\0') {
|
|
|
1807628 |
ippAddString (request, IPP_TAG_PRINTER, IPP_TAG_TEXT,
|
|
|
1807628 |
"printer-info", NULL, info);
|