From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Fri, 18 Jul 2008 21:45:31 +0000 (+0000)
Subject: Merge changes from CUPS 1.4svn-r7770.
X-Git-Tag: release-1.6.3~155
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5d6412a9f1d6faef517cc8038f9d3784afef9945;p=thirdparty%2Fcups.git

Merge changes from CUPS 1.4svn-r7770.


git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@872 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/CHANGES-1.3.txt b/CHANGES-1.3.txt
index 7324c268d9..94106486d8 100644
--- a/CHANGES-1.3.txt
+++ b/CHANGES-1.3.txt
@@ -5,6 +5,8 @@ CHANGES IN CUPS V1.3.8
 
 	- Documentation updates (STR #2785, STR #2861, STR #2862)
 	- The IPP backend did not relay marker-* attributes.
+	- The CUPS GNOME/KDE menu item was not localized for
+	  Chinese (STR #2880)
 	- The CUPS GNOME/KDE menu item was not localized for
 	  Japanese (STR #2876)
 	- The cupstestppd utility reported mixed line endings for
diff --git a/Makefile b/Makefile
index fefe1336d1..9074d67315 100644
--- a/Makefile
+++ b/Makefile
@@ -114,7 +114,9 @@ clang:
 	else \
 		rm -rf clang/*; \
 	fi
-	$(MAKE) $(MFLAGS) CC="scan-build -o ../clang $(CC)" clean all
+	$(MAKE) $(MFLAGS) CC="scan-build -o ../clang $(CC)" \
+		CXX="scan-build -o ../clang $(CXX)" clean all
+	test `ls -1 clang | wc -l` != 0 || exit 1
 
 
 #
diff --git a/cups/conflicts.c b/cups/conflicts.c
index 79dbb41741..042bfdcec6 100644
--- a/cups/conflicts.c
+++ b/cups/conflicts.c
@@ -87,8 +87,6 @@ ppdConflicts(ppd_file_t *ppd)		/* I - PPD to check */
   * Clear all conflicts...
   */
 
-  conflicts = 0;
-
   for (o = ppdFirstOption(ppd); o; o = ppdNextOption(ppd))
     o->conflicted = 0;
 
diff --git a/cups/mark.c b/cups/mark.c
index b0de90076f..bad9303aa3 100644
--- a/cups/mark.c
+++ b/cups/mark.c
@@ -722,7 +722,7 @@ ppd_mark_choices(ppd_file_t *ppd,	/* I - PPD file */
 		*option;		/* Current option */
 
 
-  if (!options)
+  if (!s)
     return;
 
   options     = NULL;
diff --git a/desktop/cups.desktop b/desktop/cups.desktop
index 1f264ad0a8..78cf19cfae 100644
--- a/desktop/cups.desktop
+++ b/desktop/cups.desktop
@@ -15,6 +15,8 @@ X-KDE-SubstituteUID=false
 X-KDE-Username=
 Name=Manage Printing
 Comment=CUPS Web Interface
+Name[de]=Druckerverwaltung
+Comment[de]=CUPS Webinterface
 Name[en_US]=Manage Printing
 Comment[en_US]=CUPS Web Interface
 Name[es]=Administrar impresión
@@ -23,17 +25,17 @@ Name[et]=Trükkimise haldur
 Comment[et]=CUPS-i veebiliides
 Name[fr]=Gestionnaire d'impression
 Comment[fr]=Interface Web de CUPS
-Name[pl]=Zarządzanie drukowaniem
-Comment[pl]=Interfejs WWW CUPS
+Name[he]=נהל הדפסות
+Comment[he]=ממשק דפדפן של CUPS
+Name[id]=Manajemen Pencetakan
+Comment[id]=Antarmuka Web CUPS
 Name[it]=Gestione stampa
 Comment[it]=Interfaccia web di CUPS
 Name[ja]=印刷の管理
 Comment[ja]=CUPS Web インタフェース
-Name[he]=נהל הדפסות
-Comment[he]=ממשק דפדפן של CUPS
+Name[pl]=Zarządzanie drukowaniem
+Comment[pl]=Interfejs WWW CUPS
+Name[zh]=打印机管理
+Comment[zh]=CUPS网页界面
 Name[zh_TW]=印表管理
 Comment[zh_TW]=CUPS 網頁介面
-Name[de]=Druckerverwaltung
-Comment[de]=CUPS Webinterface
-Name[id]=Manajemen Pencetakan
-Comment[id]=Antarmuka Web CUPS
diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index f9c82f076e..b2960d65db 100644
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -2645,7 +2645,7 @@ process_browse_data(
       }
     }
   }
-  else
+  else if (p)
     cupsdLogMessage(CUPSD_LOG_DEBUG2,
 		    "process_browse_data: %s found, type=%x, hostname=%s...",
 		    name, p->type, p->hostname ? p->hostname : "(nil)");
diff --git a/scheduler/ipp.c b/scheduler/ipp.c
index 621663e3a5..cd8b6c26ea 100644
--- a/scheduler/ipp.c
+++ b/scheduler/ipp.c
@@ -10086,6 +10086,7 @@ set_job_attrs(cupsd_client_t  *con,	/* I - Client connection */
 	!strcmp(attr->name, "job-detailed-status-messages") ||
 	!strcmp(attr->name, "job-document-access-errors") ||
 	!strcmp(attr->name, "job-id") ||
+	!strcmp(attr->name, "job-impressions-completed") ||
 	!strcmp(attr->name, "job-k-octets") ||
         !strcmp(attr->name, "job-originating-host-name") ||
         !strcmp(attr->name, "job-originating-user-name") ||
@@ -10099,7 +10100,6 @@ set_job_attrs(cupsd_client_t  *con,	/* I - Client connection */
 	!strcmp(attr->name, "number-of-intervening-jobs") ||
 	!strcmp(attr->name, "output-device-assigned") ||
 	!strncmp(attr->name, "date-time-at-", 13) ||
-	!strncmp(attr->name, "job-impressions", 15) ||
 	!strncmp(attr->name, "job-k-octets", 12) ||
 	!strncmp(attr->name, "job-media-sheets", 16) ||
 	!strncmp(attr->name, "time-at-", 8))
diff --git a/scheduler/job.c b/scheduler/job.c
index 9b025a387a..0669ec028a 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -2890,18 +2890,22 @@ start_job(cupsd_job_t     *job,		/* I - Job ID */
 	continue;
 
       if (!strncmp(attr->name, "job-", 4) && strcmp(attr->name, "job-uuid") &&
+          strcmp(attr->name, "job-impressions") &&
+          strcmp(attr->name, "job-originating-host-name") &&
           !(printer->type & CUPS_PRINTER_REMOTE))
 	continue;
 
       if (!strncmp(attr->name, "job-", 4) &&
           strcmp(attr->name, "job-uuid") &&
           strcmp(attr->name, "job-billing") &&
+          strcmp(attr->name, "job-impressions") &&
           strcmp(attr->name, "job-sheets") &&
           strcmp(attr->name, "job-hold-until") &&
 	  strcmp(attr->name, "job-priority"))
 	continue;
 
-      if ((!strcmp(attr->name, "page-label") ||
+      if ((!strcmp(attr->name, "job-impressions") ||
+           !strcmp(attr->name, "page-label") ||
            !strcmp(attr->name, "page-border") ||
            !strncmp(attr->name, "number-up", 9) ||
 	   !strcmp(attr->name, "page-ranges") ||