rpms/system-config-printer/F-12 system-config-printer-no-cancel-properties-dialog.patch, NONE, 1.1 system-config-printer.spec, 1.300, 1.301

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16790

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-no-cancel-properties-dialog.patch 
Log Message:
* Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-4
- Don't display properties dialog for first test page (bug #531490).


system-config-printer-no-cancel-properties-dialog.patch:
 system-config-printer.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE system-config-printer-no-cancel-properties-dialog.patch ---
diff -up system-config-printer-1.1.13/system-config-printer.py.no-cancel-properties-dialog system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.no-cancel-properties-dialog	2009-10-28 14:41:15.654017107 +0000
+++ system-config-printer-1.1.13/system-config-printer.py	2009-10-28 15:29:53.600140205 +0000
@@ -6815,8 +6815,9 @@ class NewPrinterGUI(GtkGUI):
             response = q.run ()
             q.destroy ()
             if response == gtk.RESPONSE_YES:
-                # Display the properties dialog.
+                # Load the printer details but hide the properties dialog.
                 self.mainapp.display_properties_dialog_for (name)
+                self.mainapp.PrinterPropertiesDialog.hide ()
 
                 # Click the test button.
                 self.mainapp.btnPrintTestPage.clicked ()


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -p -r1.300 -r1.301
--- system-config-printer.spec	28 Oct 2009 15:44:13 -0000	1.300
+++ system-config-printer.spec	28 Oct 2009 15:45:45 -0000	1.301
@@ -25,6 +25,7 @@ Patch7: system-config-printer-find-retur
 Patch8: system-config-printer-physdev-traceback.patch
 Patch9: system-config-printer-autoselect-raw.patch
 Patch10: system-config-printer-network-model.patch
+Patch11: system-config-printer-no-cancel-properties-dialog.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -95,6 +96,7 @@ printers.
 %patch8 -p1 -b .physdev-traceback
 %patch9 -p1 -b .autoselect-raw
 %patch10 -p1 -b .network-model
+%patch11 -p1 -b .no-cancel-properties-dialog
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -207,6 +209,7 @@ exit 0
 
 %changelog
 * Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-4
+- Don't display properties dialog for first test page (bug #531490).
 - Determine make/model for network printers (bug #524321).
 - Auto-select the correct driver entry for raw queues.
 - Avoid traceback in PhysicalDevice.py.