Fix printing build on win32

diff --git a/ChangeLog b/ChangeLog
index 0c91eda1ae0a24e62df3dc3a739738c2d456b575..b446205dc9e993bbfc432456d44efab60e931996 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-17  Alexander Larsson  <alexl@redhat.com>
+
+       * gtk/gtkprintoperation-win32.c:
+       Update to changed APIs.
+
 2006-05-16  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0c91eda1ae0a24e62df3dc3a739738c2d456b575..b446205dc9e993bbfc432456d44efab60e931996 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-05-17  Alexander Larsson  <alexl@redhat.com>
+
+       * gtk/gtkprintoperation-win32.c:
+       Update to changed APIs.
+
 2006-05-16  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version

diff --git a/gtk/gtkprintoperation-win32.c b/gtk/gtkprintoperation-win32.c
index 838343408968727f6e9de4ea2ac94854d072d149..b6392600de70f422fd1bd611a5580a7a38026911 100644 (file)
--- 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);
 }