Merge lp:~ahayzen/ubuntu-ui-extras/printer-added-ensure-proxy-printer into lp:~phablet-team/ubuntu-ui-extras/printer-staging

[Andrew Hayzen]

* If printerAdded is called ensure there is always a proxy printer
* Update printerLoaded to use getPrinterByName to improve DRY

* If printerAdded is called ensure there is always a proxy printer
* Update printerLoaded to use getPrinterByName to improve DRY

[Jonas G. Drange (jonas-drange)]

This fixes the crash, and it makes sense to use a proxyprinter. Thanks!

review: Approve

=== modified file 'modules/Ubuntu/Components/Extras/Printers/models/printermodel.cpp'
--- modules/Ubuntu/Components/Extras/Printers/models/printermodel.cpp	2017-03-14 16:04:49 +0000
+++ modules/Ubuntu/Components/Extras/Printers/models/printermodel.cpp	2017-03-20 13:06:03 +0000
@@ -64,20 +64,18 @@
 
 void PrinterModel::printerLoaded(QSharedPointer<Printer> printer)
 {
-    // Find and possibly replace an old printer.
-    for (int i=0; i < m_printers.count(); i++) {
-        auto oldPrinter = m_printers.at(i);
-        if (printer->name() == oldPrinter->name()) {
-            if (!oldPrinter->deepCompare(printer)) {
-                updatePrinter(oldPrinter, printer);
-            }
+    // If there is an existing printer then get it
+    QSharedPointer<Printer> oldPrinter = getPrinterByName(printer->name());
 
-            // We're done.
-            return;
+    if (oldPrinter) {
+        // Check if the existing printer needs updating
+        if (!oldPrinter->deepCompare(printer)) {
+            updatePrinter(oldPrinter, printer);
         }
+    } else {
+        // There isn't an existing printer so add it
+        addPrinter(printer, CountChangeSignal::Emit);
     }
-
-    addPrinter(printer, CountChangeSignal::Emit);
 }
 
 void PrinterModel::printerModified(const QString &printerName)
@@ -98,6 +96,12 @@
     Q_UNUSED(printerStateReason);
     Q_UNUSED(acceptingJobs);
 
+    // If there isn't an existing printer then add a proxy printer
+    if (!getPrinterByName(printerName)) {
+        auto p = QSharedPointer<Printer>(new Printer(new PrinterBackend(printerName)));
+        addPrinter(p);
+    }
+
     m_backend->requestPrinter(printerName);
 }