summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2001-09-14 17:48:17 +0000
committerdamien <damien@mandriva.com>2001-09-14 17:48:17 +0000
commit997bab50fb1cc78f013679b14cebcc143035e529 (patch)
tree9b7896072d6d500bfa6a31e9ab0cddd16a50b8d4
parent088d7668f73fd295d34d86854e4624268d035d69 (diff)
downloaddrakx-backup-do-not-use-997bab50fb1cc78f013679b14cebcc143035e529.tar
drakx-backup-do-not-use-997bab50fb1cc78f013679b14cebcc143035e529.tar.gz
drakx-backup-do-not-use-997bab50fb1cc78f013679b14cebcc143035e529.tar.bz2
drakx-backup-do-not-use-997bab50fb1cc78f013679b14cebcc143035e529.tar.xz
drakx-backup-do-not-use-997bab50fb1cc78f013679b14cebcc143035e529.zip
no shadow when X test
-rw-r--r--perl-install/Xconfigurator.pm2
-rw-r--r--perl-install/my_gtk.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 684f34222..a122d6efa 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -648,6 +648,7 @@ sub testFinalConfig {
}
}
+ $::noShadow = 1;
local *F;
open F, "|perl 2>/dev/null" or die '';
print F "use lib qw(", join(' ', @INC), ");\n";
@@ -682,6 +683,7 @@ sub testFinalConfig {
unlink "/tmp/.X11-unix/X9" if $prefix;
kill 2, $pid;
+ $::noShadow = 0;
$rc || $err == 222 << 8 or $in->ask_warn('', _("An error has occurred, try to change some parameters"));
$rc;
diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm
index 3557c446f..90b8133be 100644
--- a/perl-install/my_gtk.pm
+++ b/perl-install/my_gtk.pm
@@ -542,7 +542,7 @@ sub _create_window($$) {
my $f = gtkset_border_width(gtkset_shadow_type(new Gtk::Frame(undef), 'none'), 3)
);
my $table;
- if ($::isStandalone || $::live || $::g_auto_install) { gtkadd($w, $inner) } else {
+ if ($::isStandalone || $::live || $::g_auto_install || $::noShadow) { gtkadd($w, $inner) } else {
my $sqw = $my_gtk::shape_width;
gtkadd($w, $table = new Gtk::Table(2, 2, 0));
$table->attach( $inner, 0, 1, 0, 1, 1|4, 1|4, 0, 0);