Merge tag 'upstream/3.19.1'

Upstream version 3.19.1

1 files changed, 7 insertions, 0 deletions

diff --git a/src/ui.vala b/src/ui.vala
index ab1cfd4..a66db50 100644
--- a/src/ui.vala
+++ b/src/ui.vala
@@ -1639,6 +1639,7 @@ public class UserInterface : Gtk.ApplicationWindow
 
         if (packages_to_install.length > 0)
         {
+#if HAVE_PACKAGEKIT
             stack.visible = true;
             spinner.active = true;
             instructions_label.set_text (/* Label shown while installing drivers */
@@ -1671,12 +1672,17 @@ public class UserInterface : Gtk.ApplicationWindow
                 }
                 instructions_label.set_text (result_text);
             });
+#else
+            instructions_label.set_text (/* Label shown to prompt user to install packages (when PackageKit not available) */
+                                         _("You need to install the %s package(s).").printf (string.joinv (", ", packages_to_install)));
+#endif
         }
 
         dialog.run ();
         dialog.destroy ();
     }
 
+#if HAVE_PACKAGEKIT
     private async Pk.Results? install_packages (string[] packages, Pk.ProgressCallback progress_callback) throws GLib.Error
     {
         var task = new Pk.Task ();
@@ -1693,6 +1699,7 @@ public class UserInterface : Gtk.ApplicationWindow
 
         return yield task.install_packages_async (package_ids, null, progress_callback);
     }
+#endif
 
     [GtkCallback]
     private bool simple_scan_window_window_state_event_cb (Gtk.Widget widget, Gdk.EventWindowState event)