summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-03-05 17:13:54 +0000
committerThierry Vignaud <tv@mageia.org>2013-03-05 17:13:54 +0000
commit24401fe28f1c274cfce7e6e2353cb78ca25cc6f6 (patch)
tree5b6dbd4344967fab522cca2d04fcd365efc4f704
parent02c781a3bc0ee080bc097710db4f28c5e354d36c (diff)
downloaddrakx-24401fe28f1c274cfce7e6e2353cb78ca25cc6f6.tar
drakx-24401fe28f1c274cfce7e6e2353cb78ca25cc6f6.tar.gz
drakx-24401fe28f1c274cfce7e6e2353cb78ca25cc6f6.tar.bz2
drakx-24401fe28f1c274cfce7e6e2353cb78ca25cc6f6.tar.xz
drakx-24401fe28f1c274cfce7e6e2353cb78ca25cc6f6.zip
fixup git/svn add
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/standalone/display_installer_help28
3 files changed, 32 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 4cd111daa..4a9adf697 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- include display_installer_help
+
Version 15.25 - 5 March 2013
- finish-install:
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 33139672a..de3679e51 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- include display_installer_help
+
Version 15.25 - 5 March 2013
- fork displaying help, thus workarounding a webkit segfault (mga#9124)
diff --git a/perl-install/standalone/display_installer_help b/perl-install/standalone/display_installer_help
new file mode 100644
index 000000000..8d1a84d8c
--- /dev/null
+++ b/perl-install/standalone/display_installer_help
@@ -0,0 +1,28 @@
+#!/usr/bin/perl
+
+# Copyright (C) 2013 Mageia
+# Thierry Vignaud
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+use lib qw(/usr/lib/libDrakX);
+use interactive;
+use any;
+
+my $in = 'interactive'->vnew('su');
+# so that we popup above drakx:
+any::set_wm_hints_if_needed($in);
+
+$in->display_help_window({ interactive_help_id => $ARGV[0] });