commit MozillaFirefox

30 Jun 2006

Hello community,

here is the log from the commit of package MozillaFirefox
checked in at Fri Jun 30 16:41:05 CEST 2006.

--------

--- MozillaFirefox/MozillaFirefox.changes	2006-06-19 06:29:02.000000000 +0200
+++ MozillaFirefox/MozillaFirefox.changes	2006-06-30 08:38:22.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Jun 29 20:13:28 CEST 2006 - stark@suse.de
+
+- fixed printing crash if the last used printer is not available
+  anymore (#187013)
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ MozillaFirefox.spec ++++++
--- /var/tmp/diff_new_pack.K7F4x1/_old	2006-06-30 16:40:37.000000000 +0200
+++ /var/tmp/diff_new_pack.K7F4x1/_new	2006-06-30 16:40:37.000000000 +0200
@@ -21,7 +21,7 @@
 Obsoletes:      mozilla
 %endif
 Version:        1.5.0.4
-Release:        2
+Release:        3
 Summary:        Mozilla Firefox Web Browser
 URL:            http://www.mozilla.org/
 Group:          Productivity/Networking/Web/Browsers
@@ -508,6 +508,9 @@
 %defattr(-,root,root)
 
 %changelog -n MozillaFirefox
+* Thu Jun 29 2006 - stark@suse.de
+- fixed printing crash if the last used printer is not available
+  anymore (#187013)
 * Fri Jun 16 2006 - stark@suse.de
 - added 48x48 icon (#185777)
 * Mon Jun 12 2006 - stark@suse.de











++++++ print-properties.patch ++++++
--- /var/tmp/diff_new_pack.K7F4x1/_old	2006-06-30 16:40:41.000000000 +0200
+++ /var/tmp/diff_new_pack.K7F4x1/_new	2006-06-30 16:40:41.000000000 +0200
@@ -2,10 +2,16 @@
 References:
 https://bugzilla.mozilla.org/show_bug.cgi?id=324072
 https://bugzilla.novell.com/show_bug.cgi?id=174082
+https://bugzilla.mozilla.org/show_bug.cgi?id=342950
+https://bugzilla.novell.com/show_bug.cgi?id=187013
 
-diff -p -u -d -8 -r1.4 nsIPrintSettingsService.idl
---- gfx/idl/nsIPrintSettingsService.idl	4 Mar 2006 16:37:11 -0000	1.4
-+++ gfx/idl/nsIPrintSettingsService.idl	2 May 2006 22:59:39 -0000
+Index: idl/nsIPrintSettingsService.idl
+===================================================================
+RCS file: /cvsroot/mozilla/gfx/idl/Attic/nsIPrintSettingsService.idl,v
+retrieving revision 1.2
+diff -p -u -d -8 -r1.2 nsIPrintSettingsService.idl
+--- idl/nsIPrintSettingsService.idl	17 Apr 2004 21:52:27 -0000	1.2
++++ gfx/idl/nsIPrintSettingsService.idl	11 May 2006 21:51:04 -0000
 @@ -67,17 +67,17 @@ interface nsIPrintSettingsService : nsIS
     * then it should use "globalPrintSettings"
     *
@@ -65,10 +71,12 @@
 ===================================================================
 RCS file: /cvsroot/mozilla/gfx/src/Attic/nsPrintOptionsImpl.cpp,v
 retrieving revision 1.76
-diff -u -p -6 -r1.76 nsPrintOptionsImpl.cpp
---- gfx/src/nsPrintOptionsImpl.cpp	9 Aug 2005 01:35:48 -0000	1.76
-+++ gfx/src/nsPrintOptionsImpl.cpp	10 May 2006 06:22:28 -0000
-@@ -599,19 +599,12 @@ nsPrintOptions::ReadPrefs(nsIPrintSettin
+diff -p -u -d -8 -r1.76 nsPrintOptionsImpl.cpp
+--- src/nsPrintOptionsImpl.cpp	9 Aug 2005 01:35:48 -0000	1.76
++++ gfx/src/nsPrintOptionsImpl.cpp	11 May 2006 21:51:05 -0000
+@@ -597,23 +597,16 @@ nsPrintOptions::ReadPrefs(nsIPrintSettin
+ 
+   if (aFlags & nsIPrintSettings::kInitSavePrintCommand) {
      if (GETSTRPREF(kPrintCommand, str)) {
        aPS->SetPrintCommand(str.get());
        DUMP_STR(kReadStr, kPrintCommand, str.get());
@@ -88,7 +96,11 @@
        DUMP_BOOL(kReadStr, kPrintToFile, b);
      }
    }
-@@ -867,16 +860,18 @@ nsPrintOptions::WritePrefs(nsIPrintSetti
+ 
+   if (aFlags & nsIPrintSettings::kInitSaveToFileName) {
+@@ -865,20 +858,22 @@ nsPrintOptions::WritePrefs(nsIPrintSetti
+ 
+   if (aFlags & nsIPrintSettings::kInitSavePrintCommand) {
      if (NS_SUCCEEDED(aPS->GetPrintCommand(&uStr))) {
        DUMP_STR(kWriteStr, kPrintCommand, uStr);
        WritePrefString(uStr, GetPrefName(kPrintCommand, aPrinterName));
@@ -109,7 +121,11 @@
    if (aFlags & nsIPrintSettings::kInitSavePrintToFile) {
      if (NS_SUCCEEDED(aPS->GetPrintToFile(&b))) {
        DUMP_BOOL(kWriteStr, kPrintToFile, b);
-@@ -967,12 +962,18 @@ nsresult nsPrintOptions::_CreatePrintSet
+       mPrefBranch->SetBoolPref(GetPrefName(kPrintToFile, aPrinterName), b);
+     }
+@@ -965,16 +960,22 @@ NS_IMETHODIMP nsPrintOptions::GetNativeD
+ 
+ nsresult nsPrintOptions::_CreatePrintSettings(nsIPrintSettings **_retval)
  {
    // does not initially ref count
    nsPrintSettings * printSettings = new nsPrintSettings();
@@ -128,7 +144,11 @@
    return NS_OK;
  }
  
-@@ -1005,12 +1006,38 @@ nsPrintOptions::GetDefaultPrinterName(PR
+ NS_IMETHODIMP nsPrintOptions::CreatePrintSettings(nsIPrintSettings **_retval)
+ {
+@@ -1003,16 +1004,42 @@ nsPrintOptions::GetNewPrintSettings(nsIP
+ NS_IMETHODIMP
+ nsPrintOptions::GetDefaultPrinterName(PRUnichar * *aDefaultPrinterName)
  {
    nsresult rv;
    nsCOMPtr<nsIPrinterEnumerator> prtEnum = do_GetService(kPrinterEnumeratorCID,
@@ -145,7 +165,7 @@
 +    rv = prtEnum->EnumeratePrinters(&ctPrinters, &printers);
 +    if (NS_SUCCEEDED(rv)) {
 +      PRBool isValid = PR_FALSE;
-+      for (PRUint32 ii = ctPrinters - 1; ii >= 0; --ii) {
++      for (PRInt32 ii = ctPrinters - 1; ii >= 0; --ii) {
 +        if (lastPrinterName.Equals(printers[ii])) {
 +          isValid = PR_TRUE;
 +          break;
@@ -167,7 +187,11 @@
  NS_IMETHODIMP
  nsPrintOptions::InitPrintSettingsFromPrinter(const PRUnichar *aPrinterName,
                                               nsIPrintSettings *aPrintSettings)
-@@ -1126,15 +1153,20 @@ nsPrintOptions::InitPrintSettingsFromPre
+ {
+   NS_ENSURE_ARG_POINTER(aPrintSettings);
+@@ -1124,49 +1151,50 @@ nsPrintOptions::InitPrintSettingsFromPre
+   nsAutoString prtName;
+   // read any non printer specific prefs
    // with empty printer name
    nsresult rv = ReadPrefs(aPS, prtName, aFlags);
    NS_ENSURE_SUCCESS(rv, rv);
@@ -178,15 +202,53 @@
 -  NS_ENSURE_FALSE(prtName.IsEmpty(), NS_OK);
 +  rv = GetAdjustedPrinterName(aPS, aUsePNP, prtName);
 +  NS_ENSURE_SUCCESS(rv, rv);
- 
++ 
 +  if (prtName.IsEmpty()) {
 +    NS_WARNING("Caller should supply a printer name.");
 +    return NS_OK;
 +  }
-+  
+ 
    // Now read any printer specific prefs
    rv = ReadPrefs(aPS, prtName, aFlags);
    if (NS_SUCCEEDED(rv))
      aPS->SetIsInitializedFromPrefs(PR_TRUE);
  
    return NS_OK;
+ }
+ 
+-/** ---------------------------------------------------
+- *  This will save into prefs most all the PrintSettings either generically (not
+- *  specified printer) or to a specific printer.
++/**
++ *  Save all of the printer settings; if we can find a printer name, save
++ *  printer-specific preferences. Otherwise, save generic ones.
+  */
+ nsresult
+ nsPrintOptions::SavePrintSettingsToPrefs(nsIPrintSettings *aPS,
+                                          PRBool aUsePrinterNamePrefix,
+                                          PRUint32 aFlags)
+ {
+   NS_ENSURE_ARG_POINTER(aPS);
+   nsAutoString prtName;
+ 
+-  // Get the Printer Name from the PrinterSettings
+-  // to use as a prefix for Pref Names
++  // Get the printer name from the PrinterSettings for an optional prefix.
+   nsresult rv = GetAdjustedPrinterName(aPS, aUsePrinterNamePrefix, prtName);
+   NS_ENSURE_SUCCESS(rv, rv);
+ 
+-  // Now write any printer specific prefs
+-  // XXX but when |prtName| is empty, how can we write printer specific prefs?
+-  rv = WritePrefs(aPS, prtName, aFlags);
+- 
+-  return rv;
++  // Write the prefs, with or without a printer name prefix.
++  return WritePrefs(aPS, prtName, aFlags);
+ }
+ 
+ 
+ //-----------------------------------------------------
+ //-- Protected Methods --------------------------------
+ //-----------------------------------------------------
+ nsresult
+ nsPrintOptions::ReadPrefString(const char * aPrefId, nsAString& aString)


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...


---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org

    

root＠suse.de

tags

participants (1)