AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-10 02:40:11 +00:00
Code Issues Projects Releases Wiki Activity

Only use the group name field if cups is new enough. (#357280)

Browse Source 
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)
This commit is contained in:
Matthias Clasen 2006-10-02 05:39:31 +00:00 committed by Matthias Clasen
parent 47a78aaf8b
commit f647f66400
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -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)

2
modules/printbackends/cups/gtkprintbackendcups.c
View File

@ -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++)
{