summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2014-01-18 15:27:45 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2014-01-18 15:29:12 +0100
commit4431e39d37e37a7c9e40cacb0939ec9bd8aa7766 (patch)
tree2263863bab674be37935ce840a88467e9a3f0d2e
parentb5a4da61994a508adb50a4697fa5dcde95c3c40c (diff)
downloaddrakx-4431e39d37e37a7c9e40cacb0939ec9bd8aa7766.tar
drakx-4431e39d37e37a7c9e40cacb0939ec9bd8aa7766.tar.gz
drakx-4431e39d37e37a7c9e40cacb0939ec9bd8aa7766.tar.bz2
drakx-4431e39d37e37a7c9e40cacb0939ec9bd8aa7766.tar.xz
drakx-4431e39d37e37a7c9e40cacb0939ec9bd8aa7766.zip
make screenshots work (mga#11176)
screenshots were not working since we moved the actual display of help in another program. Switch to install mode and make sure we've a real $::o object. Today is Marja's birthday!
-rw-r--r--perl-install/install/NEWS3
-rwxr-xr-xperl-install/standalone/display_installer_help7
2 files changed, 9 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 56018e27a..e4db0aef9 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- help dialogs:
+ o make screenshots work (mga#11176)
+
Version 16.23 - 16 January 2014
- partitioning:
diff --git a/perl-install/standalone/display_installer_help b/perl-install/standalone/display_installer_help
index 09c6bae31..165ae6729 100755
--- a/perl-install/standalone/display_installer_help
+++ b/perl-install/standalone/display_installer_help
@@ -21,10 +21,15 @@ use lib qw(/usr/lib/libDrakX);
use interactive;
use any;
+# so that screenshots works:
+use install::any;
+$::isInstall = 1;
+
my $in = 'interactive'->vnew('su');
# so that we popup above drakx:
any::set_wm_hints_if_needed($in);
# Fake enough $o for retrieving the proper translation:
-$o->{locale}{lang} = $ARGV[1];
+$::o = $in;
+$::o->{locale}{lang} = $ARGV[1];
$in->display_help_window({ interactive_help_id => $ARGV[0] });