Make async print preview work by actually starting the print process in

2007-04-16  Alexander Larsson  <alexl@redhat.com>

	* gtk/gtkprintoperation.c (gtk_print_operation_run):
	Make async print preview work by actually starting
	the print process in that case (#424168)



svn path=/trunk/; revision=17603
This commit is contained in:
Alexander Larsson
2007-04-16 08:57:35 +00:00
committed by Alexander Larsson
parent a5977fde99
commit fb8638d0ac
2 changed files with 10 additions and 1 deletions

View File

@ -1,3 +1,9 @@
2007-04-16 Alexander Larsson <alexl@redhat.com>
* gtk/gtkprintoperation.c (gtk_print_operation_run):
Make async print preview work by actually starting
the print process in that case (#424168)
2007-04-14 Yevgen Muntyan <muntyan@tamu.edu>
* gtk/gtkselection.c (selection_get_text_plain): fixed

View File

@ -2368,12 +2368,14 @@ gtk_print_operation_run (GtkPrintOperation *op,
GtkPrintOperationResult result;
GtkPageSetup *page_setup;
gboolean do_print;
gboolean run_print_pages;
g_return_val_if_fail (GTK_IS_PRINT_OPERATION (op),
GTK_PRINT_OPERATION_RESULT_ERROR);
priv = op->priv;
run_print_pages = TRUE;
do_print = FALSE;
priv->error = NULL;
priv->action = action;
@ -2409,6 +2411,7 @@ gtk_print_operation_run (GtkPrintOperation *op,
parent,
print_pages);
result = GTK_PRINT_OPERATION_RESULT_IN_PROGRESS;
run_print_pages = FALSE; /* print_pages is called asynchronously from dialog */
}
#endif
else
@ -2420,7 +2423,7 @@ gtk_print_operation_run (GtkPrintOperation *op,
&do_print);
}
if (result != GTK_PRINT_OPERATION_RESULT_IN_PROGRESS)
if (run_print_pages)
print_pages (op, parent, do_print, result);
if (priv->error && error)