cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge a patch from upstream that fixes a crash when printing from mozilla

Browse Source 
apps to a CUPS printer.

ok sthen@
This commit is contained in:
ajacoutot 2012-02-02 09:21:07 +00:00
parent cb3bccfa8f
commit b9644080ef
2 changed files with 132 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/gtk+2/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.140 2012/01/25 09:05:18 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.141 2012/02/02 09:21:07 ajacoutot Exp $
SHARED_ONLY= Yes
@ -15,6 +15,8 @@ PKGNAME-docs= gtk+2-docs-${V}
PKGNAME-cups= gtk+2-cups-${V}
PKGNAME-guic= gtk-update-icon-cache-${V}
REVISION-cups= 0
CATEGORIES= x11 devel
SHARED_LIBS += gdk-x11-2.0 2400.0 # 2400.0

129
x11/gtk+2/patches/patch-modules_printbackends_cups_gtkprintbackendcups_c Normal file
View File

@ -0,0 +1,129 @@
$OpenBSD: patch-modules_printbackends_cups_gtkprintbackendcups_c,v 1.1 2012/02/02 09:21:07 ajacoutot Exp $
From 9afe13bf91d8e80c4def7d3944d56542ce13733f Mon Sep 17 00:00:00 2001
From: Marek Kasik <mkasik@redhat.com>
Date: Tue, 31 Jan 2012 11:15:43 +0000
Subject: printing: Don't crash when printing
--- modules/printbackends/cups/gtkprintbackendcups.c.orig Tue Jan 24 20:38:37 2012
+++ modules/printbackends/cups/gtkprintbackendcups.c Thu Feb 2 08:24:01 2012
@@ -485,7 +485,7 @@ cups_print_cb (GtkPrintBackendCups *print_backend,
typedef struct {
GtkCupsRequest *request;
- GtkPrinterOptionSet *options;
+ GtkPrinterCups *printer;
} CupsOptionsData;
static void
@@ -495,27 +495,51 @@ add_cups_options (const gchar *key,
{
CupsOptionsData *data = (CupsOptionsData *) user_data;
GtkCupsRequest *request = data->request;
- GtkPrinterOptionSet *options = data->options;
- GtkPrinterOption *option = NULL;
+ GtkPrinterCups *printer = data->printer;
+ gboolean custom_value = FALSE;
gchar *new_value = NULL;
+ gint i;
+ if (!key || !value)
+ return;
+
if (!g_str_has_prefix (key, "cups-"))
return;
if (strcmp (value, "gtk-ignore-value") == 0)
return;
- option = gtk_printer_option_set_lookup (options, key);
-
key = key + strlen ("cups-");
- /* Add "Custom." prefix to custom values */
- if (value && option &&
- !gtk_printer_option_has_choice (option, value))
- new_value = g_strdup_printf ("Custom.%s", value);
+ if (printer && printer->ppd_file)
+ {
+ ppd_coption_t *coption;
+ gboolean found = FALSE;
+ gboolean custom_values_enabled = FALSE;
- if (new_value)
+ coption = ppdFindCustomOption (printer->ppd_file, key);
+ if (coption && coption->option)
+ {
+ for (i = 0; i < coption->option->num_choices; i++)
+ {
+ /* Are custom values enabled ? */
+ if (g_str_equal (coption->option->choices[i].choice, "Custom"))
+ custom_values_enabled = TRUE;
+
+ /* Is the value among available choices ? */
+ if (g_str_equal (coption->option->choices[i].choice, value))
+ found = TRUE;
+ }
+
+ if (custom_values_enabled && !found)
+ custom_value = TRUE;
+ }
+ }
+
+ /* Add "Custom." prefix to custom values. */
+ if (custom_value)
{
+ new_value = g_strdup_printf ("Custom.%s", value);
gtk_cups_request_encode_option (request, key, new_value);
g_free (new_value);
}
@@ -536,9 +560,6 @@ gtk_print_backend_cups_print_stream (GtkPrintBackend
CupsOptionsData *options_data;
GtkCupsRequest *request;
GtkPrintSettings *settings;
- GtkPrinterOptionSet *options;
- GtkPrintCapabilities capabilities;
- GtkPageSetup *page_setup;
const gchar *title;
char printer_absolute_uri[HTTP_MAX_URI];
@@ -547,8 +568,6 @@ gtk_print_backend_cups_print_stream (GtkPrintBackend
cups_printer = GTK_PRINTER_CUPS (gtk_print_job_get_printer (job));
settings = gtk_print_job_get_settings (job);
- capabilities = cups_printer_get_capabilities (GTK_PRINTER (cups_printer));
- page_setup = gtk_printer_get_default_page_size (GTK_PRINTER (cups_printer));
request = gtk_cups_request_new_with_username (NULL,
GTK_CUPS_POST,
@@ -586,16 +605,10 @@ gtk_print_backend_cups_print_stream (GtkPrintBackend
IPP_TAG_NAME, "job-name",
NULL, title);
- options = cups_printer_get_options (GTK_PRINTER (cups_printer), settings, page_setup, capabilities);
-
options_data = g_new0 (CupsOptionsData, 1);
options_data->request = request;
- options_data->options = options;
-
+ options_data->printer = cups_printer;
gtk_print_settings_foreach (settings, add_cups_options, options_data);
-
- g_object_unref (page_setup);
- g_object_unref (options);
g_free (options_data);
ps = g_new0 (CupsPrintStreamData, 1);
@@ -4606,7 +4619,12 @@ cups_printer_get_default_page_size (GtkPrinter *printe
return NULL;
option = ppdFindOption (ppd_file, "PageSize");
+ if (option == NULL)
+ return NULL;
+
size = ppdPageSize (ppd_file, option->defchoice);
+ if (size == NULL)
+ return NULL;
return create_page_setup (ppd_file, size);
}