diff --git a/ChangeLog b/ChangeLog
index e9c89fca0c..dd708ccd15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-03-10  Matthias Clasen <mclasen@redhat.com>
 
+	Merge from trunk:
+
+	* gtk/gtkprintoperation-unix.c: Initialize the do_preview
+	field of PrintResponseData.  (#396703, Christian Persch)
+
 	* tests/print-editor.c: Plug some leaks.
 
 2007-03-09  Matthias Clasen <mclasen@redhat.com>
diff --git a/gtk/gtkprintoperation-unix.c b/gtk/gtkprintoperation-unix.c
index 7ad4ee5767..b260cdc058 100644
--- a/gtk/gtkprintoperation-unix.c
+++ b/gtk/gtkprintoperation-unix.c
@@ -579,6 +579,7 @@ _gtk_print_operation_platform_backend_run_dialog_async (GtkPrintOperation
   rdata = g_new (PrintResponseData, 1);
   rdata->op = g_object_ref (op);
   rdata->do_print = FALSE;
+  rdata->do_preview = FALSE;
   rdata->result = GTK_PRINT_OPERATION_RESULT_CANCEL;
   rdata->print_cb = print_cb;
   rdata->parent = parent;
@@ -715,6 +716,7 @@ _gtk_print_operation_platform_backend_run_dialog (GtkPrintOperation *op,
    
   rdata.op = op;
   rdata.do_print = FALSE;
+  rdata.do_preview = FALSE;
   rdata.result = GTK_PRINT_OPERATION_RESULT_CANCEL;
   rdata.print_cb = NULL;
   rdata.destroy = NULL;