[PATCH] Assured that on all uses of the ppdsloader class the device ID is supplied

[Till Kamppeter]

In some cases during the creation or the modification of a print queue
(newprinter.py) a device ID was available but it did not get supplied
to the ppdsloader class and this caused automatic driver downloads not
to get triggered.
---
 newprinter.py |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/newprinter.py b/newprinter.py
index 0d58a40..fa113cc 100644
--- a/newprinter.py
+++ b/newprinter.py
@@ -637,6 +637,8 @@ class NewPrinterGUI(GtkGUI):
 
             if self.dialog_mode == "ppd":
                 devid = self.device.id
+                if not self.devid:
+                    self.devid = devid
 
             if not devid:
                 devid = None
@@ -655,6 +657,8 @@ class NewPrinterGUI(GtkGUI):
                                         include_schemes=schemes,
                                         reply_handler=self.change_ppd_got_devs,
                                         error_handler=self.change_ppd_got_devs)
+                if self.devid:
+                    devid = self.devid
 
             self.ntbkNewPrinter.set_current_page(2)
             self.rbtnNPFoomatic.set_active (True)
@@ -714,6 +718,7 @@ class NewPrinterGUI(GtkGUI):
                 devid = device.id
                 mm = device.make_and_model
                 self.device = device
+                self.devid = devid
 
         # We'll also need the list of PPDs.
         self.ppdsloader = ppdsloader.PPDsLoader (device_id=devid,
@@ -970,6 +975,8 @@ class NewPrinterGUI(GtkGUI):
 
                 if not self.remotecupsqueue:
                     if self.ppds == None:
+                        if self.device.id and not self.devid:
+                            self.devid = self.device.id
                         devid = self.devid
                         if not devid:
                             devid = None
-- 
1.7.4.1


--------------050402070709040009050409--