[gnome-boxes] Fix an inconsistency in VM creation code

[Zeeshan Ali Khattak <zeeshanak src gnome org>]

commit 1fa1fc8f3bc008da284c82b49aedfde87beeb9c0
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Thu Nov 17 02:40:31 2011 +0200

    Fix an inconsistency in VM creation code
    
    We were not fetching the media information from libosinfo for real/hw
    installer media.

 src/installer-media.vala |    6 ++++--
 src/os-database.vala     |   19 ++++++++-----------
 2 files changed, 12 insertions(+), 13 deletions(-)
---
diff --git a/src/installer-media.vala b/src/installer-media.vala
index 3bc55c3..54d1329 100644
--- a/src/installer-media.vala
+++ b/src/installer-media.vala
@@ -59,11 +59,13 @@ private class Boxes.InstallerMedia : Object {
             get_os_and_label_from_device (device, os_db);
         else {
             from_image = true;
-            os = yield os_db.guess_os_from_install_media (device_file, cancellable, out os_media);
+            os = yield os_db.guess_os_from_install_media (device_file, cancellable);
         }
 
-        if (os != null)
+        if (os != null) {
             label = os.get_name ();
+            os_media = os_db.get_prefered_media_for_os (os);
+        }
 
         if (label == null)
             label = Path.get_basename (device_file);
diff --git a/src/os-database.vala b/src/os-database.vala
index dd254e7..1a146ac 100644
--- a/src/os-database.vala
+++ b/src/os-database.vala
@@ -30,19 +30,10 @@ private class Boxes.OSDatabase {
         db = loader.get_db ();
     }
 
-    public async Os? guess_os_from_install_media (string       media_path,
-                                                  Cancellable? cancellable,
-                                                  out Media    os_media) throws GLib.Error {
+    public async Os? guess_os_from_install_media (string media_path, Cancellable? cancellable) throws GLib.Error {
         var media = yield Media.create_from_location_async (media_path, Priority.DEFAULT, cancellable);
 
-        var os = db.guess_os_from_media (media);
-        if (os != null) {
-            var medias = os.get_media_list ();
-            os_media = get_prefered_media (medias);
-        } else
-            os_media = null;
-
-        return os;
+        return db.guess_os_from_media (media);
     }
 
     public Os? get_os_by_id (string id) {
@@ -63,6 +54,12 @@ private class Boxes.OSDatabase {
         return get_resources_from_os_resources (minimum, recommended);
     }
 
+    public Media? get_prefered_media_for_os (Os os) {
+        var medias = os.get_media_list ();
+
+        return get_prefered_media (medias);
+    }
+
     private Resources get_resources_from_os_resources (Resources? minimum, Resources? recommended) {
         var resources = get_default_resources ();