summaryrefslogtreecommitdiff
path: root/gtk/gtkprintoperation-win32.c
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@src.gnome.org>2006-05-17 07:36:59 +0000
committerAlexander Larsson <alexl@src.gnome.org>2006-05-17 07:36:59 +0000
commit5d6935719a3c695f53061a631384fa28acd3f9c3 (patch)
treebac56a76d32eb3b16679b932e2aca05c47cdf191 /gtk/gtkprintoperation-win32.c
parent3ee19484206170ff33e70c8e81d3b2f35d2d63f7 (diff)
downloadgtk+-5d6935719a3c695f53061a631384fa28acd3f9c3.tar.gz
Fix printing build on win32
Diffstat (limited to 'gtk/gtkprintoperation-win32.c')
-rw-r--r--gtk/gtkprintoperation-win32.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/gtk/gtkprintoperation-win32.c b/gtk/gtkprintoperation-win32.c
index 8383434089..b6392600de 100644
--- a/gtk/gtkprintoperation-win32.c
+++ b/gtk/gtkprintoperation-win32.c
@@ -464,7 +464,8 @@ win32_poll_status_timeout (GtkPrintOperation *op)
static void
-win32_end_run (GtkPrintOperation *op)
+win32_end_run (GtkPrintOperation *op,
+ gboolean wait)
{
GtkPrintOperationWin32 *op_win32 = op->priv->platform_data;
LPDEVNAMES devnames;
@@ -472,7 +473,7 @@ win32_end_run (GtkPrintOperation *op)
EndDoc (op_win32->hdc);
- if (op->track_print_status)
+ if (op->priv->track_print_status)
{
devnames = GlobalLock (op_win32->devnames);
if (!OpenPrinterW (((gunichar2 *)devnames) + devnames->wDeviceOffset,
@@ -1478,7 +1479,7 @@ _gtk_print_operation_platform_backend_run_dialog_async (GtkPrintOperation
_gtk_print_operation_platform_backend_run_dialog (op, parent, &do_print, NULL);
if (do_print)
- print_cb (op);
+ print_cb (op, FALSE);
else
_gtk_print_operation_set_status (op, GTK_PRINT_STATUS_FINISHED_ABORTED, NULL);
}
@@ -1622,9 +1623,9 @@ gtk_print_run_page_setup_dialog_async (GtkWindow *parent,
GtkPageSetupDoneFunc done_cb,
gpointer data)
{
- GtkPageSetup *page_setup;
+ GtkPageSetup *new_page_setup;
- page_setup = gtk_print_run_page_setup_dialog (parent, page_setup, settings);
- done_cb (page_setup, data);
- g_object_unref (page_setup);
+ new_page_setup = gtk_print_run_page_setup_dialog (parent, page_setup, settings);
+ done_cb (new_page_setup, data);
+ g_object_unref (new_page_setup);
}