Move printer-strings-languages-supported to common data.

diff --git a/scheduler/ipp.c b/scheduler/ipp.c
index b59d6a82730e697d5cdb057ad23afeb4b1872075..84018f6b13010e7b025f3000106e38ce114d785f 100644 (file)
--- a/scheduler/ipp.c
+++ b/scheduler/ipp.c
@@ -4986,20 +4986,6 @@ copy_printer_attrs(
   if (!ra || cupsArrayFind(ra, "printer-state-reasons"))
     add_printer_state_reasons(con, printer);
 
-  if (!ra || cupsArrayFind(ra, "printer-strings-languages-supported"))
-  {
-    cups_lang_t                *lang;          // Current language
-    ipp_attribute_t    *attr = NULL;   // Attribute
-
-    for (lang = Languages; lang; lang = lang->next)
-    {
-      if (attr)
-        ippSetString(con->response, &attr, ippGetCount(attr), lang->language);
-      else
-        attr = ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_LANGUAGE, "printer-strings-languages-supported", NULL, lang->language);
-    }
-  }
-
   if (!ra || cupsArrayFind(ra, "printer-strings-uri"))
   {
     cups_lang_t                *lang;          // Current language

diff --git a/scheduler/printers.c b/scheduler/printers.c
index f309600e9c7de59431e56eef5e5f7f8eba30982c..925e4b1189eed5377d45095fa1dc3a68ac71378e 100644 (file)
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -142,6 +142,7 @@ cupsdCreateCommonData(void)
   char                 filename[1024], /* Filename */
                        *notifier;      /* Current notifier */
   cupsd_policy_t       *p;             /* Current policy */
+  cups_lang_t          *lang;          /* Current language */
   int                  k_supported;    /* Maximum file size supported */
 #ifdef HAVE_STATVFS
   struct statvfs       spoolinfo;      /* FS info for spool directory */
@@ -572,6 +573,15 @@ cupsdCreateCommonData(void)
   /* printer-settable-attributes-supported */
   ippAddStrings(CommonData, IPP_TAG_PRINTER, IPP_CONST_TAG(IPP_TAG_KEYWORD), "printer-settable-attributes-supported", sizeof(printer_settable) / sizeof(printer_settable[0]), NULL, printer_settable);
 
+  /* printer-strings-languages-supported */
+  for (lang = Languages, attr = NULL; lang; lang = lang->next)
+  {
+    if (attr)
+      ippSetString(CommonData, &attr, ippGetCount(attr), lang->language);
+    else
+      attr = ippAddString(CommonData, IPP_TAG_PRINTER, IPP_TAG_LANGUAGE, "printer-strings-languages-supported", NULL, lang->language);
+  }
+
   /* server-is-sharing-printers */
   ippAddBoolean(CommonData, IPP_TAG_PRINTER, "server-is-sharing-printers", BrowseLocalProtocols != 0 && Browsing);