[gnome-boxes/wip/rishi/rhel: 12/16] wizard: Wire the custom filename to the URI validator
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-boxes/wip/rishi/rhel: 12/16] wizard: Wire the custom filename to the URI validator
- Date: Mon, 11 Sep 2017 16:22:03 +0000 (UTC)
commit 8c72d8b5643918f73f0e4686d78db2464c7019c9
Author: Debarshi Ray <debarshir gnome org>
Date: Wed Sep 6 13:44:42 2017 +0200
wizard: Wire the custom filename to the URI validator
https://bugzilla.gnome.org/show_bug.cgi?id=786679
src/wizard.vala | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/src/wizard.vala b/src/wizard.vala
index 7fe4828..99fa556 100644
--- a/src/wizard.vala
+++ b/src/wizard.vala
@@ -172,7 +172,7 @@ private class Boxes.Wizard: Gtk.Stack, Boxes.UI {
return;
try {
- prepare_for_location (wizard_source.uri, true);
+ prepare_for_location (wizard_source.uri, null, true);
next_button.sensitive = true;
} catch (GLib.Error error) {
@@ -263,6 +263,7 @@ private class Boxes.Wizard: Gtk.Stack, Boxes.UI {
}
private void prepare_for_location (string location,
+ string? filename,
bool probing,
ActivityProgress? progress = null)
throws GLib.Error
@@ -303,7 +304,7 @@ private class Boxes.Wizard: Gtk.Stack, Boxes.UI {
return;
}
- prepare_for_uri (file.get_uri ());
+ prepare_for_uri (file.get_uri (), filename);
}
private void prepare_for_uri (string uri_as_text, string? filename = null) throws Boxes.Error {
@@ -397,7 +398,7 @@ private class Boxes.Wizard: Gtk.Stack, Boxes.UI {
try {
// Validate URI
- prepare_for_location (wizard_source.uri, true);
+ prepare_for_location (wizard_source.uri, null, true);
} catch (GLib.Error error) {
window.notificationbar.display_error (error.message);
@@ -422,7 +423,7 @@ private class Boxes.Wizard: Gtk.Stack, Boxes.UI {
}
try {
- prepare_for_location (wizard_source.uri, false, progress);
+ prepare_for_location (wizard_source.uri, null, false, progress);
} catch (GLib.Error error) {
window.notificationbar.display_error (error.message);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]