[gnome-boxes] Support paths as URI from wizard as well
- From: Zeeshan Ali Khattak <zeeshanak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-boxes] Support paths as URI from wizard as well
- Date: Mon, 28 Nov 2011 18:10:46 +0000 (UTC)
commit eede34c22d56fae1bce6b3d0dbd310d9dfd61a7f
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date: Mon Nov 28 19:15:06 2011 +0200
Support paths as URI from wizard as well
https://bugzilla.gnome.org/show_bug.cgi?id=664760
src/wizard.vala | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/src/wizard.vala b/src/wizard.vala
index b95d4c1..7949677 100644
--- a/src/wizard.vala
+++ b/src/wizard.vala
@@ -149,18 +149,19 @@ private class Boxes.Wizard: Boxes.UI {
}
private void prepare_for_location (string location) throws GLib.Error {
- var file = File.new_for_uri (location);
+ var file = File.new_for_commandline_arg (location);
if (file.is_native ())
// FIXME: We should able to handle non-local URIs here too
- prepare_for_installer (location);
+ prepare_for_installer (file.get_path ());
else {
bool uncertain;
+ var uri = file.get_uri ();
- var mimetype = ContentType.guess (location, null, out uncertain);
+ var mimetype = ContentType.guess (uri, null, out uncertain);
if (uncertain)
- prepare_for_uri (location);
+ prepare_for_uri (uri);
else
debug ("FIXME: %s".printf (mimetype));
}
@@ -186,7 +187,7 @@ private class Boxes.Wizard: Boxes.UI {
throw new Boxes.Error.INVALID ("Unsupported protocol %s".printf (uri.scheme));
}
- private void prepare_for_installer (string location) throws GLib.Error {
+ private void prepare_for_installer (string path) throws GLib.Error {
if (client == null) {
client = new GUdev.Client ({"block"});
os_db = new OSDatabase ();
@@ -194,9 +195,7 @@ private class Boxes.Wizard: Boxes.UI {
}
next_button.sensitive = false;
- var file = File.new_for_uri (location);
- // FIXME: Assuming location is a local URI
- InstallerMedia.instantiate.begin (file.get_path (), os_db, client, null, on_installer_media_instantiated);
+ InstallerMedia.instantiate.begin (path, os_db, client, null, on_installer_media_instantiated);
}
private void on_installer_media_instantiated (Object? source_object, AsyncResult result) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]