summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>1999-12-09 18:16:43 +0000
committerFrancois Pons <fpons@mandriva.com>1999-12-09 18:16:43 +0000
commitcbfe718b3422cfb3a749b7642b76d371d4ff20f7 (patch)
treef778ed7da35374654f703127f6389cdce984cb25
parenta1366248c416a4639905e9cf7e777a4a9490a9a3 (diff)
downloaddrakx-backup-do-not-use-cbfe718b3422cfb3a749b7642b76d371d4ff20f7.tar
drakx-backup-do-not-use-cbfe718b3422cfb3a749b7642b76d371d4ff20f7.tar.gz
drakx-backup-do-not-use-cbfe718b3422cfb3a749b7642b76d371d4ff20f7.tar.bz2
drakx-backup-do-not-use-cbfe718b3422cfb3a749b7642b76d371d4ff20f7.tar.xz
drakx-backup-do-not-use-cbfe718b3422cfb3a749b7642b76d371d4ff20f7.zip
*** empty log message ***
-rw-r--r--perl-install/install2.pm2
-rw-r--r--perl-install/install_any.pm2
-rw-r--r--perl-install/install_steps_interactive.pm4
-rw-r--r--perl-install/my_gtk.pm2
4 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 650ade256..97287e91c 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -161,7 +161,7 @@ $o = $::o = {
QUEUE => "lp",
SPOOLDIR => "/var/spool/lpd/lp",
DBENTRY => "PostScript",
- PAPERSIZE => "legal",
+ PAPERSIZE => "letter",
CRLF => 0,
AUTOSENDEOF => 1,
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index b4e432f30..a2f139522 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -540,7 +540,7 @@ sub kderc_largedisplay($) {
my ($inputfile, $outputfile) = ("$prefix$_/.kderc", "$prefix$_/.kderc.new");
my %subst = ( contrast => "Contrast=7\n",
kfmiconstyle => "kfmIconStyle=Large\n",
- kpaneliconstyle => "kpanelIconStyle=Large\n",
+ kpaneliconstyle => "kpanelIconStyle=Normal\n", #- to change to Large when icons looks better
kdeiconstyle => "KDEIconStyle=Large\n",
);
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 634a2cc72..186fcddcd 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -774,7 +774,7 @@ sub setupXfree {
require Xconfigurator;
#- by default do not use existing configuration, so new card will be detected.
if ($o->{isUpgrade} && -r "$o->{prefix}/etc/X11/XF86Config") {
- unless ($::beginner || !$o->ask_yesorno('', _("Use existing configuration for X11?"), 0)) {
+ if ($::beginner || $o->ask_yesorno('', _("Use existing configuration for X11?"), 1)) {
Xconfig::getinfoFromXF86Config($o->{X}, $o->{prefix});
}
}
@@ -790,7 +790,7 @@ sub setupXfree {
$::noauto = $::noauto; #- no warning
Xconfigurator::main($o->{prefix}, $o->{X}, $o, $o->{allowFB}, sub {
- install_any::pkg_install($o, "XFree86-$_[0]");
+ install_any::pkg_install($o, "XFree86-$_[0]");
});
}
$o->setupXfreeAfter;
diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm
index d6df3696e..56e186e70 100644
--- a/perl-install/my_gtk.pm
+++ b/perl-install/my_gtk.pm
@@ -499,7 +499,7 @@ sub _ask_from_list {
$list->set_column_auto_resize(0, 1);
$o->{ok_clicked} = $leave;
- $o->{cancel_clicked} = sub { die "ask_from_list cancel" };
+ $o->{cancel_clicked} = sub { $o->destroy; die "ask_from_list cancel" }; #- make sure windows doesn't live any more.
gtkadd($o->{window},
gtkpack($o->create_box_with_title(@$messages),
gtkpack_(new Gtk::VBox(0,7),