AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch '4627-printing-Unref-old-spool_io-before-setting-new-one-gtk3' into 'gtk-3-24'

Browse Source 
printing: Unref old spool_io before setting new one

See merge request GNOME/gtk!4369
This commit is contained in:
Matthias Clasen 2022-01-12 19:37:38 +00:00
commit 7a35c5bd4e
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkprintjob.c
View File

@ -430,6 +430,9 @@ gtk_print_job_set_source_file (GtkPrintJob *job,
priv = job->priv;
if (job->priv->spool_io != NULL)
g_io_channel_unref (job->priv->spool_io);
priv->spool_io = g_io_channel_new_file (filename, "r", &tmp_error);
if (tmp_error == NULL)
@ -472,6 +475,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->priv->spool_io != NULL)
g_io_channel_unref (job->priv->spool_io);
job->priv->spool_io = g_io_channel_unix_new (fd);
if (g_io_channel_set_encoding (job->priv->spool_io, NULL, error) != G_IO_STATUS_NORMAL)
return FALSE;