From 0f1a363af19d12e8bc38ec02f5a99ecbae1eadc1 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 28 Jan 2003 15:39:51 +0000 Subject: 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(); --- perl-install/interactive.pm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'perl-install/interactive.pm') 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; } } -- cgit v1.2.1