Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '4627-printing-Unref-old-spool_io-before-setting-new-one' into 'main'

Browse Source 
printing: Unref old spool_io before setting new one

Closes #4627

See merge request GNOME/gtk!4370
This commit is contained in:
Matthias Clasen
2022-01-12 19:37:18 +00:00
parent d50df7db37 915090f118
commit e4e1b9ccbe
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkprintjob.c
View File

@@ -441,6 +441,9 @@ gtk_print_job_set_source_file (GtkPrintJob *job,
g_return_val_if_fail (GTK_IS_PRINT_JOB (job), FALSE);
if (job->spool_io != NULL)
g_io_channel_unref (job->spool_io);
job->spool_io = g_io_channel_new_file (filename, "r", &tmp_error);
if (tmp_error == NULL)
@@ -483,6 +486,9 @@ gtk_print_job_set_source_fd (GtkPrintJob *job,
g_return_val_if_fail (GTK_IS_PRINT_JOB (job), FALSE);
g_return_val_if_fail (fd >= 0, FALSE);
if (job->spool_io != NULL)
g_io_channel_unref (job->spool_io);
job->spool_io = g_io_channel_unix_new (fd);
if (g_io_channel_set_encoding (job->spool_io, NULL, error) != G_IO_STATUS_NORMAL)
return FALSE;