From c246b5f7403ed4950b658c4a08b863d1a2ccd0a5 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 2 Oct 2006 05:37:59 +0000 Subject: [PATCH] Only use the group name field if cups is new enough. (#357280) 2006-10-02 Matthias Clasen * modules/printbackends/cups/gtkprintbackendcups.c (available_choices): Only use the group name field if cups is new enough. (#357280) --- ChangeLog | 3 +++ modules/printbackends/cups/gtkprintbackendcups.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index 4f80f88092..1169ffb2e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-10-02 Matthias Clasen + * 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 4fd879d4c5..3f30f9f6fb 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++) {