← Back to branch summary

~ubuntu-branches/ubuntu/natty/cups/natty

« back to all changes in this revision

Viewing changes to cups/dest.c

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2009-09-15 11:30:07 UTC
  • mto: (12.1.3 sid) (14.1.1 sid) (25.1.2 lucid)
  • mto: This revision was merged to the branch mainline in revision 13.
  • Revision ID: james.westby@ubuntu.com-20090915113007-1gngzbskotfxronq
Tags: upstream-1.4.1
Import upstream version 1.4.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
cups/dest.c
1
1
/*
2
 
 * "$Id: dest.c 8627 2009-05-13 21:39:17Z mike $"
 
2
 * "$Id: dest.c 8789 2009-08-28 22:54:34Z mike $"
3
3
 *
4
4
 *   User-defined destination (and option) support for the Common UNIX
5
5
 *   Printing System (CUPS).
557
557
    * configuration file does not exist.  Find out the real default.
558
558
    */
559
559
 
560
 
    if (!cups_get_sdests(http, CUPS_GET_DEFAULT, name, 0, &dest))
 
560
    if (!cups_get_sdests(http, CUPS_GET_DEFAULT, NULL, 0, &dest))
561
561
      return (NULL);
562
562
  }
563
563
 
1800
1800
  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
1801
1801
               "requesting-user-name", NULL, cupsUser());
1802
1802
 
1803
 
  if (name)
 
1803
  if (name && op != CUPS_GET_DEFAULT)
1804
1804
  {
1805
1805
    httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
1806
1806
                     "localhost", ippPort(), "/printers/%s", name);
2053
2053
 
2054
2054
 
2055
2055
/*
2056
 
 * End of "$Id: dest.c 8627 2009-05-13 21:39:17Z mike $".
 
2056
 * End of "$Id: dest.c 8789 2009-08-28 22:54:34Z mike $".
2057
2057
 */