[tracker] extract-iso: Use osinfo_db_identify_media
- From: Zeeshan Ali Khattak <zeeshanak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker] extract-iso: Use osinfo_db_identify_media
- Date: Fri, 29 Nov 2013 12:35:05 +0000 (UTC)
commit 6c5ba402a511895df337c5cfe82d544dd7dd6b2e
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date: Thu Nov 28 20:09:47 2013 +0000
extract-iso: 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=719512
src/tracker-extract/tracker-extract-iso.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/tracker-extract/tracker-extract-iso.c b/src/tracker-extract/tracker-extract-iso.c
index 35694c3..261bc7e 100644
--- a/src/tracker-extract/tracker-extract-iso.c
+++ b/src/tracker-extract/tracker-extract-iso.c
@@ -44,7 +44,6 @@ tracker_extract_get_metadata (TrackerExtractInfo *info_)
gchar *filename;
OsinfoLoader *loader = NULL;
OsinfoMedia *media;
- OsinfoMedia *matched_media;
OsinfoDb *db;
OsinfoOs *os;
@@ -87,7 +86,8 @@ tracker_extract_get_metadata (TrackerExtractInfo *info_)
g_warn_if_fail (loader != NULL);
db = osinfo_loader_get_db (loader);
- os = osinfo_db_guess_os_from_media (db, media, &matched_media);
+ osinfo_db_identify_media (db, media);
+ os = osinfo_media_get_os (media);
if (os == NULL)
goto unknown_os;
@@ -101,12 +101,12 @@ tracker_extract_get_metadata (TrackerExtractInfo *info_)
tracker_sparql_builder_object_string (metadata, name);
}
- if (osinfo_media_get_live (matched_media)) {
+ if (osinfo_media_get_live (media)) {
tracker_sparql_builder_predicate (metadata, "a");
tracker_sparql_builder_object (metadata, "nfo:OperatingSystem");
}
- if (osinfo_media_get_installer (matched_media)) {
+ if (osinfo_media_get_installer (media)) {
tracker_sparql_builder_predicate (metadata, "a");
tracker_sparql_builder_object (metadata, "osinfo:Installer");
}
@@ -120,7 +120,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info_)
tracker_sparql_builder_object_string (metadata, id);
}
- id = osinfo_entity_get_id (OSINFO_ENTITY (matched_media));
+ id = osinfo_entity_get_id (OSINFO_ENTITY (media));
if (id != NULL) {
tracker_sparql_builder_predicate (metadata, "osinfo:mediaId");
tracker_sparql_builder_object_string (metadata, id);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]