patches/libgnomeprint-04-papi-printer.diff
author rohinis
Tue, 29 Nov 2011 17:32:55 +0000
branchs11express-2010-11
changeset 22234 c23e64da3e06
parent 17759 5a0ea8951294
permissions -rw-r--r--
2011-11-29 Rohini S <[email protected]> * patches/Python26-22-audio.diff: Fixes CVE-2010-1634 * specs/SUNWPython26.spec: Fixes CR 7085446
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
17759
5a0ea8951294 2010-03-26 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
     1
diff -urN -x'*.orig' -x'*.rej' libgnomeprint-2.18.6/libgnomeprint/modules/papi/gnome-print-papi.c ../SUNWgnome-print-2.29.92.hacked/libgnomeprint-2.18.6/libgnomeprint/modules/papi/gnome-print-papi.c
5a0ea8951294 2010-03-26 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
     2
--- libgnomeprint-2.18.6/libgnomeprint/modules/papi/gnome-print-papi.c	2010-03-25 15:40:30.626047574 +0000
5a0ea8951294 2010-03-26 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
     3
+++ ../SUNWgnome-print-2.29.92.hacked/libgnomeprint-2.18.6/libgnomeprint/modules/papi/gnome-print-papi.c	2010-03-26 16:15:50.597742000 +0000
5a0ea8951294 2010-03-26 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
     4
@@ -45,7 +45,7 @@
5a0ea8951294 2010-03-26 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
     5
 #include <libgnomeprint/gpa/gpa-settings.h>
5a0ea8951294 2010-03-26 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
     6
 
5a0ea8951294 2010-03-26 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
     7
 #define d(x)
5a0ea8951294 2010-03-26 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
     8
-#define	GENERIC_PPD_FILE "file://localhost/usr/lib/lp/model/ppd/system/foomatic/Generic/Generic-PostScript_Printer-Postscript.ppd.gz"
5a0ea8951294 2010-03-26 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
     9
+#define	GENERIC_PPD_FILE "file://localhost/usr/share/gnome-print-2.0/ppd/Generic/Generic-PostScript_Printer-Postscript.ppd.gz"
5a0ea8951294 2010-03-26 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    10
 
5a0ea8951294 2010-03-26 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    11
 /* Argument order: id, name */
5a0ea8951294 2010-03-26 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    12
 
5a0ea8951294 2010-03-26 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    13
@@ -759,7 +759,7 @@
5a0ea8951294 2010-03-26 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    14
 			status = papiAttributeListGetString (attrs, NULL,
5a0ea8951294 2010-03-26 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    15
 				"printer-name", &name);
5a0ea8951294 2010-03-26 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    16
 			status2 = papiAttributeListGetString (attrs, NULL,
5a0ea8951294 2010-03-26 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    17
-				"printer-uri", &uri);
5a0ea8951294 2010-03-26 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    18
+				"printer-uri-supported", &uri);
5a0ea8951294 2010-03-26 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    19
 			if (status == PAPI_OK && status2 == PAPI_OK) {
5a0ea8951294 2010-03-26 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    20
 				is_default =
5a0ea8951294 2010-03-26 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    21
 					(name != NULL && !strcmp (def, name));