Attachment #653444 for bug #632444

Lines 20-25 Link Here

(-) (+1 lines)
20	/* Includes */	20	/* Includes */
21	#include <cups/cups.h>	21	#include <cups/cups.h>
22	#include <cups/language.h>	22	#include <cups/language.h>
		23	#include <cups/ppd.h>
23	#include <sys/types.h>	24	#include <sys/types.h>
24	#include <unistd.h>	25	#include <unistd.h>
25	#include <pwd.h>	26	#include <pwd.h>




// CUPS Header
#include <cups/cups.h>
#include <cups/ipp.h>
#include <cups/ppd.h>

// Header file for CANON
#include "cnij_backend_common.h"

	short			tmpformat;
	short			retbyte = 0;
	short			bpp = 3;
	png_uint_32		width = 0;
	png_uint_32		length = 0;
	long			maxvalue = 0;
	long			rstep = 0;
	long			RasterLength = 0;

		goto onErr;
	}

	if (setjmp (png_jmpbuf(png_p)))
	{
		png_destroy_read_struct(&png_p, &info_p, (png_infopp)NULL);
		goto onErr;

AC_DEFINE_UNQUOTED(BJLIB_PATH, "$enable_libpath")
AC_SUBST(BJLIB_PATH)

case "$ABI" in
    x86) ARC=32;;
    amd64) ARC=64;;
    *) ARC=`getconf LONG_BIT`;;
esac
AC_SUBST(ARC)

# Checks for programs.

Lines 43-49 Link Here

(-)cnijfilter/configure.in (-1 / +5 lines)
43	esac	43	esac
44	AC_SUBST(CNCL_LIB_ID)	44	AC_SUBST(CNCL_LIB_ID)
45		45
46	ARC=`getconf LONG_BIT`	46	case "$ABI" in
		47	x86) ARC=32;;
		48	amd64) ARC=64;;
		49	*) ARC=`getconf LONG_BIT`;;
		50	esac
47	AC_SUBST(ARC)	51	AC_SUBST(ARC)
48		52
49	AC_PROG_CC	53	AC_PROG_CC

Lines 37-43 Link Here

(-)cngpijmon/cnijnpr/configure.in (-1 / +5 lines)
37		37
38	CFLAGS="-O2"	38	CFLAGS="-O2"
39		39
40	ARC=`getconf LONG_BIT`	40	case "$ABI" in
		41	x86) ARC=32;;
		42	amd64) ARC=64;;
		43	*) ARC=`getconf LONG_BIT`;;
		44	esac
41	AC_SUBST(ARC)	45	AC_SUBST(ARC)
42		46
43	AC_OUTPUT(Makefile	47	AC_OUTPUT(Makefile

Lines 37-43 Link Here

(-)lgmon/configure.in (-1 / +5 lines)
37	esac	37	esac
38	AC_SUBST(CNCL_LIB_ID)	38	AC_SUBST(CNCL_LIB_ID)
39		39
40	ARC=`getconf LONG_BIT`	40	case "$ABI" in
		41	x86) ARC=32;;
		42	amd64) ARC=64;;
		43	*) ARC=`getconf LONG_BIT`;;
		44	esac
41	AC_SUBST(ARC)	45	AC_SUBST(ARC)
42		46
43	AC_PROG_CC	47	AC_PROG_CC

Lines 97-103 Link Here

(-)printui/configure.in (-3 / +7 lines)
97	XML2_CFLAGS=`xml2-config --cflags`	97	XML2_CFLAGS=`xml2-config --cflags`
98	AC_SUBST(XML2_CFLAGS)	98	AC_SUBST(XML2_CFLAGS)
99		99
100	ARC=`getconf LONG_BIT`	100	case "$ABI" in
		101	x86) ARC=32;;
		102	amd64) ARC=64;;
		103	*) ARC=`getconf LONG_BIT`;;
		104	esac
