diff options
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/my_gtk.pm | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/drakautoinst | 5 | ||||
| -rwxr-xr-x | perl-install/standalone/drakproxy | 5 | ||||
| -rwxr-xr-x | perl-install/standalone/mousedrake | 4 | ||||
| -rwxr-xr-x | perl-install/standalone/tinyfirewall | 2 |
5 files changed, 12 insertions, 6 deletions
diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm index f845d1de6..acdbe9977 100644 --- a/perl-install/my_gtk.pm +++ b/perl-install/my_gtk.pm @@ -94,7 +94,7 @@ sub new { $::WizardWindow->show_all; flush(); } - $::WizardTable->attach($o->{window}, 1, 2, 1, 2, {'fill', 'expand'}, {'fill', 'expand'}, 0, 0); + $::WizardTable->attach($o->{window}, 1, 2, 1, 2, [-fill, -expand], [-fill, -expand], 0, 0); } $::isEmbedded && !$my_gtk::pop_it or return $o; diff --git a/perl-install/standalone/drakautoinst b/perl-install/standalone/drakautoinst index e77ad99d3..985f91492 100755 --- a/perl-install/standalone/drakautoinst +++ b/perl-install/standalone/drakautoinst @@ -88,7 +88,7 @@ my $cfgfile = "$mountdir/auto_inst.cfg"; eval(cat_($cfgfile)); my $o_old = $o; -if (ref($in) =~ /gtk/) { +if (!$::isEmbedded && $in->isa('interactive_gtk')) { require Gtk; init Gtk; require my_gtk; @@ -359,6 +359,9 @@ sub control_buttons { #------------------------------------------------- #- $Log$ +#- Revision 1.13 2001/10/30 20:11:31 damien +#- corrected ref($in) =~ /gtk/ +#- #- Revision 1.12 2001/10/30 17:00:05 damien #- updated #- diff --git a/perl-install/standalone/drakproxy b/perl-install/standalone/drakproxy index 426d73b9c..acfc159ba 100755 --- a/perl-install/standalone/drakproxy +++ b/perl-install/standalone/drakproxy @@ -34,7 +34,7 @@ $::Wizard_title = _("Proxy handling"); my $in = 'interactive'->vnew('su', 'default'); -if ($::isWizard || ($::isEmbedded && ref($in) =~ /gtk/)) { +if ($::isWizard || ($::isEmbedded && $in->isa('interactive_gtk'))) { proxy::main('', $in); $in->exit(0); } @@ -67,6 +67,9 @@ Gtk->exit(0); #------------------------------------------------- #- $Log$ +#- Revision 1.8 2001/10/30 20:11:31 damien +#- corrected ref($in) =~ /gtk/ +#- #- Revision 1.7 2001/08/09 09:35:37 gc #- use vnew the right way everywhere #- diff --git a/perl-install/standalone/mousedrake b/perl-install/standalone/mousedrake index 177f7489a..f3609b936 100755 --- a/perl-install/standalone/mousedrake +++ b/perl-install/standalone/mousedrake @@ -37,7 +37,7 @@ $mouse->{XMOUSETYPE} eq $curr_env->{mouse}{XMOUSETYPE} || $::isEmbedded and kill USR2, $::CCPID; if (!$mouse || !$::auto) { $mouse ||= mouse::fullname2mouse("serial|Generic 2 Button Mouse"); - if ($::isEmbedded && ref($in) =~ /gtk/) { + if ($::isEmbedded && $in->isa('interactive_gtk')) { require my_gtk; my $time_tag = Gtk->timeout_add(100, sub { defined $::Plug && defined $::Plug->child or return 1; @@ -49,7 +49,7 @@ if (!$mouse || !$::auto) { sub { join '|', map { translate($_) } split '\|', $_[0] }, [ mouse::fullnames ], $mouse->{type} . '|' . $mouse->{name}); - Gtk->timeout_remove($time_tag2) if $::isEmbedded && ref($in) =~ /gtk/; + Gtk->timeout_remove($time_tag2) if $::isEmbedded && $in->isa('interactive_gtk'); $name or $::isEmbedded ? do { kill(USR1, $::CCPID); goto begin } : $in->exit(0); my $mouse_chosen = mouse::fullname2mouse($name); $mouse->{type} eq $mouse_chosen->{type} && $mouse->{name} eq $mouse_chosen->{name} or $mouse = $mouse_chosen; diff --git a/perl-install/standalone/tinyfirewall b/perl-install/standalone/tinyfirewall index 86f59e5cb..df01e76e9 100755 --- a/perl-install/standalone/tinyfirewall +++ b/perl-install/standalone/tinyfirewall @@ -32,7 +32,7 @@ local $_ = join '', @ARGV; my $in = 'interactive'->vnew('su', 'default'); -$::isEmbedded && ref($in) =~ /gtk/ or goto dd; +$::isEmbedded && $in->isa('interactive_gtk') or goto dd; require Gtk; init Gtk; |