diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2013-12-05 22:39:48 +0100 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2013-12-05 22:40:34 +0100 |
| commit | e889be299095f38df484a75e5c8ee9cb7f007b36 (patch) | |
| tree | 03b32e078f5ef0fd9b06cabb9539a55f7c0eb431 | |
| parent | 1438c6cdb9448532f1a7f77367abc8c51c54df1f (diff) | |
| download | drakx-e889be299095f38df484a75e5c8ee9cb7f007b36.tar drakx-e889be299095f38df484a75e5c8ee9cb7f007b36.tar.gz drakx-e889be299095f38df484a75e5c8ee9cb7f007b36.tar.bz2 drakx-e889be299095f38df484a75e5c8ee9cb7f007b36.tar.xz drakx-e889be299095f38df484a75e5c8ee9cb7f007b36.zip | |
Revert "fix 'Too late to run INIT' with Gtk3"
This reverts commit 527a624d8825348bcd9bd2ec0005409a89230315.
Thus preventing drakxtools-backend to require Glib::Object::Introspection
(mga#11842).
The "Too late to run INIT" warning will happen anyway...
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/interactive.pm | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 7f40afeb3..ae2f16fe0 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +- prevent drakxtools-backend to require Glib::Object::Introspection (mga#11842) + Version 16.7 - 5 December 2013 - diskdrake: diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm index 9d5c6c3f3..34ae7a4de 100644 --- a/perl-install/interactive.pm +++ b/perl-install/interactive.pm @@ -112,10 +112,7 @@ sub vnew { } require_root_capability() if $su; if (check_for_xserver()) { - eval { - use Glib::Object::Introspection; - require interactive::gtk; - }; + eval { require interactive::gtk }; if (!$@) { my $o = interactive::gtk->new; if ($o_icon && $o_icon ne 'default' && !$::isWizard) { $o->{icon} = $o_icon } else { undef $o->{icon} } |