summaryrefslogtreecommitdiffstats
path: root/perl-install/interactive.pm
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-01-28 15:39:51 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-01-28 15:39:51 +0000
commit0f1a363af19d12e8bc38ec02f5a99ecbae1eadc1 (patch)
tree8ca816bf1fff041b773ac512d3a1e3604e75743e /perl-install/interactive.pm
parent09676045bd344ea218b7e2abeec8d2f0b5334d76 (diff)
downloaddrakx-0f1a363af19d12e8bc38ec02f5a99ecbae1eadc1.tar
drakx-0f1a363af19d12e8bc38ec02f5a99ecbae1eadc1.tar.gz
drakx-0f1a363af19d12e8bc38ec02f5a99ecbae1eadc1.tar.bz2
drakx-0f1a363af19d12e8bc38ec02f5a99ecbae1eadc1.tar.xz
drakx-0f1a363af19d12e8bc38ec02f5a99ecbae1eadc1.zip
cleaning the utf8 support stuff:
- consolidate check_for_xserver() to check for x11 access - introduce prepare_gtk2() to do what gtk+2 needs, so that tools that're not part of drakxtools (aka: rpmdrake, mcc, ...) can just do : unshift @::textdomains, 'drakconf'; prepare_gtk2();
Diffstat (limited to 'perl-install/interactive.pm')
-rw-r--r--perl-install/interactive.pm4
1 files changed, 1 insertions, 3 deletions
diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm
index b62390180..5285781ab 100644
--- a/perl-install/interactive.pm
+++ b/perl-install/interactive.pm
@@ -94,13 +94,11 @@ sub vnew {
$su = '' if $::testing || $ENV{TESTING};
}
require_root_capability() if $su;
- if ($ENV{DISPLAY} && system('/usr/X11R6/bin/xtest') == 0) {
+ if (check_for_xserver()) {
eval { require interactive::gtk };
if (!$@) {
my $o = interactive::gtk->new;
if ($icon && $icon ne 'default' && !$::isWizard) { $o->{icon} = $icon } else { undef $o->{icon} }
- c::bind_textdomain_codeset($_, 'UTF8') foreach 'libDrakX', @::textdomains;
- $::need_utf8_i18n = 1;
return $o;
}
}