diff options
| author | Wouter Bolsterlee <wbolster@svn.gnome.org> | 2008-03-10 08:56:14 +0000 |
|---|---|---|
| committer | Wouter Bolsterlee <wbolster@src.gnome.org> | 2008-03-10 08:56:14 +0000 |
| commit | 309b86b22239e8aaa5dbd346c3320c5518c7f898 (patch) | |
| tree | ae9372d79807740d32dd738dff95a162f1794b00 | |
| parent | 0f7b37bfe134519512f2660f18d15bc089caa152 (diff) | |
| download | gdk-pixbuf-309b86b22239e8aaa5dbd346c3320c5518c7f898.tar.gz | |
reviewed by: Matthias Clasen <mclasen@redhat.com>
2008-03-10 Wouter Bolsterlee <wbolster@svn.gnome.org>
reviewed by: Matthias Clasen <mclasen@redhat.com>
* modules/printbackends/cups/gtkprintbackendcups.c
(cups_get_user_options):
Bug 469210 – Honor CUPS user default options for GtkPrint
Correctly iterate over filename list, avoiding a
critical warning/crash.
svn path=/branches/gtk-2-12/; revision=19741
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | modules/printbackends/cups/gtkprintbackendcups.c | 2 |
2 files changed, 13 insertions, 1 deletions
@@ -1,3 +1,15 @@ +2008-03-10 Wouter Bolsterlee <wbolster@svn.gnome.org> + + reviewed by: Matthias Clasen <mclasen@redhat.com> + + * modules/printbackends/cups/gtkprintbackendcups.c + (cups_get_user_options): + + Bug 469210 – Honor CUPS user default options for GtkPrint + + Correctly iterate over filename list, avoiding a + critical warning/crash. + 2008-03-07 Alberto Ruiz <aruiz@gnome.org> Merged from trunk: diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c index c7cf67780..b40c110b0 100644 --- a/modules/printbackends/cups/gtkprintbackendcups.c +++ b/modules/printbackends/cups/gtkprintbackendcups.c @@ -1533,7 +1533,7 @@ cups_get_user_options (const char *printer_name, { int i; - for (i = 0; i < sizeof (lpoptions_locations); i++) + for (i = 0; i < G_N_ELEMENTS (lpoptions_locations); i++) { if (g_path_is_absolute (lpoptions_locations[i])) { |