Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
tails
tails
Commits
e39bb856
Commit
e39bb856
authored
Aug 13, 2018
by
intrigeri
Browse files
Update tails-persistence-setup to its current feature/14594-asp-gui branch (Closes:
#15784
).
… at commit e9f9a441a6a6e9366bd7ab59255fb482276d4e64.
parent
e9c18643
Changes
1
Hide whitespace changes
Inline
Side-by-side
config/chroot_local-patches/tps-14594-asp-gui.diff
View file @
e39bb856
[0m[01;34mTails[0m/
diff --git a/usr/share/perl5/Tails/Persistence.pm b/usr/share/perl5/Tails/Persistence.pm
index 8d1e412..0f1ec7c 100644
--- a/usr/share/perl5/Tails/Persistence.pm
...
...
@@ -2926,7 +2925,7 @@ index 7a456ee..c4139b3 100644
+no Moo;
1;
diff --git a/usr/share/perl5/Tails/Persistence/Step/Configure.pm b/usr/share/perl5/Tails/Persistence/Step/Configure.pm
index 751d8e3..
0490b66
100644
index 751d8e3..
4b74948
100644
--- a/usr/share/perl5/Tails/Persistence/Step/Configure.pm
+++ b/usr/share/perl5/Tails/Persistence/Step/Configure.pm
@@ -5,18 +5,16 @@
Tails::Persistence::Step::Configure - configure which bits are persistent
...
...
@@ -3040,7 +3039,7 @@ index 751d8e3..0490b66 100644
$self->title->set_text($self->encoding->decode(gettext(
q{Persistence wizard - Persistent volume configuration}
@@ -75,21 +102,2
5
@@
sub BUILD {
@@ -75,21 +102,2
6
@@
sub BUILD {
$self->go_button->set_sensitive(TRUE);
}
...
...
@@ -3058,6 +3057,7 @@ index 751d8e3..0490b66 100644
+
my $scrolled_win = Gtk3::ScrolledWindow->new;
$scrolled_win->set_policy('automatic', 'automatic');
+ $scrolled_win->set_overlay_scrolling(FALSE);
$scrolled_win->add($viewport);
- $box->pack_start($scrolled_win, TRUE, TRUE, 0);
...
...
@@ -3074,7 +3074,7 @@ index 751d8e3..0490b66 100644
$box->pack_start($self->status_area, FALSE, FALSE, 0);
my $button_alignment = Gtk3::Alignment->new(1.0, 0, 0.2, 1.0);
@@ -100,21 +13
1
,41 @@
method _build_main_box {
@@ -100,21 +13
2
,41 @@
method _build_main_box {
return $box;
}
...
...
@@ -3128,7 +3128,7 @@ index 751d8e3..0490b66 100644
}
@@ -122,7 +17
3
,7 @@
method _build_list_box {
@@ -122,7 +17
4
,7 @@
method _build_list_box {
=cut
...
...
@@ -3137,7 +3137,7 @@ index 751d8e3..0490b66 100644
if ($error) {
$self->working(0);
say STDERR "$error";
@@ -136,8 +18
7
,8 @@
method operation_finished ($error) {
@@ -136,8 +18
8
,8 @@
method operation_finished ($error) {
}
}
...
...
@@ -3148,7 +3148,7 @@ index 751d8e3..0490b66 100644
$self->working(1);
$self->subtitle->set_text(
$self->encoding->decode(gettext(q{Saving...})),
@@ -155,12 +20
6
,8 @@
method go_button_pressed {
@@ -155,12 +20
7
,8 @@
method go_button_pressed {
$self->operation_finished($error);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment