aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-02-08 17:06:15 +0000
committerThierry Vignaud <tv@mandriva.org>2007-02-08 17:06:15 +0000
commit4dbab90100811ea333159d74ac236eb1e9db5836 (patch)
tree7eb93ab917de18224839cd9e9da96e56a67f078e
parent406cb0149cce46408e700a5bbb952d8508e668eb (diff)
downloadrpmdrake-4dbab90100811ea333159d74ac236eb1e9db5836.tar
rpmdrake-4dbab90100811ea333159d74ac236eb1e9db5836.tar.gz
rpmdrake-4dbab90100811ea333159d74ac236eb1e9db5836.tar.bz2
rpmdrake-4dbab90100811ea333159d74ac236eb1e9db5836.tar.xz
rpmdrake-4dbab90100811ea333159d74ac236eb1e9db5836.zip
simplify gfx initialization, ugtk2 already take care of that
-rwxr-xr-xrpmdrake16
1 files changed, 4 insertions, 12 deletions
diff --git a/rpmdrake b/rpmdrake
index 19dc7f57..e8d49a0d 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -110,18 +110,10 @@ if ($MODE eq 'remove') {
$default_list_mode = 'all_updates';
}
-eval {
- require mygtk2;
- require ugtk2;
- ugtk2->import(qw(:all));
- mygtk2->import(qw(gtknew)); #- do not import anything else, especially gtkadd() which conflicts with ugtk2 one
- require Gtk2::Pango;
- require Gtk2::Gdk::Keysyms;
-};
-if ($@) {
- print "This program cannot be run in console mode.\n";
- POSIX::_exit(0); #- skip ugtk2::END
-}
+use mygtk2 qw(gtknew); #- do not import anything else, especially gtkadd() which conflicts with ugtk2 one
+use ugtk2 qw(:all);
+use Gtk2::Pango;
+use Gtk2::Gdk::Keysyms;
$MODE eq 'update' || $options{root} and require_root_capability();
$ugtk2::wm_icon = "title-$MODE";