Bug 968753 - Save per-printer settings on GTK. r=jwatt

I don't see any reason why this shouldn't work off-hand, there's no
gtk globals or such that fundamentally avoid sharing settings.

The PSPrinters stuff is gone so it's not needed to mess up with PS/CUPS
names.

The last used printer name stuff is now just a pref read, so there
shouldn't be sandbox violation shenanigans...

There are some restrictions on what can be set or what not (like, if you
set the paper name that may also override the paper size).

But these are problems that we have when restoring from prefs already,
so there's no reason we shouldn't do this, afaict.

Differential Revision: https://phabricator.services.mozilla.com/D90418

layout/printing/nsPrintJob.cpp

@@ -306,13 +306,6 @@ static nsresult EnsureSettingsHasPrinterNameSet(
   // Mac doesn't support retrieving a printer list.
   return NS_OK;
 #else
-#  if defined(MOZ_X11)
-  // On Linux, last-used printer name should be requested on the parent side.
-  // Unless we are in the parent, we ignore this function
-  if (!XRE_IsParentProcess()) {
-    return NS_OK;
-  }
-#  endif
   NS_ENSURE_ARG_POINTER(aPrintSettings);
 
   // See if aPrintSettings already has a printer

widget/gtk/nsPrintSettingsGTK.cpp

@@ -479,7 +479,7 @@ NS_IMETHODIMP
 nsPrintSettingsGTK::GetPaperName(nsAString& aPaperName) {
   const gchar* name =
       gtk_paper_size_get_name(gtk_page_setup_get_paper_size(mPageSetup));
-  CopyUTF8toUTF16(MakeStringSpan(name), aPaperName);
+  CopyUTF8toUTF16(mozilla::MakeStringSpan(name), aPaperName);
   return NS_OK;
 }
 NS_IMETHODIMP

widget/nsPrintSettingsService.cpp

@@ -867,20 +867,7 @@ nsPrintSettingsService::GetDefaultPrintSettingsForPrinting(
 
   nsAutoString printerName;
   settings->GetPrinterName(printerName);
-
-  bool shouldGetLastUsedPrinterName = printerName.IsEmpty();
-#ifdef MOZ_X11
-  // In Linux, GTK backend does not support per printer settings.
-  // Calling GetLastUsedPrinterName causes a sandbox violation (see Bug
-  // 1329216). The printer name is not needed anywhere else on Linux
-  // before it gets to the parent. In the parent, we will then query the
-  // last-used printer name if no name is set. Unless we are in the parent,
-  // we will skip this part.
-  if (!XRE_IsParentProcess()) {
-    shouldGetLastUsedPrinterName = false;
-  }
-#endif
-  if (shouldGetLastUsedPrinterName) {
+  if (printerName.IsEmpty()) {
     GetLastUsedPrinterName(printerName);
     settings->SetPrinterName(printerName);
   }
@@ -945,7 +932,6 @@ nsPrintSettingsService::InitPrintSettingsFromPrinter(
   return rv;
 }
 
-#ifndef MOZ_X11
 /** ---------------------------------------------------
  *  Helper function - Returns either the name or sets the length to zero
  */
@@ -978,7 +964,6 @@ static nsresult GetAdjustedPrinterName(nsIPrintSettings* aPS, bool aUsePNP,
   }
   return NS_OK;
 }
-#endif
 
 NS_IMETHODIMP
 nsPrintSettingsService::InitPrintSettingsFromPrefs(nsIPrintSettings* aPS,
@@ -997,11 +982,8 @@ nsPrintSettingsService::InitPrintSettingsFromPrefs(nsIPrintSettings* aPS,
   nsresult rv = ReadPrefs(aPS, prtName, aFlags);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  // Do not use printer name in Linux because GTK backend does not support
-  // per printer settings.
-#ifndef MOZ_X11
-  // Get the Printer Name from the PrintSettings
-  // to use as a prefix for Pref Names
+  // Get the Printer Name from the PrintSettings to use as a prefix for Pref
+  // Names
   rv = GetAdjustedPrinterName(aPS, aUsePNP, prtName);
   NS_ENSURE_SUCCESS(rv, rv);
 
@@ -1013,7 +995,6 @@ nsPrintSettingsService::InitPrintSettingsFromPrefs(nsIPrintSettings* aPS,
   // Now read any printer specific prefs
   rv = ReadPrefs(aPS, prtName, aFlags);
   if (NS_SUCCEEDED(rv)) aPS->SetIsInitializedFromPrefs(true);
-#endif
 
   return NS_OK;
 }
@@ -1036,13 +1017,9 @@ nsresult nsPrintSettingsService::SavePrintSettingsToPrefs(
 
   nsAutoString prtName;
 
-  // Do not use printer name in Linux because GTK backend does not support
-  // per printer settings.
-#ifndef MOZ_X11
   // Get the printer name from the PrinterSettings for an optional prefix.
   nsresult rv = GetAdjustedPrinterName(aPS, aUsePrinterNamePrefix, prtName);
   NS_ENSURE_SUCCESS(rv, rv);
-#endif
 
   // Write the prefs, with or without a printer name prefix.
   return WritePrefs(aPS, prtName, aFlags);