diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2006-10-02 05:37:59 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2006-10-02 05:37:59 +0000 |
| commit | c246b5f7403ed4950b658c4a08b863d1a2ccd0a5 (patch) | |
| tree | ab3dc2a712b21f5e1c1542005b65ed3c72f8dec1 | |
| parent | 43c3c790296a8fa49ffc8927f50cc83f36b07fa3 (diff) | |
| download | gdk-pixbuf-c246b5f7403ed4950b658c4a08b863d1a2ccd0a5.tar.gz | |
Only use the group name field if cups is new enough. (#357280)
2006-10-02 Matthias Clasen <mclasen@redhat.com>
* modules/printbackends/cups/gtkprintbackendcups.c (available_choices):
Only use the group name field if cups is new enough. (#357280)
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | modules/printbackends/cups/gtkprintbackendcups.c | 2 |
2 files changed, 5 insertions, 0 deletions
@@ -1,5 +1,8 @@ 2006-10-02 Matthias Clasen <mclasen@redhat.com> + * modules/printbackends/cups/gtkprintbackendcups.c (available_choices): + Only use the group name field if cups is new enough. (#357280) + * gtk/gtksizegroup.c: Make sure that the quarks are initialized before using them. (#353736) diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c index 4fd879d4c..3f30f9f6f 100644 --- a/modules/printbackends/cups/gtkprintbackendcups.c +++ b/modules/printbackends/cups/gtkprintbackendcups.c @@ -1688,6 +1688,7 @@ available_choices (ppd_file_t *ppd, conflicts = g_new0 (char, option->num_choices); installed_options = NULL; +#if CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR > 1) || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR == 1 && CUPS_VERSION_PATCH >= 18) for (i = 0; i < ppd->num_groups; i++) { if (strcmp (ppd->groups[i].name, "InstallableOptions") == 0) @@ -1696,6 +1697,7 @@ available_choices (ppd_file_t *ppd, break; } } +#endif for (i = ppd->num_consts, constraint = ppd->consts; i > 0; i--, constraint++) { |