don't redo what ugtk2 already does for us

2 files changed, 3 insertions, 16 deletions

diff --git a/edit-urpm-sources.pl b/edit-urpm-sources.pl
index 229239e5..699fafc7 100755
--- a/edit-urpm-sources.pl
+++ b/edit-urpm-sources.pl
@@ -41,16 +41,8 @@ BEGIN { #- for mcc
     }
 }
 
-BEGIN {
-    eval {
-        require ugtk2; ugtk2->import(qw(:all));
-        require mygtk2; mygtk2->import(qw(gtknew gtkset));
-    };
-    if ($@) {
-	print "This program cannot be run in console mode ($@_).\n";
-	POSIX::_exit(0);  #- skip ugtk2::END
-    }
-}
+use mygtk2 qw(gtknew gtkset);
+use ugtk2 qw(:all);
 
 $ugtk2::wm_icon = "title-install";
 $::isStandalone = 1;
diff --git a/gurpmi.addmedia b/gurpmi.addmedia
index 542e07e9..3920baf4 100755
--- a/gurpmi.addmedia
+++ b/gurpmi.addmedia
@@ -50,12 +50,7 @@ require_root_capability();
 use rpmdrake;
 use Getopt::Long;
 
-eval { require ugtk2; ugtk2->import(qw(:all)) };
-if ($@) {
-    print "This program cannot be run in console mode.\n";
-    use POSIX qw(_exit);
-    _exit(0);  #- skip ugtk2::END
-}
+use ugtk2 qw(:all);
 $::isStandalone = 1;
 
 my $fromfile;