callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix another leak

Browse Source 
svn path=/trunk/; revision=17050
This commit is contained in:
Matthias Clasen
2007-01-04 05:09:08 +00:00
parent 4e332f0da6
commit 5db7fbc8dc
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1786,12 +1786,13 @@ available_choices (ppd_file_t *ppd,
all_default = FALSE;
}
if (all_default && !keep_if_only_one_option)
return 0;
if (num_conflicts == option->num_choices)
return 0;
if ((all_default && !keep_if_only_one_option) ||
(num_conflicts == option->num_choices))
{
g_free (conflicts);
return 0;
}
/* Some ppds don't have a "use printer default" option for
* InputSlot. This means you always have to select a particular slot,
@ -1830,7 +1831,6 @@ available_choices (ppd_file_t *ppd,
if (available)
{
*available = g_new (ppd_choice_t *, option->num_choices - num_conflicts + add_auto);
i = 0;
@ -1843,6 +1843,8 @@ available_choices (ppd_file_t *ppd,
if (add_auto)
(*available)[i++] = NULL;
}
g_free (conflicts);
return option->num_choices - num_conflicts + add_auto;
}