rpms/system-config-printer/F-9 system-config-printer-install-drivers.patch, NONE, 1.1 system-config-printer.spec, 1.185, 1.186

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12282

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-install-drivers.patch 
Log Message:
* Fri Jun  6 2008 Tim Waugh <twaugh at redhat.com>
- Applied patch to fix 'install drivers' dialog (bug #449860).


system-config-printer-install-drivers.patch:

--- NEW FILE system-config-printer-install-drivers.patch ---
commit bc597966c98b27fabb55e4fc4f864f541d781a41
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Jun 4 08:44:21 2008 +0100

    Fixed 'install driver' dialog (bug #449860).
    
    	* system-config-printer.py (GUI.__init__): Don't fetch
    	InstallDialog widget here...
    	(NewPrinterGUI.__init__): ...fetch it here instead (bug #449860).
    	(NewPrinterGUI.checkDriverExists): Fixed traceback.

diff --git a/ChangeLog b/ChangeLog
index c7932d6..988c69f 100644
diff --git a/system-config-printer.py b/system-config-printer.py
index fc8fb3f..9302c7f 100755
--- a/system-config-printer.py
+++ b/system-config-printer.py
@@ -323,7 +323,6 @@ class GUI(GtkGUI):
                         "NewPrinterName", "entCopyName", "btnCopyOk",
                         "ErrorDialog", "lblError",
                         "InfoDialog", "lblInfo",
-                        "InstallDialog", "lblInstall",
                         "ApplyDialog", "AboutDialog",
                         "WaitWindow", "lblWait",
                         )
@@ -2365,7 +2364,8 @@ class NewPrinterGUI(GtkGUI):
                         "rbtnNPDownloadLicenseNo",
                         "NewPrinterName", "entCopyName", "btnCopyOk",
                         "ErrorDialog", "lblError",
-                        "InfoDialog", "lblInfo")
+                        "InfoDialog", "lblInfo",
+                        "InstallDialog", "lblInstall")
         # share with mainapp
         self.WaitWindow = mainapp.WaitWindow
         self.lblWait = mainapp.lblWait
@@ -4467,7 +4467,7 @@ class NewPrinterGUI(GtkGUI):
                 dialog = self.ErrorDialog
                 self.lblError.set_markup(error_text)
 
-            dialog.set_transient_for (self.MainWindow)
+            dialog.set_transient_for (self.mainapp.MainWindow)
             response = dialog.run ()
             dialog.hide ()
             if pkg and response == gtk.RESPONSE_OK:


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-9/system-config-printer.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- system-config-printer.spec	5 Jun 2008 15:15:14 -0000	1.185
+++ system-config-printer.spec	6 Jun 2008 13:30:27 -0000	1.186
@@ -13,6 +13,7 @@
 Source1: pycups-%{pycups_version}.tar.bz2
 Patch1: system-config-printer-dash.patch
 Patch2: system-config-printer-exit-code.patch
+Patch3: system-config-printer-install-drivers.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -59,6 +60,7 @@
 %setup -q -a 1
 %patch1 -p1 -b .dash
 %patch2 -p1 -b .exit-code
+%patch3 -p1 -b .install-drivers
 
 %build
 %configure
@@ -125,6 +127,9 @@
 exit 0
 
 %changelog
+* Fri Jun  6 2008 Tim Waugh <twaugh at redhat.com>
+- Applied patch to fix 'install drivers' dialog (bug #449860).
+
 * Thu Jun  5 2008 Tim Waugh <twaugh at redhat.com>
 - Requires notify-python (bug #450139).