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)

diff --git a/ChangeLog b/ChangeLog
index b5b94b8b4a8ef8bce38bb88f4d0ec5b99cb610d2..f55af988a152a466eb04135298bd58efaff2d976 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 53ff1e581dc96990710f5d9d893661646e95f7ca..041ab51beb1d83cc87447d5bbaf611a77e236fc2 100644 (file)
--- a/modules/printbackends/cups/gtkprintbackendcups.c
+++ b/modules/printbackends/cups/gtkprintbackendcups.c
@@ -1687,6 +1687,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)
@@ -1695,6 +1696,7 @@ available_choices (ppd_file_t     *ppd,
          break;
        }
     }
+#endif
 
   for (i = ppd->num_consts, constraint = ppd->consts; i > 0; i--, constraint++)
     {