summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <matthiasc@src.gnome.org>2008-05-01 00:37:20 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2008-05-01 00:37:20 +0000
commita2ea6b7570bbe1370d9db7bea6d41a81d6ec8bed (patch)
treecc641d42c62a08392a8d531540a7a76fe11e92c0
parenta661eab548bb9e9d58bffb797db8b7904a2e0c9c (diff)
downloadgtk+-a2ea6b7570bbe1370d9db7bea6d41a81d6ec8bed.tar.gz
Bug 529386 – Printing options hidden by blacklisted option
* modules/printbackend/cups/gtkprintbackendcups.c (cups_printer_get_options): Fix the blacklist handling. Patch by Marek Kašík. svn path=/trunk/; revision=20058
-rw-r--r--ChangeLog8
-rw-r--r--modules/printbackends/cups/gtkprintbackendcups.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 280e038fcb..d1f90d8a72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-04-30 Matthias Clasen <mclasen@redhat.com>
+
+ Bug 529386 – Printing options hidden by blacklisted option
+
+ * modules/printbackend/cups/gtkprintbackendcups.c
+ (cups_printer_get_options): Fix the blacklist handling.
+ Patch by Marek Kašík.
+
2008-04-30 Richard Hult <richard@imendio.com>
* gdk/quartz/GdkQuartzView.c: Simplify check for zero sized expose
diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c
index 113388a142..3c5e1844a2 100644
--- a/modules/printbackends/cups/gtkprintbackendcups.c
+++ b/modules/printbackends/cups/gtkprintbackendcups.c
@@ -2484,7 +2484,7 @@ cups_printer_get_options (GtkPrinter *printer,
for (i = 0; i < num_opts; i++)
{
- if (STRING_IN_TABLE (opts->name, cups_option_blacklist))
+ if (STRING_IN_TABLE (opts[i].name, cups_option_blacklist))
continue;
name = get_option_name (opts[i].name);