Set the print as cancelled in the print settings too, see

2007-06-14  Christian Persch  <chpe@gnome.org>

	* embed/mozilla/GeckoPrintService.cpp:
	* embed/mozilla/GeckoPrintSession.cpp:
	* embed/mozilla/GeckoPrintSession.h:

	Set the print as cancelled in the print settings too, see
	https://bugzilla.mozilla.org/show_bug.cgi?id=253926.

svn path=/trunk/; revision=7081

1 files changed, 11 insertions, 2 deletions

diff --git a/embed/mozilla/GeckoPrintSession.cpp b/embed/mozilla/GeckoPrintSession.cpp
index 67f2d3819..edfd64d9c 100644
--- a/embed/mozilla/GeckoPrintSession.cpp
+++ b/embed/mozilla/GeckoPrintSession.cpp
@@ -98,13 +98,17 @@ GeckoPrintSession::GetSourceFile (nsACString &aSource)
 }
 
 nsresult
-GeckoPrintSession::SetSettings (GtkPrintSettings *aSettings,
+GeckoPrintSession::SetSettings (nsIPrintSettings *aPrintSettings,
+                                GtkPrintSettings *aSettings,
 				GtkPageSetup *aPageSetup,
 				GtkPrinter *aPrinter)
 {
-  NS_ASSERTION (!mSettings && !mPageSetup && !mPrinter, "Already have settings!");
+  NS_ASSERTION (!mPrintSettings && !mSettings && !mPageSetup && !mPrinter, "Already have settings!");
 
+  NS_ENSURE_ARG (aPrintSettings);
   NS_ENSURE_ARG (aSettings);
+
+  mPrintSettings = aPrintSettings;
   mSettings = (GtkPrintSettings *) g_object_ref (aSettings);
 
   NS_ENSURE_ARG (aPageSetup);
@@ -562,10 +566,15 @@ GeckoPrintSession::GetProcessCanceledByUser (PRBool *aProcessCanceledByUser)
   *aProcessCanceledByUser = mCancelled;
   return NS_OK;
 }
+
 NS_IMETHODIMP
 GeckoPrintSession::SetProcessCanceledByUser (PRBool aProcessCanceledByUser)
 {
   mCancelled = aProcessCanceledByUser;
+  if (mPrintSettings) {
+    mPrintSettings->SetIsCancelled (aProcessCanceledByUser);
+  }
+
   return NS_OK;
 }