101	AC_SUBST(ARC)	105	AC_SUBST(ARC)
102		106
103	AC_OUTPUT([	107	AC_OUTPUT([
Lines 1-4 Link Here
1	filterdir=$(libdir)/cups/filter	1	filterdir=$(libexecdir)/cups/filter
2		2
3	filter_PROGRAMS= pstocanonij	3	filter_PROGRAMS= pstocanonij
4		4
Lines 1-6 Link Here
1	## Process this file with automake to produce Makefile.in	1	## Process this file with automake to produce Makefile.in
2		2
3	backend_bindir = /usr/lib/cups/backend	3	backend_bindir = /usr/libexec/cups/backend
4	backend_bin_PROGRAMS = cnijusb	4	backend_bin_PROGRAMS = cnijusb
5	transform =	5	transform =
6		6




## Process this file with automake to produce Makefile.in

backendnet_bindir = /usr/libexec/cups/backend
backendnet_bin_PROGRAMS = cnijnet
transform = 


cnijnpr_SOURCES=\
	cnijnpr.c

cnijnpr_LDADD = -lcnnet -lbscc2sts -ldl
cnijnpr_LDFLAGS = -L../../../com/libs_bin@ARC@ -L../../../lgmon/src

#AM_CFLAGS= -O2 -Wall
++ a/cngpij/cngpij/bjcups.c

	else {
		pRequest = ippNew();
		
		ippSetOperation(pRequest, CUPS_GET_PRINTERS);
		ippSetRequestId(pRequest, 1);
		
		pLanguage = bjcupsLangDefault();	// cupsLangDefault() -> bjcupsLangDefault() for cups-1.1.19
		

		ippAddString(pRequest, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, NULL);
		
		if ((pResponse = cupsDoRequest(pHTTP, pRequest, "/")) != NULL) {
			if (ippGetStatusCode(pResponse) > IPP_OK_CONFLICT) {
				fputs("ERROR: IPP ERROR\n", stderr);
				goto onErr;
			}
			else {
				pAttribute = ippFirstAttribute(pResponse);

				while (pAttribute != NULL) {
					while (pAttribute != NULL && ippGetGroupTag(pAttribute) != IPP_TAG_PRINTER) {
						pAttribute = ippNextAttribute(pResponse);
					}
					if (pAttribute == NULL) {
						break;
					}
					
					while (pAttribute != NULL && ippGetGroupTag(pAttribute) == IPP_TAG_PRINTER) {
						if (strcmp(ippGetName(pAttribute), "printer-name") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_NAME) {
							pPrinter = ippGetString(pAttribute, 0, NULL);
						}
						if (strcmp(ippGetName(pAttribute), "device-uri") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_URI) {
							pDUri = ippGetString(pAttribute, 0, NULL);
						}
						pAttribute = ippNextAttribute(pResponse);
					}

					if (strcasecmp(pDestName, pPrinter) == 0) {

					}
					
					if (pAttribute != NULL)
						pAttribute = ippNextAttribute(pResponse);
				}
			}

#include <sys/ioctl.h>
#include <net/if.h>
#include <sys/sysctl.h>
#include <sys/types.h>
#include <unistd.h>
#include <config.h>
#include <fcntl.h>

++ b/cnijfilter/src/bjfilter.c

#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <ctype.h>
#include <popt.h>
#include <time.h>
#include <string.h>

Lines 39-44 Link Here

(-)a/cnijfilter/src/bjfimage.c (+2 lines)
39		39
40	#include <stdio.h>	40	#include <stdio.h>
41	#include <stdlib.h>	41	#include <stdlib.h>
		42	#include <unistd.h>
		43	#include <string.h>
42	#include <png.h>	44	#include <png.h>
43		45
44	#include "cpktypes.h"	46	#include "cpktypes.h"

Lines 26-31 Link Here

(-)a/cnijfilter/src/bjfoption.c (+1 lines)
26		26
27	#include <stdio.h>	27	#include <stdio.h>
28	#include <stdlib.h>	28	#include <stdlib.h>
		29	#include <ctype.h>
29	#include <popt.h>	30	#include <popt.h>
30	#include <string.h>	31	#include <string.h>
31		32




	struct sockaddr_un		sun;
	int						s, c;
	char					buf[128];
	socklen_t				adrlen;
	short					ret = RET_ERROR;

	if ((s = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)

	else {
		pRequest = ippNew();
		
		ippSetOperation(pRequest, IPP_GET_PRINTER_ATTRIBUTES);
		ippSetRequestId(pRequest, 1);
		
		pLanguage = bjcupsLangDefault();			// cupsLangDefault() -> bjcupsLangDefault() for cups-1.1.19 
				

		ippAddString(pRequest, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, pURI);

		if ((pResponse = cupsDoRequest(pHTTP, pRequest, "/")) != NULL) {
			if (ippGetStatusCode(pResponse) > IPP_OK_CONFLICT) {
				retVal = ID_ERR_CUPS_API_FAILED;
			}
			else {
				if ((pAttribute = ippFindAttribute(pResponse, "printer-state", IPP_TAG_ENUM)) != NULL) {
					printerState = ippGetInteger(pAttribute, 0);
				}
			}
			

		else {
			pRequest = ippNew();
			
			ippSetOperation(pRequest, IPP_GET_PRINTER_ATTRIBUTES);
			ippSetRequestId(pRequest, 1);
			
			pLanguage = bjcupsLangDefault();		// cupsLangDefault() -> bjcupsLangDefault() for cups-1.1.19
			

			ippAddString(pRequest, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, printerURI);
			
			if ((pResponse = cupsDoRequest(pHTTP, pRequest, "/")) != NULL) {
				if (ippGetStatusCode(pResponse) > IPP_OK_CONFLICT) {
					retVal = ID_ERR_CUPS_API_FAILED;
				}
				else {

					//}
					pAttribute = ippFindAttribute(pResponse, "printer-state-message", IPP_TAG_TEXT);
					if (pAttribute != NULL) {
						strncpy(pStatus, ippGetString(pAttribute, 0, NULL), bufSize);
					}
				}
				ippDelete(pResponse);

			else {
				pRequest = ippNew();
				
				ippSetOperation(pRequest, IPP_CANCEL_JOB);
				ippSetRequestId(pRequest, 1);
				
				pLanguage = bjcupsLangDefault();		// cupsLangDefault() -> bjcupsLangDefault() for cups-1.1.19
				

				ippAddString(pRequest, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name", NULL, cupsUser());
				
				if ((pResponse = cupsDoRequest(pHTTP, pRequest, "/jobs/")) != NULL) {
					if (ippGetStatusCode(pResponse) > IPP_OK_CONFLICT) {
						retVal = ID_ERR_CUPS_API_FAILED;
					}
					ippDelete(pResponse);

	else {
		pRequest = ippNew();
		
		ippSetOperation(pRequest, IPP_GET_JOBS);
		ippSetRequestId(pRequest, 1);
		
		pLanguage = bjcupsLangDefault();	// cupsLangDefault() -> bjcupsLangDefault() for cups-1.1.19
		

		ippAddStrings(pRequest, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "requested-attributes",(int)(sizeof(jobattrs) / sizeof(jobattrs[0])), NULL, jobattrs);
		
		if ((pResponse = cupsDoRequest(pHTTP, pRequest, "/")) != NULL) {
			if (ippGetStatusCode(pResponse) > IPP_OK_CONFLICT) {
				retVal = ID_ERR_CUPS_API_FAILED;
			}
			else {
				pAttribute = ippFirstAttribute(pResponse);

				while (pAttribute != NULL) {
					while (pAttribute != NULL && ippGetGroupTag(pAttribute) != IPP_TAG_PRINTER) {
						pAttribute = ippNextAttribute(pResponse);
					}
					if (pAttribute == NULL) {
						break;
					}
					
					while (pAttribute != NULL && ippGetGroupTag(pAttribute) == IPP_TAG_JOB) {
						if (strcmp(ippGetName(pAttribute), "job-id") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_INTEGER) {
							jobID = ippGetInteger(pAttribute, 0);
						}
						if (strcmp(ippGetName(pAttribute), "job-state") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_ENUM) {
							jobState = (ipp_jstate_t)ippGetInteger(pAttribute, 0);
						}
						if (strcmp(ippGetName(pAttribute), "job-originating-user-name") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_NAME) {
							pJobUserName = ippGetString(pAttribute, 0, NULL);
						}
						pAttribute = ippNextAttribute(pResponse);
					}
					if (jobState == IPP_JOB_PROCESSING) {
						if (pJobUserName != NULL) {

					}

					if (pAttribute != NULL)
						pAttribute = ippNextAttribute(pResponse);
				}
			}
			

	else {
		pRequest = ippNew();
		
		ippSetOperation(pRequest, CUPS_GET_PRINTERS);
		ippSetRequestId(pRequest, 1);
		
		pLanguage = bjcupsLangDefault();	// cupsLangDefault() -> bjcupsLangDefault() for cups-1.1.19
		

		ippAddStrings(pRequest, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "requested-attributes", sizeof(attributes) / sizeof(attributes[0]), NULL, attributes);
		
		if ((pResponse = cupsDoRequest(pHTTP, pRequest, "/")) != NULL) {
			if (ippGetStatusCode(pResponse) > IPP_OK_CONFLICT) {
				retVal = ID_ERR_CUPS_API_FAILED;
			}
			else {
				pAttribute = ippFirstAttribute(pResponse);

				while (pAttribute != NULL) {
					while (pAttribute != NULL && ippGetGroupTag(pAttribute) != IPP_TAG_PRINTER) {
						pAttribute = ippNextAttribute(pResponse);
					}
					if (pAttribute == NULL) {
						break;
					}
					
					while (pAttribute != NULL && ippGetGroupTag(pAttribute) == IPP_TAG_PRINTER) {
						if (strcmp(ippGetName(pAttribute), "printer-name") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_NAME) {
							pPrinter = ippGetString(pAttribute, 0, NULL);
						}
						if (strcmp(ippGetName(pAttribute), "device-uri") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_URI) {
							pURI = ippGetString(pAttribute, 0, NULL);
						}
						pAttribute = ippNextAttribute(pResponse);
					}
					
					// Tora 020418: Compare two printer names ignoring the character case.

					}

					if (pAttribute != NULL)
						pAttribute = ippNextAttribute(pResponse);
				}
			}
			

	else {
		pRequest = ippNew();
		
		ippSetOperation(pRequest, CUPS_GET_PRINTERS);
		ippSetRequestId(pRequest, 1);
		
		pLanguage = bjcupsLangDefault();	// cupsLangDefault() -> bjcupsLangDefault() for cups-1.1.19
		

		ippAddString(pRequest, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, NULL);
		
		if ((pResponse = cupsDoRequest(pHTTP, pRequest, "/")) != NULL) {
			if (ippGetStatusCode(pResponse) > IPP_OK_CONFLICT) {
				retVal = ID_ERR_CUPS_API_FAILED;
			}
			else {
				pAttribute = ippFirstAttribute(pResponse);

				while (pAttribute != NULL) {
					while (pAttribute != NULL && ippGetGroupTag(pAttribute) != IPP_TAG_PRINTER) {
						pAttribute = ippNextAttribute(pResponse);
					}
					if (pAttribute == NULL) {
						break;
					}
					
					while (pAttribute != NULL && ippGetGroupTag(pAttribute) == IPP_TAG_PRINTER) {
						if (strcmp(ippGetName(pAttribute), "printer-name") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_NAME) {
							pPrinter = ippGetString(pAttribute, 0, NULL);
						}
						if (strcmp(ippGetName(pAttribute), "device-uri") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_URI) {
							pDUri = ippGetString(pAttribute, 0, NULL);
						}
						pAttribute = ippNextAttribute(pResponse);
					}

					if (strcasecmp(pDestName, pPrinter) == 0) {

					}
					
					if (pAttribute != NULL)
						pAttribute = ippNextAttribute(pResponse);
				}
			}
			

Lines 36-42 Link Here

(-)cnijfilter-source-3.40-1.orig/backend/configure.in (-1 / +1 lines)
36	AC_FUNC_MALLOC	36	AC_FUNC_MALLOC
37	AC_CHECK_FUNCS([memset socket strdup strrchr])	37	AC_CHECK_FUNCS([memset socket strdup strrchr])
38		38
39	CFLAGS="-O2"	39	CFLAGS="${CFLAGS:=}"
40		40
41	AC_OUTPUT(Makefile	41	AC_OUTPUT(Makefile
42	src/Makefile)	42	src/Makefile)

Lines 7-13 Link Here

(-)cnijfilter-source-3.40-1.orig/backend/src/Makefile.am (-1 / +1 lines)
7		7
8	cnijusb_SOURCES = cnij_backend_common.c cnij_usb.c	8	cnijusb_SOURCES = cnij_backend_common.c cnij_usb.c
9		9
10	CFLAGS = -O2 -Wall	10	cnijusb_CFLAGS = ${CFLAGS:=}
11		11
12	cnijusb_LDADD = -lcups	12	cnijusb_LDADD = -lcups
13		13

Lines 7-13 Link Here

(-)cnijfilter-source-3.40-1.orig/backendnet/backend/Makefile.am (-1 / +1 lines)
7		7
8	cnijnet_SOURCES = cnijnetlm.c cnijnet.c	8	cnijnet_SOURCES = cnijnetlm.c cnijnet.c
9		9
10	CFLAGS = -O2 -Wall -I.	10	cnijnet_CFLAGS = ${CFLAGS:=} -I.
11		11
12	cnijnet_LDADD = -lcups	12	cnijnet_LDADD = -lcups
13		13

Lines 47-53 Link Here

(-)cnijfilter-source-3.40-1.orig/backendnet/configure.in (-1 / +1 lines)
47	AC_FUNC_MALLOC	47	AC_FUNC_MALLOC
48	AC_CHECK_FUNCS([memset socket strdup strrchr])	48	AC_CHECK_FUNCS([memset socket strdup strrchr])
49		49
50	CFLAGS="-O2"	50	CFLAGS="${CFLAGS:=}"
51		51
52	AC_OUTPUT(Makefile	52	AC_OUTPUT(Makefile
53	backend/Makefile	53	backend/Makefile

Lines 6-12 Link Here

(-)cnijfilter-source-3.40-1.orig/backendnet/lmonitor/Makefile.am (-1 / +1 lines)
6		6
7	cnijnetprn_SOURCES = cnijnetchk.c cnijnetprn.c	7	cnijnetprn_SOURCES = cnijnetchk.c cnijnetprn.c
8		8
9	CFLAGS = -O2 -Wall -I. -I./common	9	cnijnetprn_CFLAGS = ${CFLAGS:=} -I. -I./common
10		10
11	cnijnetprn_LDADD = -lcnnet -lc -ldl	11	cnijnetprn_LDADD = -lcnnet -lc -ldl
12	cnijnetprn_LDFLAGS = -L../../com/libs_bin@ARC@	12	cnijnetprn_LDFLAGS = -L../../com/libs_bin@ARC@

Lines 7-11 Link Here

(-)cnijfilter-source-3.40-1.orig/cngpij/cngpij/Makefile.am (-1 / +1 lines)
7	cngpij_LDADD= -lpopt -lcups -lparamlist	7	cngpij_LDADD= -lpopt -lcups -lparamlist
8	cngpij_LDFLAGS = -L../../libs/paramlist	8	cngpij_LDFLAGS = -L../../libs/paramlist
9		9
10	AM_CFLAGS= -O2 -Wall -I../include/cncl -I../include/misc -I../../libs/paramlist	10	AM_CFLAGS= -I../include/cncl -I../include/misc -I../../libs/paramlist
11		11

Lines 41-47 Link Here

(-)cnijfilter-source-3.40-1.orig/cngpij/configure.in (-1 / +1 lines)
41	AC_FUNC_MALLOC	41	AC_FUNC_MALLOC
42	AC_CHECK_FUNCS([memset socket strdup strrchr])	42	AC_CHECK_FUNCS([memset socket strdup strrchr])
43		43
44	CFLAGS="-O2"	44	CFLAGS="${CFLAGS:=}"
45		45
46	AC_OUTPUT(Makefile	46	AC_OUTPUT(Makefile
47	cngpij/Makefile)	47	cngpij/Makefile)

Lines 35-41 Link Here

(-)cnijfilter-source-3.40-1.orig/cngpijmon/cnijnpr/configure.in (-1 / +1 lines)
35	AC_FUNC_MALLOC	35	AC_FUNC_MALLOC
36	AC_CHECK_FUNCS([memset socket strdup strrchr])	36	AC_CHECK_FUNCS([memset socket strdup strrchr])
37		37
38	CFLAGS="-O2"	38	CFLAGS="${CFLAGS:=}"
39		39
40	ARC=`getconf LONG_BIT`	40	ARC=`getconf LONG_BIT`
41	AC_SUBST(ARC)	41	AC_SUBST(ARC)

Lines 58-64 Link Here

(-)cnijfilter-source-3.40-1.orig/cngpijmon/configure.in (-1 / +1 lines)
58	packagesrcdir=`cd $srcdir && pwd`	58	packagesrcdir=`cd $srcdir && pwd`
59	AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}")	59	AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}")
60		60
61	CFLAGS="-O2"	61	CFLAGS="${CFLAGS:=}"
62		62
63	dnl Use -Wall if we have gcc.	63	dnl Use -Wall if we have gcc.
64	changequote(,)dnl	64	changequote(,)dnl

Lines 61-67 Link Here

(-)cnijfilter-source-3.40-1.orig/cnijfilter/configure.in (-1 / +1 lines)
61	AC_TYPE_SIZE_T	61	AC_TYPE_SIZE_T
62		62
63	dnl OPTION	63	dnl OPTION
64	CFLAGS="-O2"	64	CFLAGS="${CFLAGS:=}"
65		65
66	dnl Checks for library functions.	66	dnl Checks for library functions.
67	AC_CHECK_FUNCS(socket)	67	AC_CHECK_FUNCS(socket)

Lines 70-76 Link Here

(-)cnijfilter-source-3.40-1.orig/lgmon/configure.in (-1 / +1 lines)
70	packagesrcdir=`cd $srcdir && pwd`	70	packagesrcdir=`cd $srcdir && pwd`
71	AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}")	71	AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}")
72		72
73	CFLAGS="-O2"	73	CFLAGS="${CFLAGS:=}"
74		74
75	dnl Use -Wall if we have gcc.	75	dnl Use -Wall if we have gcc.
76	changequote(,)dnl	76	changequote(,)dnl

Lines 25-31 Link Here

(-)cnijfilter-source-3.40-1.orig/libs/configure.in (-1 / +1 lines)
25	AC_FUNC_MALLOC	25	AC_FUNC_MALLOC
26	AC_CHECK_FUNCS([dup2 memset])	26	AC_CHECK_FUNCS([dup2 memset])
27		27
28	CFLAGS="-O2"	28	CFLAGS="${CFLAGS:=}"
29		29
30	AC_OUTPUT(Makefile	30	AC_OUTPUT(Makefile
31	buftool/Makefile	31	buftool/Makefile

Lines 3-6 Link Here

(-)cnijfilter-source-3.40-1.orig/libs/paramlist/Makefile.am (-1 / +1 lines)
3	libparamlist_la_SOURCES = \	3	libparamlist_la_SOURCES = \
4	paramlist.c paramlist.h	4	paramlist.c paramlist.h
5		5
6	AM_CFLAGS= -O2 -Wall	6	AM_CFLAGS=

Lines 81-86 Link Here

(-)cnijfilter-source-3.40-1.orig/printui/configure.in (-3 / +2 lines)
81	packagesrcdir=`cd $srcdir && pwd`	81	packagesrcdir=`cd $srcdir && pwd`
82	AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}")	82	AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}")
83		83
		84	CFLAGS="${CFLAGS:=}"
		85
84	dnl Use -Wall if we have gcc.	86	dnl Use -Wall if we have gcc.
85	changequote(,)dnl	87	changequote(,)dnl
86	if test "x$GCC" = "xyes"; then	88	if test "x$GCC" = "xyes"; then
Lines 91-99 Link Here
91	fi	93	fi
92	changequote([,])dnl	94	changequote([,])dnl
93		95
94	CFLAGS="-O2 -Wall"
95
96
97	XML2_CFLAGS=`xml2-config --cflags`	96	XML2_CFLAGS=`xml2-config --cflags`
98	AC_SUBST(XML2_CFLAGS)	97	AC_SUBST(XML2_CFLAGS)
99		98

Lines 49-55 Link Here

(-)cnijfilter-source-3.40-1.orig/printui/src/Makefile.am (-1 / +1 lines)
49		49
50	#CFLAGS = -O2 -Wall	50	#CFLAGS = -O2 -Wall
51	#printui_CFLAGS = -O2 -Wall	51	#printui_CFLAGS = -O2 -Wall
52	printui_CFLAGS = -O2 -Wall @UI_DFLAGS@	52	printui_CFLAGS = ${CFLAGS:=} @UI_DFLAGS@
53		53
54	#printui_LDADD = @GTK_LIBS@ -lxml -lpopt \	54	#printui_LDADD = @GTK_LIBS@ -lxml -lpopt \
55	# -lcnbpcnclui@CNCL_LIB_ID@ -lcnbpcmcm@CNCL_LIB_ID@	55	# -lcnbpcnclui@CNCL_LIB_ID@ -lcnbpcmcm@CNCL_LIB_ID@

Lines 43-49 Link Here

(-)cnijfilter-source-3.40-1.orig/pstocanonij/configure.in (-1 / +1 lines)
43	AC_FUNC_MALLOC	43	AC_FUNC_MALLOC
44	AC_CHECK_FUNCS([dup2 memset socket strdup strrchr])	44	AC_CHECK_FUNCS([dup2 memset socket strdup strrchr])
45		45
46	CFLAGS="-O2"	46	CFLAGS="${CFLAGS:=}"
47		47
48	AC_OUTPUT(Makefile	48	AC_OUTPUT(Makefile
49	filter/Makefile	49	filter/Makefile

Lines 10-14 Link Here

(-)cnijfilter-source-3.40-1.orig/pstocanonij/filter/Makefile.am (-1 / +1 lines)
10	pstocanonij_LDADD= -lcups ../../libs/buftool/libbuftool.a	10	pstocanonij_LDADD= -lcups ../../libs/buftool/libbuftool.a
11	pstocanonij_LDFLAGS = -L../../libs/buftool	11	pstocanonij_LDFLAGS = -L../../libs/buftool
12		12
13	AM_CFLAGS= -O2 -Wall -I../../libs/buftool	13	AM_CFLAGS= -I../../libs/buftool
14		14




PRIVATE GladeXML	*gXmlMainWnd = NULL;		// Pointer to glade xml of main window.
#else
PRIVATE GtkWidget	*gMainWnd = NULL;			// Pointer to main window. ver.2.50
GtkWidget* create_mainWindow (void);
#endif

PRIVATE const gchar	*gSTSMessageTable[] = {
++ new/printui/Makefile.am    2011-04-15 09:38:44.724000084 -0400

         done \
       fi

ACLOCAL_AMFLAGS = -I m4

EXTRA_DIST = mkinstalldirs  config.rpath

}

/* Ver.2.90 */
static short CofirmSpinValue(GtkSpinButton* spinbutton )
{
	short	result = 0;


Lines 32-37 Link Here

(-)printui/src/comdb.h.Orig (+2 lines)
32	int ModelNameToID(char* model_name);	32	int ModelNameToID(char* model_name);
33	char* GetModelName();	33	char* GetModelName();
34	char* GetDispModelName();	34	char* GetDispModelName();
		35	gboolean IsAvailableBlackAdjustment();
		36	gboolean IsAvailableBlackAdjustmentMode();
35	gboolean IsAvailableBorderless();	37	gboolean IsAvailableBorderless();
36	gboolean IsAvailableVivid();	38	gboolean IsAvailableVivid();
37	gboolean IsAvailableDuplex();	39	gboolean IsAvailableDuplex();

Lines 225-231 Link Here

(-)printui/src/uimain.c.Orig (-1 / +1 lines)
225	}	225	}
226		226
227	static	227	static
228	void ShowPaperGapCombo(main_window)	228	void ShowPaperGapCombo(UIMainDialog* main_window)
229	{	229	{
230	int show_lever_box = FALSE;	230	int show_lever_box = FALSE;
231		231

Return to bug 632444

Lines 38-43 Link Here

(-)backend/src/cnij_backend_common.c (-4 / +9 lines)
38	// CUPS Header	38	// CUPS Header
39	#include <cups/cups.h>	39	#include <cups/cups.h>
40	#include <cups/ipp.h>	40	#include <cups/ipp.h>
		41	#include <cups/ppd.h>
41		42
42	// Header file for CANON	43	// Header file for CANON
43	#include "cnij_backend_common.h"	44	#include "cnij_backend_common.h"
Lines 945-952 Link Here
945	short tmpformat;	945	short tmpformat;
946	short retbyte = 0;	946	short retbyte = 0;
947	short bpp = 3;	947	short bpp = 3;
948	long width = 0;	948	png_uint_32 width = 0;
949	long length = 0;	949	png_uint_32 length = 0;
950	long maxvalue = 0;	950	long maxvalue = 0;
951	long rstep = 0;	951	long rstep = 0;
952	long RasterLength = 0;	952	long RasterLength = 0;
Lines 1574-1580 Link Here
1574	goto onErr;	1574	goto onErr;
1575	}	1575	}
1576		1576
1577	if (setjmp (png_p->jmpbuf))	1577	if (setjmp (png_jmpbuf(png_p)))
1578	{	1578	{
1579	png_destroy_read_struct(&png_p, &info_p, (png_infopp)NULL);	1579	png_destroy_read_struct(&png_p, &info_p, (png_infopp)NULL);
1580	goto onErr;	1580	goto onErr;
Lines 19-25 Link Here
19	AC_DEFINE_UNQUOTED(BJLIB_PATH, "$enable_libpath")	19	AC_DEFINE_UNQUOTED(BJLIB_PATH, "$enable_libpath")
20	AC_SUBST(BJLIB_PATH)	20	AC_SUBST(BJLIB_PATH)
21		21
22	ARC=`getconf LONG_BIT`	22	case "$ABI" in
		23	x86) ARC=32;;
		24	amd64) ARC=64;;
		25	*) ARC=`getconf LONG_BIT`;;
		26	esac
23	AC_SUBST(ARC)	27	AC_SUBST(ARC)
24		28
25	# Checks for programs.	29	# Checks for programs.

Lines 1-6 Link Here

(-)a/backendnet/backend/Makefile.am (-16 / +20 lines)
1	## Process this file with automake to produce Makefile.in	1	## Process this file with automake to produce Makefile.in
2		2
3	backendnet_bindir = /usr/lib/cups/backend	3	backendnet_bindir = /usr/libexec/cups/backend
4	backendnet_bin_PROGRAMS = cnijnet	4	backendnet_bin_PROGRAMS = cnijnet
5	transform =	5	transform =
6		6
Lines 5-11 Link Here
5	cnijnpr_SOURCES=\	5	cnijnpr_SOURCES=\
6	cnijnpr.c	6	cnijnpr.c
7		7
8	cnijnpr_LDADD = -lcnnet -lbscc2sts	8	cnijnpr_LDADD = -lcnnet -lbscc2sts -ldl
9	cnijnpr_LDFLAGS = -L../../../com/libs_bin@ARC@ -L../../../lgmon/src	9	cnijnpr_LDFLAGS = -L../../../com/libs_bin@ARC@ -L../../../lgmon/src
10		10
11	#AM_CFLAGS= -O2 -Wall	11	#AM_CFLAGS= -O2 -Wall
		12	++ a/cngpij/cngpij/bjcups.c
Lines 698-705 Link Here
698	else {	719	else {
699	pRequest = ippNew();	720	pRequest = ippNew();
700		721
701	pRequest->request.op.operation_id = CUPS_GET_PRINTERS;	722	ippSetOperation(pRequest, CUPS_GET_PRINTERS);
702	pRequest->request.op.request_id = 1;	723	ippSetRequestId(pRequest, 1);
703		724
704	pLanguage = bjcupsLangDefault(); // cupsLangDefault() -> bjcupsLangDefault() for cups-1.1.19	725	pLanguage = bjcupsLangDefault(); // cupsLangDefault() -> bjcupsLangDefault() for cups-1.1.19
705		726
Lines 708-736 Link Here
708	ippAddString(pRequest, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, NULL);	729	ippAddString(pRequest, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, NULL);
709		730
710	if ((pResponse = cupsDoRequest(pHTTP, pRequest, "/")) != NULL) {	731	if ((pResponse = cupsDoRequest(pHTTP, pRequest, "/")) != NULL) {
711	if (pResponse->request.status.status_code > IPP_OK_CONFLICT) {	732	if (ippGetStatusCode(pResponse) > IPP_OK_CONFLICT) {
712	fputs("ERROR: IPP ERROR\n", stderr);	733	fputs("ERROR: IPP ERROR\n", stderr);
713	goto onErr;	734	goto onErr;
714	}	735	}
715	else {	736	else {
716	pAttribute = pResponse->attrs;	737	pAttribute = ippFirstAttribute(pResponse);
717		738
718	while (pAttribute != NULL) {	739	while (pAttribute != NULL) {
719	while (pAttribute != NULL && pAttribute->group_tag != IPP_TAG_PRINTER) {	740	while (pAttribute != NULL && ippGetGroupTag(pAttribute) != IPP_TAG_PRINTER) {
720	pAttribute = pAttribute->next;	741	pAttribute = ippNextAttribute(pResponse);
721	}	742	}
722	if (pAttribute == NULL) {	743	if (pAttribute == NULL) {
723	break;	744	break;
724	}	745	}
725		746
726	while (pAttribute != NULL && pAttribute->group_tag == IPP_TAG_PRINTER) {	747	while (pAttribute != NULL && ippGetGroupTag(pAttribute) == IPP_TAG_PRINTER) {
727	if (strcmp(pAttribute->name, "printer-name") == 0 && pAttribute->value_tag == IPP_TAG_NAME) {	748	if (strcmp(ippGetName(pAttribute), "printer-name") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_NAME) {
728	pPrinter = pAttribute->values[0].string.text;	749	pPrinter = ippGetString(pAttribute, 0, NULL);
729	}	750	}
730	if (strcmp(pAttribute->name, "device-uri") == 0 && pAttribute->value_tag == IPP_TAG_URI) {	751	if (strcmp(ippGetName(pAttribute), "device-uri") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_URI) {
731	pDUri = pAttribute->values[0].string.text;	752	pDUri = ippGetString(pAttribute, 0, NULL);
732	}	753	}
733	pAttribute = pAttribute->next;	754	pAttribute = ippNextAttribute(pResponse);
734	}	755	}
735		756
736	if (strcasecmp(pDestName, pPrinter) == 0) {	757	if (strcasecmp(pDestName, pPrinter) == 0) {
Lines 739-745 Link Here
739	}	760	}
740		761
741	if (pAttribute != NULL)	762	if (pAttribute != NULL)
742	pAttribute = pAttribute->next;	763	pAttribute = ippNextAttribute(pResponse);
743	}	764	}
744	}	765	}
Lines 34-39 Link Here
34	#include <sys/ioctl.h>	34	#include <sys/ioctl.h>
35	#include <net/if.h>	35	#include <net/if.h>
36	#include <sys/sysctl.h>	36	#include <sys/sysctl.h>
		37	#include <sys/types.h>
		38	#include <unistd.h>
37	#include <config.h>	39	#include <config.h>
38	#include <fcntl.h>	40	#include <fcntl.h>
39		41
40	-- a/cnijfilter/src/bjfilter.c	42	++ b/cnijfilter/src/bjfilter.c
Lines 26-31 Link Here
26	#include <stdio.h>	26	#include <stdio.h>
27	#include <stdlib.h>	27	#include <stdlib.h>
28	#include <unistd.h>	28	#include <unistd.h>
		29	#include <ctype.h>
29	#include <popt.h>	30	#include <popt.h>
30	#include <time.h>	31	#include <time.h>
31	#include <string.h>	32	#include <string.h>

Lines 84-89 typedef struct BJF_MARGIN_INFO /* borderless information */ Link Here

(-)a/cnijfilter/src/bjfpos.h (+2 lines)
84	extern void bjf_pos_img_init( LPBJF_POS_IMGINFO lpimginfo );	84	extern void bjf_pos_img_init( LPBJF_POS_IMGINFO lpimginfo );
85	extern void bjf_pos_prn_init( LPBJF_POS_PRNINFO lpprninfo );	85	extern void bjf_pos_prn_init( LPBJF_POS_PRNINFO lpprninfo );
86	extern void bjf_pos_init( LPBJF_POSINFO lpposinfo );	86	extern void bjf_pos_init( LPBJF_POSINFO lpposinfo );
		87	extern void bjf_margin_init( LPBJF_MARGIN_INFO );
87	extern short bjf_pos_imageresolution( LPBJF_POS_IMGINFO, LPBJF_POS_PRNINFO, LPBJF_POSINFO );	88	extern short bjf_pos_imageresolution( LPBJF_POS_IMGINFO, LPBJF_POS_PRNINFO, LPBJF_POSINFO );
88	extern short bjf_pos_imageresolution_fit( LPBJF_POS_IMGINFO, LPBJF_POS_PRNINFO, LPBJF_POSINFO );	89	extern short bjf_pos_imageresolution_fit( LPBJF_POS_IMGINFO, LPBJF_POS_PRNINFO, LPBJF_POSINFO );
89	extern short bjf_pos_imageresolution_center( LPBJF_POS_IMGINFO, LPBJF_POS_PRNINFO, LPBJF_POSINFO );	90	extern short bjf_pos_imageresolution_center( LPBJF_POS_IMGINFO, LPBJF_POS_PRNINFO, LPBJF_POSINFO );
Lines 120-125 extern short ImageScaling(LPBJF_POS_PRNINFO, LPBJF_POSINFO,short); Link Here
120	extern short ImageCenter( LPBJF_POS_IMGINFO, LPBJF_POS_PRNINFO, LPBJF_POSINFO, LPBJF_MARGIN_INFO );	121	extern short ImageCenter( LPBJF_POS_IMGINFO, LPBJF_POS_PRNINFO, LPBJF_POSINFO, LPBJF_MARGIN_INFO );
121	extern short ImageCut( LPBJF_POS_IMGINFO, LPBJF_POS_PRNINFO, LPBJF_POSINFO, LPBJF_MARGIN_INFO );	122	extern short ImageCut( LPBJF_POS_IMGINFO, LPBJF_POS_PRNINFO, LPBJF_POSINFO, LPBJF_MARGIN_INFO );
122	extern short MarginInit(LPBJF_POS_PRNINFO, LPBJF_POSINFO, LPBJF_MARGIN_INFO);	123	extern short MarginInit(LPBJF_POS_PRNINFO, LPBJF_POSINFO, LPBJF_MARGIN_INFO);
		124	extern short SetExtLevel( LPBJF_MARGIN_INFO, short);
123	extern short SetExtMargin(LPBJF_POS_PRNINFO, LPBJF_POSINFO, LPBJF_MARGIN_INFO, LPBJFLTOVERMARGININFO);	125	extern short SetExtMargin(LPBJF_POS_PRNINFO, LPBJF_POSINFO, LPBJF_MARGIN_INFO, LPBJFLTOVERMARGININFO);
124	extern short SetBbox(LPBJF_OPTINFO , LPBJF_POS_IMGINFO , LPBJF_POSINFO , LPBJF_MARGIN_INFO , int , int);	126	extern short SetBbox(LPBJF_OPTINFO , LPBJF_POS_IMGINFO , LPBJF_POSINFO , LPBJF_MARGIN_INFO , int , int);
125	short bjf_pos_set_paperwidth( LPBJF_MARGIN_INFO , long );	127	short bjf_pos_set_paperwidth( LPBJF_MARGIN_INFO , long );

Lines 43-49 short GetIPCData(LPIPCU pipc, char *sname) Link Here

(-)a/cnijfilter/src/getipc.c (-53 / +53 lines)
43	struct sockaddr_un sun;	43	struct sockaddr_un sun;
44	int s, c;	44	int s, c;
45	char buf[128];	45	char buf[128];
46	size_t adrlen;	46	socklen_t adrlen;
47	short ret = RET_ERROR;	47	short ret = RET_ERROR;
48		48
49	if ((s = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)	49	if ((s = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)
Lines 214-221 Link Here
214	else {	215	else {
215	pRequest = ippNew();	216	pRequest = ippNew();
216		217
217	pRequest->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;	218	ippSetOperation(pRequest, IPP_GET_PRINTER_ATTRIBUTES);
218	pRequest->request.op.request_id = 1;	219	ippSetRequestId(pRequest, 1);
219		220
220	pLanguage = bjcupsLangDefault(); // cupsLangDefault() -> bjcupsLangDefault() for cups-1.1.19	221	pLanguage = bjcupsLangDefault(); // cupsLangDefault() -> bjcupsLangDefault() for cups-1.1.19
221		222
Lines 224-235 Link Here
224	ippAddString(pRequest, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, pURI);	225	ippAddString(pRequest, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, pURI);
225		226
226	if ((pResponse = cupsDoRequest(pHTTP, pRequest, "/")) != NULL) {	227	if ((pResponse = cupsDoRequest(pHTTP, pRequest, "/")) != NULL) {
227	if (pResponse->request.status.status_code > IPP_OK_CONFLICT) {	228	if (ippGetStatusCode(pResponse) > IPP_OK_CONFLICT) {
228	retVal = ID_ERR_CUPS_API_FAILED;	229	retVal = ID_ERR_CUPS_API_FAILED;
229	}	230	}
230	else {	231	else {
231	if ((pAttribute = ippFindAttribute(pResponse, "printer-state", IPP_TAG_ENUM)) != NULL) {	232	if ((pAttribute = ippFindAttribute(pResponse, "printer-state", IPP_TAG_ENUM)) != NULL) {
232	printerState = (ipp_state_t)pAttribute->values[0].integer;	233	printerState = ippGetInteger(pAttribute, 0);
233	}	234	}
234	}	235	}
235		236
Lines 287-294 Link Here
287	else {	288	else {
288	pRequest = ippNew();	289	pRequest = ippNew();
289		290
290	pRequest->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;	291	ippSetOperation(pRequest, IPP_GET_PRINTER_ATTRIBUTES);
291	pRequest->request.op.request_id = 1;	292	ippSetRequestId(pRequest, 1);
292		293
293	pLanguage = bjcupsLangDefault(); // cupsLangDefault() -> bjcupsLangDefault() for cups-1.1.19	294	pLanguage = bjcupsLangDefault(); // cupsLangDefault() -> bjcupsLangDefault() for cups-1.1.19
294		295
Lines 297-303 Link Here
297	ippAddString(pRequest, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, printerURI);	298	ippAddString(pRequest, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, printerURI);
298		299
299	if ((pResponse = cupsDoRequest(pHTTP, pRequest, "/")) != NULL) {	300	if ((pResponse = cupsDoRequest(pHTTP, pRequest, "/")) != NULL) {
300	if (pResponse->request.status.status_code > IPP_OK_CONFLICT) {	301	if (ippGetStatusCode(pResponse) > IPP_OK_CONFLICT) {
301	retVal = ID_ERR_CUPS_API_FAILED;	302	retVal = ID_ERR_CUPS_API_FAILED;
302	}	303	}
303	else {	304	else {
Lines 309-315 Link Here
309	//}	310	//}
310	pAttribute = ippFindAttribute(pResponse, "printer-state-message", IPP_TAG_TEXT);	311	pAttribute = ippFindAttribute(pResponse, "printer-state-message", IPP_TAG_TEXT);
311	if (pAttribute != NULL) {	312	if (pAttribute != NULL) {
312	strncpy(pStatus, pAttribute->values[0].string.text, bufSize);	313	strncpy(pStatus, ippGetString(pAttribute, 0, NULL), bufSize);
313	}	314	}
314	}	315	}
315	ippDelete(pResponse);	316	ippDelete(pResponse);
Lines 368-375 Link Here
368	else {	369	else {
369	pRequest = ippNew();	370	pRequest = ippNew();
370		371
371	pRequest->request.op.operation_id = IPP_CANCEL_JOB;	372	ippSetOperation(pRequest, IPP_CANCEL_JOB);
372	pRequest->request.op.request_id = 1;	373	ippSetRequestId(pRequest, 1);
373		374
374	pLanguage = bjcupsLangDefault(); // cupsLangDefault() -> bjcupsLangDefault() for cups-1.1.19	375	pLanguage = bjcupsLangDefault(); // cupsLangDefault() -> bjcupsLangDefault() for cups-1.1.19
375		376
Lines 380-386 Link Here
380	ippAddString(pRequest, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name", NULL, cupsUser());	381	ippAddString(pRequest, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name", NULL, cupsUser());
381		382
382	if ((pResponse = cupsDoRequest(pHTTP, pRequest, "/jobs/")) != NULL) {	383	if ((pResponse = cupsDoRequest(pHTTP, pRequest, "/jobs/")) != NULL) {
383	if (pResponse->request.status.status_code > IPP_OK_CONFLICT) {	384	if (ippGetStatusCode(pResponse) > IPP_OK_CONFLICT) {
384	retVal = ID_ERR_CUPS_API_FAILED;	385	retVal = ID_ERR_CUPS_API_FAILED;
385	}	386	}
386	ippDelete(pResponse);	387	ippDelete(pResponse);
Lines 443-450 Link Here
443	else {	444	else {
444	pRequest = ippNew();	445	pRequest = ippNew();
445		446
446	pRequest->request.op.operation_id = IPP_GET_JOBS;	447	ippSetOperation(pRequest, IPP_GET_JOBS);
447	pRequest->request.op.request_id = 1;	448	ippSetRequestId(pRequest, 1);
448		449
449	pLanguage = bjcupsLangDefault(); // cupsLangDefault() -> bjcupsLangDefault() for cups-1.1.19	450	pLanguage = bjcupsLangDefault(); // cupsLangDefault() -> bjcupsLangDefault() for cups-1.1.19
450		451
Lines 455-485 Link Here
455	ippAddStrings(pRequest, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "requested-attributes",(int)(sizeof(jobattrs) / sizeof(jobattrs[0])), NULL, jobattrs);	456	ippAddStrings(pRequest, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "requested-attributes",(int)(sizeof(jobattrs) / sizeof(jobattrs[0])), NULL, jobattrs);
456		457
457	if ((pResponse = cupsDoRequest(pHTTP, pRequest, "/")) != NULL) {	458	if ((pResponse = cupsDoRequest(pHTTP, pRequest, "/")) != NULL) {
458	if (pResponse->request.status.status_code > IPP_OK_CONFLICT) {	459	if (ippGetStatusCode(pResponse) > IPP_OK_CONFLICT) {
459	retVal = ID_ERR_CUPS_API_FAILED;	460	retVal = ID_ERR_CUPS_API_FAILED;
460	}	461	}
461	else {	462	else {
462	pAttribute = pResponse->attrs;	463	pAttribute = ippFirstAttribute(pResponse);
463		464
464	while (pAttribute != NULL) {	465	while (pAttribute != NULL) {
465	while (pAttribute != NULL && pAttribute->group_tag != IPP_TAG_JOB) {	466	while (pAttribute != NULL && ippGetGroupTag(pAttribute) != IPP_TAG_PRINTER) {
466	pAttribute = pAttribute->next;	467	pAttribute = ippNextAttribute(pResponse);
467	}	468	}
468	if (pAttribute == NULL) {	469	if (pAttribute == NULL) {
469	break;	470	break;
470	}	471	}
471		472
472	while (pAttribute != NULL && pAttribute->group_tag == IPP_TAG_JOB) {	473	while (pAttribute != NULL && ippGetGroupTag(pAttribute) == IPP_TAG_JOB) {
473	if (strcmp(pAttribute->name, "job-id") == 0 && pAttribute->value_tag == IPP_TAG_INTEGER) {	474	if (strcmp(ippGetName(pAttribute), "job-id") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_INTEGER) {
474	jobID = pAttribute->values[0].integer;	475	jobID = ippGetInteger(pAttribute, 0);
475	}	476	}
476	if (strcmp(pAttribute->name, "job-state") == 0 && pAttribute->value_tag == IPP_TAG_ENUM) {	477	if (strcmp(ippGetName(pAttribute), "job-state") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_ENUM) {
477	jobState = (ipp_jstate_t)pAttribute->values[0].integer;	478	jobState = (ipp_jstate_t)ippGetInteger(pAttribute, 0);
478	}	479	}
479	if (strcmp(pAttribute->name, "job-originating-user-name") == 0 && pAttribute->value_tag == IPP_TAG_NAME) {	480	if (strcmp(ippGetName(pAttribute), "job-originating-user-name") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_NAME) {
480	pJobUserName = pAttribute->values[0].string.text;	481	pJobUserName = ippGetString(pAttribute, 0, NULL);
481	}	482	}
482	pAttribute = pAttribute->next;	483	pAttribute = ippNextAttribute(pResponse);
483	}	484	}
484	if (jobState == IPP_JOB_PROCESSING) {	485	if (jobState == IPP_JOB_PROCESSING) {
485	if (pJobUserName != NULL) {	486	if (pJobUserName != NULL) {
Lines 496-502 Link Here
496	}	497	}
497		498
498	if (pAttribute != NULL)	499	if (pAttribute != NULL)
499	pAttribute = pAttribute->next;	500	pAttribute = ippNextAttribute(pResponse);
500	}	501	}
501	}	502	}
502		503
Lines 554-561 Link Here
554	else {	555	else {
555	pRequest = ippNew();	556	pRequest = ippNew();
556		557
557	pRequest->request.op.operation_id = CUPS_GET_PRINTERS;	558	ippSetOperation(pRequest, CUPS_GET_PRINTERS);
558	pRequest->request.op.request_id = 1;	559	ippSetRequestId(pRequest, 1);
559		560
560	pLanguage = bjcupsLangDefault(); // cupsLangDefault() -> bjcupsLangDefault() for cups-1.1.19	561	pLanguage = bjcupsLangDefault(); // cupsLangDefault() -> bjcupsLangDefault() for cups-1.1.19
561		562
Lines 564-591 Link Here
564	ippAddStrings(pRequest, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "requested-attributes", sizeof(attributes) / sizeof(attributes[0]), NULL, attributes);	565	ippAddStrings(pRequest, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "requested-attributes", sizeof(attributes) / sizeof(attributes[0]), NULL, attributes);
565		566
566	if ((pResponse = cupsDoRequest(pHTTP, pRequest, "/")) != NULL) {	567	if ((pResponse = cupsDoRequest(pHTTP, pRequest, "/")) != NULL) {
567	if (pResponse->request.status.status_code > IPP_OK_CONFLICT) {	568	if (ippGetStatusCode(pResponse) > IPP_OK_CONFLICT) {
568	retVal = ID_ERR_CUPS_API_FAILED;	569	retVal = ID_ERR_CUPS_API_FAILED;
569	}	570	}
570	else {	571	else {
571	pAttribute = pResponse->attrs;	572	pAttribute = ippFirstAttribute(pResponse);
572		573
573	while (pAttribute != NULL) {	574	while (pAttribute != NULL) {
574	while (pAttribute != NULL && pAttribute->group_tag != IPP_TAG_PRINTER) {	575	while (pAttribute != NULL && ippGetGroupTag(pAttribute) != IPP_TAG_PRINTER) {
575	pAttribute = pAttribute->next;	576	pAttribute = ippNextAttribute(pResponse);
576	}	577	}
577	if (pAttribute == NULL) {	578	if (pAttribute == NULL) {
578	break;	579	break;
579	}	580	}
580		581
581	while (pAttribute != NULL && pAttribute->group_tag == IPP_TAG_PRINTER) {	582	while (pAttribute != NULL && ippGetGroupTag(pAttribute) == IPP_TAG_PRINTER) {
582	if (strcmp(pAttribute->name, "printer-name") == 0 && pAttribute->value_tag == IPP_TAG_NAME) {	583	if (strcmp(ippGetName(pAttribute), "printer-name") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_NAME) {
583	pPrinter = pAttribute->values[0].string.text;	584	pPrinter = ippGetString(pAttribute, 0, NULL);
584	}	585	}
585	if (strcmp(pAttribute->name, "printer-uri-supported") == 0 && pAttribute->value_tag == IPP_TAG_URI) {	586	if (strcmp(ippGetName(pAttribute), "device-uri") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_URI) {
586	pUri = pAttribute->values[0].string.text;	587	pURI = ippGetString(pAttribute, 0, NULL);
587	}	588	}
588	pAttribute = pAttribute->next;	589	pAttribute = ippNextAttribute(pResponse);
589	}	590	}
590		591
591	// Tora 020418: Compare two printer names ignoring the character case.	592	// Tora 020418: Compare two printer names ignoring the character case.
Lines 602-608 Link Here
602	}	603	}
603		604
604	if (pAttribute != NULL)	605	if (pAttribute != NULL)
605	pAttribute = pAttribute->next;	606	pAttribute = ippNextAttribute(pResponse);
606	}	607	}
607	}	608	}
608		609
Lines 657-664 Link Here
657	else {	658	else {
658	pRequest = ippNew();	659	pRequest = ippNew();
659		660
660	pRequest->request.op.operation_id = CUPS_GET_PRINTERS;	661	ippSetOperation(pRequest, CUPS_GET_PRINTERS);
661	pRequest->request.op.request_id = 1;	662	ippSetRequestId(pRequest, 1);
662		663
663	pLanguage = bjcupsLangDefault(); // cupsLangDefault() -> bjcupsLangDefault() for cups-1.1.19	664	pLanguage = bjcupsLangDefault(); // cupsLangDefault() -> bjcupsLangDefault() for cups-1.1.19
664		665
Lines 667-694 Link Here
667	ippAddString(pRequest, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, NULL);	668	ippAddString(pRequest, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, NULL);
668		669
669	if ((pResponse = cupsDoRequest(pHTTP, pRequest, "/")) != NULL) {	670	if ((pResponse = cupsDoRequest(pHTTP, pRequest, "/")) != NULL) {
670	if (pResponse->request.status.status_code > IPP_OK_CONFLICT) {	671	if (ippGetStatusCode(pResponse) > IPP_OK_CONFLICT) {
671	retVal = ID_ERR_CUPS_API_FAILED;	672	retVal = ID_ERR_CUPS_API_FAILED;
672	}	673	}
673	else {	674	else {
674	pAttribute = pResponse->attrs;	675	pAttribute = ippFirstAttribute(pResponse);
675		676
676	while (pAttribute != NULL) {	677	while (pAttribute != NULL) {
677	while (pAttribute != NULL && pAttribute->group_tag != IPP_TAG_PRINTER) {	678	while (pAttribute != NULL && ippGetGroupTag(pAttribute) != IPP_TAG_PRINTER) {
678	pAttribute = pAttribute->next;	679	pAttribute = ippNextAttribute(pResponse);
679	}	680	}
680	if (pAttribute == NULL) {	681	if (pAttribute == NULL) {
681	break;	682	break;
682	}	683	}
683		684
684	while (pAttribute != NULL && pAttribute->group_tag == IPP_TAG_PRINTER) {	685	while (pAttribute != NULL && ippGetGroupTag(pAttribute) == IPP_TAG_PRINTER) {
685	if (strcmp(pAttribute->name, "printer-name") == 0 && pAttribute->value_tag == IPP_TAG_NAME) {	686	if (strcmp(ippGetName(pAttribute), "printer-name") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_NAME) {
686	pPrinter = pAttribute->values[0].string.text;	687	pPrinter = ippGetString(pAttribute, 0, NULL);
687	}	688	}
688	if (strcmp(pAttribute->name, "device-uri") == 0 && pAttribute->value_tag == IPP_TAG_URI) {	689	if (strcmp(ippGetName(pAttribute), "device-uri") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_URI) {
689	pDUri = pAttribute->values[0].string.text;	690	pDUri = ippGetString(pAttribute, 0, NULL);
690	}	691	}
691	pAttribute = pAttribute->next;	692	pAttribute = ippNextAttribute(pResponse);
692	}	693	}
693		694
694	if (strcasecmp(pDestName, pPrinter) == 0) {	695	if (strcasecmp(pDestName, pPrinter) == 0) {
Lines 697-703 Link Here
697	}	698	}
698		699
699	if (pAttribute != NULL)	700	if (pAttribute != NULL)
700	pAttribute = pAttribute->next;	701	pAttribute = ippNextAttribute(pResponse);
701	}	702	}
702	}	703	}
703		704

Lines 35-40 Link Here

(-)old/cngpijmon/src/bjcupsmon_ui.c (-4 / +3 lines)
35	PRIVATE GladeXML *gXmlMainWnd = NULL; // Pointer to glade xml of main window.	35	PRIVATE GladeXML *gXmlMainWnd = NULL; // Pointer to glade xml of main window.
36	#else	36	#else
37	PRIVATE GtkWidget *gMainWnd = NULL; // Pointer to main window. ver.2.50	37	PRIVATE GtkWidget *gMainWnd = NULL; // Pointer to main window. ver.2.50
		38	GtkWidget* create_mainWindow (void);
38	#endif	39	#endif
39		40
40	PRIVATE const gchar *gSTSMessageTable[] = {	41	PRIVATE const gchar *gSTSMessageTable[] = {
41	-- old/printui/Makefile.am 2009-10-05 04:44:03.000000000 -0400	42	++ new/printui/Makefile.am 2011-04-15 09:38:44.724000084 -0400
Lines 71-76 Link Here
71	done \	71	done \
72	fi	72	fi
73		73
74	ACLOCAL_AMFLAGS = -I m4
75
76	EXTRA_DIST = mkinstalldirs config.rpath	74	EXTRA_DIST = mkinstalldirs config.rpath
Lines 165-171 Link Here
165	}	165	}
166		166
167	/* Ver.2.90 */	167	/* Ver.2.90 */
168	static short CofirmSpinValue( spinbutton )	168	static short CofirmSpinValue(GtkSpinButton* spinbutton )
169	{	169	{
170	short result = 0;	170	short result = 0;
171		171