File cups-1.2.patch of Package libgnomecups

Overview Repositories Revisions Requests Users Attributes Meta

File cups-1.2.patch of Package libgnomecups (Revision 6968da4493be455514d0b00b6f15df94)

Currently displaying revision 6968da4493be455514d0b00b6f15df94 , Show latest

--- libgnomecups/gnome-cups-request.c	2005-03-28 17:43:06.000000000 +0200
+++ libgnomecups/gnome-cups-request.c.new	2006-11-20 17:10:22.000000000 +0100
@@ -280,7 +280,7 @@ dump_request (ipp_t const *req)
 		g_print ("%s", attr->name);
 		for (i = 0 ; i < attr->num_values ; i++) {
 			g_print ("\t[%d] = ", i);
-			switch (attr->value_tag) {
+			switch (attr->value_tag & ~IPP_TAG_COPY) {
 			case IPP_TAG_INTEGER:
 			case IPP_TAG_ENUM:
 				g_print ("%d\n", attr->values[i].integer);
@@ -298,7 +298,7 @@ dump_request (ipp_t const *req)
 				break;
 
 			case IPP_TAG_BOOLEAN:
-				g_print ("%d\n", (int)attr->values[i].boolean);
+				g_print ("%s\n", (int)attr->values[i].boolean ? "true" : "false");
 				break;
 
 			default:
@@ -396,23 +396,17 @@ _gnome_cups_outstanding_request_count (v
 ipp_t *
 gnome_cups_request_new (int operation_id)
 {
-	ipp_t *request;
 	cups_lang_t *language;
+	ipp_t *request;
 	
-	language = cupsLangDefault ();
-	request = ippNew ();
-	request->request.op.operation_id = operation_id;
-	request->request.op.request_id = 1;
-	
-	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-		     "attributes-charset", 
-		     NULL, "utf-8");
+	request = ippNewRequest (operation_id);
 	
-	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-		     "attributes-natural-language", 
-		     NULL, language->language);
+	language = cupsLangDefault ();
+	ippAddString (request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+		      "attributes-natural-language", 
+		      NULL, language->language);
 	cupsLangFree (language);
-
+	
 	return request;
 }
 
@@ -469,18 +463,10 @@ gnome_cups_request_add_requested_attribu
 					     int n_attributes,
 					     char **attributes)
 {
-	ipp_attribute_t *attr;
-	int i;
-	
-	attr = ippAddStrings (request, 
-			      group,
-			      IPP_TAG_KEYWORD,
-			      "requested-attributes",
-			      n_attributes, NULL, NULL);
-
-	for (i = 0; i < n_attributes; i++) {
-		attr->values[i].string.text = gnome_cups_strdup (attributes[i]);
-	}
+	ippAddStrings (request, group,
+		       IPP_TAG_NAME | IPP_TAG_COPY,
+		       "requested-attributes",
+		       n_attributes, NULL, attributes);
 }
 
 typedef struct

Places

File cups-1.2.patch of Package libgnomecups (Revision 6968da4493be455514d0b00b6f15df94)

Places