instead of testing if ref($in) or ref($o) contains /gtk/, test if interactive_gtk is in ISA of the object

6 files changed, 6 insertions, 6 deletions

diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 5a5954752..e15a5c899 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -804,7 +804,7 @@ sub chooseResolutionsGtk($$;$) {
 }
 
 sub chooseResolutions($$;$) {
-    goto &chooseResolutionsGtk if ref($in) =~ /gtk/;
+    goto &chooseResolutionsGtk if $in->isa('interactive_gtk');
 
     my ($card, $chosen_depth, $chosen_w) = @_;
 
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index cf316f9d4..314b2447e 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -946,7 +946,7 @@ sub remove_bigseldom_used {
     log::l("remove_bigseldom_used");
     $::testing and return;
     unlink glob_("/usr/share/gtk/themes/$_*") foreach qw(DarkMarble marble3d);
-    if (ref($::o) =~ /gtk/) {
+    if ($::o->isa('interactive_gtk')) {
 	unlink glob_("/lib/lib$_*") foreach qw(slang newt);
 	unlink "/usr/bin/perl-install/auto/Newt/Newt.so";
     } else {
diff --git a/perl-install/install_interactive.pm b/perl-install/install_interactive.pm
index ae65f6dae..24064d9ea 100644
--- a/perl-install/install_interactive.pm
+++ b/perl-install/install_interactive.pm
@@ -165,7 +165,7 @@ When sure, press Ok.")) or return;
 	    } ];
     }
 
-    if (!$readonly && ref($o) =~ /gtk/) { #- diskdrake only available in gtk for now
+    if (!$readonly && $o->isa('interactive_gtk')) { #- diskdrake only available in gtk for now
 	$solutions{diskdrake} = [ 0, _("Custom disk partitioning"), sub { partition_with_diskdrake($o, $hds, 'nowizard') } ];
     }
 
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 60d5aad80..7a3fc31df 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -365,7 +365,7 @@ Continue at your own risk!"));
 			            \&partition_table_raw::description, \@l) or die "setstep exitInstall\n";
         }
 	install_any::use_root_part($o->{fstab}, $p, $o->{prefix});
-    } elsif ($::expert && ref($o) =~ /gtk/) {
+    } elsif ($::expert && $o->isa('interactive_gtk')) {
         install_interactive::partition_with_diskdrake($o, $o->{hds});
     } else {
         install_interactive::partitionWizard($o);
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index c42e61a68..92e3ab0c7 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -171,7 +171,7 @@ ifdown eth0
 
     my $pre_func = sub {
 	$::Wizard_no_previous=1;
-	if (ref($in) =~ /gtk/) {
+	if ($in->isa('interactive_gtk')) {
 	    $::Wizard_splash=1;
 	    require my_gtk;
 	    my_gtk->import(qw(:wrappers));
diff --git a/perl-install/services.pm b/perl-install/services.pm
index 44a915adf..d1d9ab783 100644
--- a/perl-install/services.pm
+++ b/perl-install/services.pm
@@ -239,7 +239,7 @@ sub ask_standalone_gtk {
 
 sub ask {    
     my ($in, $prefix) = @_;
-    !$::isInstall && ref($in) =~ /gtk/ ? &ask_standalone_gtk : &ask_install;
+    !$::isInstall && $in->isa('interactive_gtk') ? &ask_standalone_gtk : &ask_install;
 }
 
 sub doit {