[gnome-boxes] Use osinfo_db_identify_media



commit 640a4f578d2befc5b9281c8144fc608730c0a933
Author: Christophe Fergeau <cfergeau redhat com>
Date:   Thu Dec 13 11:28:38 2012 +0100

    Use osinfo_db_identify_media
    
    osinfo_db_guess_os_from_media is deprecated in newer libosinfo and
    is replaced by osinfo_db_identify_media.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=685826

 src/installer-media.vala |    4 +++-
 src/os-database.vala     |   12 ++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/src/installer-media.vala b/src/installer-media.vala
index a890f51..c8ed060 100644
--- a/src/installer-media.vala
+++ b/src/installer-media.vala
@@ -58,7 +58,9 @@ private class Boxes.InstallerMedia : GLib.Object {
             yield get_media_info_from_device (device, media_manager.os_db);
         else {
             from_image = true;
-            os = yield media_manager.os_db.guess_os_from_install_media (device_file, out os_media, cancellable);
+            os_media = yield media_manager.os_db.guess_os_from_install_media (device_file, cancellable);
+            if (os_media != null)
+                os = os_media.os;
         }
 
         setup_label ();
diff --git a/src/os-database.vala b/src/os-database.vala
index c620d99..88df742 100644
--- a/src/os-database.vala
+++ b/src/os-database.vala
@@ -50,17 +50,17 @@ private class Boxes.OSDatabase : GLib.Object {
         db_loaded ();
     }
 
-    public async Os? guess_os_from_install_media (string media_path,
-                                                  out Media os_media,
-                                                  Cancellable? cancellable) throws GLib.Error {
-        os_media = null;
-
+    public async Media? guess_os_from_install_media (string media_path,
+                                                     Cancellable? cancellable) throws GLib.Error {
         if (!yield ensure_db_loaded ())
             return null;
 
         var media = yield Media.create_from_location_async (media_path, Priority.DEFAULT, cancellable);
 
-        return db.guess_os_from_media (media, out os_media);
+        if (db.identify_media (media))
+            return media;
+
+        return null;
     }
 
     public async Os get_os_by_id (string id) throws OSDatabaseError {



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]