From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Fri, 17 Oct 2014 18:27:22 +0000 (+0000)
Subject: Fix compile errors.
X-Git-Tag: v2.2b1~463
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84245a8a385693da7ad17ddfe909262b6de91b23;p=thirdparty%2Fcups.git

Fix compile errors.


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12209 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/test/ippserver.c b/test/ippserver.c
index 57d107879c..d90f77a4d6 100644
--- a/test/ippserver.c
+++ b/test/ippserver.c
@@ -5690,11 +5690,11 @@ register_printer(
 
   ipp_txt = NULL;
   ipp_txt = avahi_string_list_add_printf(ipp_txt, "rp=ipp/print");
-  ipp_txt = avahi_string_list_add_printf(ipp_txt, "ty=%s", make_model);
+  ipp_txt = avahi_string_list_add_printf(ipp_txt, "ty=%s %s", make, model);
   ipp_txt = avahi_string_list_add_printf(ipp_txt, "adminurl=%s", adminurl);
   if (*location)
     ipp_txt = avahi_string_list_add_printf(ipp_txt, "note=%s", location);
-  ipp_txt = avahi_string_list_add_printf(ipp_txt, "product=%s", product);
+  ipp_txt = avahi_string_list_add_printf(ipp_txt, "product=(%s)", model);
   ipp_txt = avahi_string_list_add_printf(ipp_txt, "pdl=%s", formats);
   ipp_txt = avahi_string_list_add_printf(ipp_txt, "Color=%s", color ? "T" : "F");
   ipp_txt = avahi_string_list_add_printf(ipp_txt, "Duplex=%s", duplex ? "T" : "F");