2007-02-20 Andreia Gaita <avidigal@novell.com>

* PrintingServicesUnix.cs: Correct missing static initialization
of loaded printers hashtable, unit tests were failing (oops :p)

svn path=/trunk/mcs/; revision=73170

diff --git a/mcs/class/System.Drawing/System.Drawing.Printing/ChangeLog b/mcs/class/System.Drawing/System.Drawing.Printing/ChangeLog
index 98fe63107617ee5d29965c60616717d5f3d172c5..beb921abba15f89c56658870d41ced06430d4dfe 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing.Printing/ChangeLog
+++ b/mcs/class/System.Drawing/System.Drawing.Printing/ChangeLog
@@ -1,3 +1,13 @@
+2007-02-20  Andreia Gaita  <avidigal@novell.com>
+       
+       * PrintingServicesUnix.cs: Correct missing static initialization
+       of loaded printers hashtable, unit tests were failing (oops :p)
+
+2007-02-17  Marek (please complete)
+
+       * PrintPreviewController, InvalidPrinterException: 
+       Remove warnings
+
 2007-02-16  Andreia Gaita  <avidigal@novell.com>
 
        Redesign how and when cups gets called to minimize

diff --git a/mcs/class/System.Drawing/System.Drawing.Printing/PrintingServicesUnix.cs b/mcs/class/System.Drawing/System.Drawing.Printing/PrintingServicesUnix.cs
index dd65135c31857e5aced58c4461d5cbffe2a9e07b..b72468813d5c07d77bfbfc1b6fab6cf5d9c0ebba 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing.Printing/PrintingServicesUnix.cs
+++ b/mcs/class/System.Drawing/System.Drawing.Printing/PrintingServicesUnix.cs
@@ -54,10 +54,10 @@ namespace System.Drawing.Printing
                #region Constructor
 
                internal PrintingServicesUnix () {
-                       installed_printers = new Hashtable ();
                }
                
                static PrintingServicesUnix () {
+                       installed_printers = new Hashtable ();
                        CheckCupsInstalled ();
                }
                
@@ -240,7 +240,7 @@ namespace System.Drawing.Printing
                        
                        ClosePrinter(ppd_handle);
                        
-                       installed_printers.Add (printer, settings);
+                       ((SysPrn.Printer)installed_printers[printer]).Settings = settings;
                }
                
                /// <summary>